diff --git a/lang/python.pot b/lang/python.pot index c6b17006f..63372044e 100644 --- a/lang/python.pot +++ b/lang/python.pot @@ -8,147 +8,85 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-09-22 11:02+0200\n" +"POT-Creation-Date: 2021-11-02 15:45+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" +"Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" "Language: \n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" +#: src/modules/initramfscfg/main.py:32 +msgid "Configuring initramfs." +msgstr "Configuring initramfs." + +#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 +#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361 +#: src/modules/fstab/main.py:388 src/modules/networkcfg/main.py:105 +#: src/modules/initcpiocfg/main.py:227 src/modules/initcpiocfg/main.py:231 +#: src/modules/localecfg/main.py:135 src/modules/mount/main.py:144 +#: src/modules/rawfs/main.py:164 src/modules/openrcdmcryptcfg/main.py:72 +#: src/modules/openrcdmcryptcfg/main.py:76 +#: src/modules/luksopenswaphookcfg/main.py:86 +#: src/modules/luksopenswaphookcfg/main.py:90 +msgid "Configuration Error" +msgstr "Configuration Error" + +#: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356 +#: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145 +#: src/modules/rawfs/main.py:165 src/modules/openrcdmcryptcfg/main.py:73 +#: src/modules/luksopenswaphookcfg/main.py:87 +msgid "No partitions are defined for 
{!s}
to use." +msgstr "No partitions are defined for 
{!s}
to use." + +#: src/modules/initramfscfg/main.py:90 src/modules/fstab/main.py:362 +#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232 +#: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77 +#: src/modules/luksopenswaphookcfg/main.py:91 +msgid "No root mount point is given for 
{!s}
to use." +msgstr "No root mount point is given for 
{!s}
to use." + #: 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/bootloader/main.py:43 +msgid "Install bootloader." +msgstr "Install bootloader." -#: 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 -#: src/modules/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/bootloader/main.py:508 +msgid "Bootloader installation error" +msgstr "Bootloader installation error" -#: 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." - -#: 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 +#: 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} call in chroot returned error code {num!s}." +"The bootloader could not be installed. The installation 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/fstab/main.py:29 +msgid "Writing fstab." +msgstr "Writing fstab." -#: src/modules/services-systemd/main.py:65 -msgid "Cannot enable systemd target {name!s}." -msgstr "Cannot enable systemd target {name!s}." +#: 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/services-systemd/main.py:69 -msgid "Cannot disable systemd target {name!s}." -msgstr "Cannot disable systemd target {name!s}." +#: src/modules/dracut/main.py:27 +msgid "Creating initramfs with dracut." +msgstr "Creating initramfs with dracut." -#: src/modules/services-systemd/main.py:71 -msgid "Cannot mask systemd unit {name!s}." -msgstr "Cannot mask systemd unit {name!s}." +#: src/modules/dracut/main.py:49 +msgid "Failed to run dracut on the target" +msgstr "Failed to run dracut on the target" -#: 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/dracut/main.py:50 src/modules/mkinitfs/main.py:50 +msgid "The exit code was {}" +msgstr "The exit code was {}" #: src/modules/displaymanager/main.py:526 msgid "Cannot write KDM configuration file" @@ -206,26 +144,6 @@ msgstr "" msgid "Display manager configuration was incomplete" msgstr "Display manager configuration was incomplete" -#: src/modules/initcpiocfg/main.py:28 -msgid "Configuring mkinitcpio." -msgstr "Configuring mkinitcpio." - -#: 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." - -#: src/modules/luksopenswaphookcfg/main.py:26 -msgid "Configuring encrypted swap." -msgstr "Configuring encrypted swap." - -#: 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" @@ -246,6 +164,11 @@ 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}." @@ -276,9 +199,9 @@ 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/networkcfg/main.py:29 +msgid "Saving network configuration." +msgstr "Saving network configuration." #: src/modules/packages/main.py:50 src/modules/packages/main.py:59 #: src/modules/packages/main.py:69 @@ -333,61 +256,25 @@ 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/plymouthcfg/main.py:27 +msgid "Configure Plymouth theme" +msgstr "Configure Plymouth theme" -#: src/modules/bootloader/main.py:508 -msgid "Bootloader installation error" -msgstr "Bootloader installation error" +#: src/modules/initcpiocfg/main.py:28 +msgid "Configuring mkinitcpio." +msgstr "Configuring mkinitcpio." -#: src/modules/bootloader/main.py:509 -msgid "" -"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/localecfg/main.py:30 +msgid "Configuring locales." +msgstr "Configuring locales." -#: src/modules/hwclock/main.py:26 -msgid "Setting hardware clock." -msgstr "Setting hardware clock." +#: src/modules/mount/main.py:30 +msgid "Mounting partitions." +msgstr "Mounting partitions." -#: 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/mkinitfs/main.py:50 src/modules/dracut/main.py:50 -msgid "The exit code was {}" -msgstr "The exit code was {}" - -#: 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/initramfscfg/main.py:32 -msgid "Configuring initramfs." -msgstr "Configuring initramfs." - -#: src/modules/openrcdmcryptcfg/main.py:26 -msgid "Configuring OpenRC dmcrypt service." -msgstr "Configuring OpenRC dmcrypt service." - -#: src/modules/fstab/main.py:29 -msgid "Writing fstab." -msgstr "Writing fstab." - -#: 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/rawfs/main.py:26 +msgid "Installing data." +msgstr "Installing data." #: src/modules/dummypython/main.py:35 msgid "Dummy python job." @@ -398,10 +285,126 @@ msgstr "Dummy python job." msgid "Dummy python step {}" msgstr "Dummy python step {}" -#: src/modules/localecfg/main.py:30 -msgid "Configuring locales." -msgstr "Configuring locales." +#: src/modules/hwclock/main.py:26 +msgid "Setting hardware clock." +msgstr "Setting hardware clock." -#: src/modules/networkcfg/main.py:29 -msgid "Saving network configuration." -msgstr "Saving network configuration." +#: src/modules/umount/main.py:31 +msgid "Unmount file systems." +msgstr "Unmount file systems." + +#: src/modules/openrcdmcryptcfg/main.py:26 +msgid "Configuring OpenRC dmcrypt service." +msgstr "Configuring OpenRC dmcrypt service." + +#: 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:69 +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:67 +msgid "Cannot enable systemd timer {name!s}." +msgstr "Cannot enable systemd timer {name!s}." + +#: src/modules/services-systemd/main.py:71 +msgid "Cannot disable systemd target {name!s}." +msgstr "Cannot disable systemd target {name!s}." + +#: src/modules/services-systemd/main.py:73 +msgid "Cannot mask systemd unit {name!s}." +msgstr "Cannot mask systemd unit {name!s}." + +#: src/modules/services-systemd/main.py:75 +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/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/unpackfs/main.py:34 +msgid "Filling up filesystems." +msgstr "Filling up filesystems." + +#: src/modules/unpackfs/main.py:254 +msgid "rsync failed with error code {}." +msgstr "rsync failed with error code {}." + +#: src/modules/unpackfs/main.py:299 +msgid "Unpacking image {}/{}, file {}/{}" +msgstr "Unpacking image {}/{}, file {}/{}" + +#: src/modules/unpackfs/main.py:314 +msgid "Starting to unpack {}" +msgstr "Starting to unpack {}" + +#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:465 +msgid "Failed to unpack image \"{}\"" +msgstr "Failed to unpack image \"{}\"" + +#: src/modules/unpackfs/main.py:430 +msgid "No mount point for root partition" +msgstr "No mount point for root partition" + +#: src/modules/unpackfs/main.py:431 +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:436 +msgid "Bad mount point for root partition" +msgstr "Bad mount point for root partition" + +#: src/modules/unpackfs/main.py:437 +msgid "rootMountPoint is \"{}\", which does not exist, doing nothing" +msgstr "rootMountPoint is \"{}\", which does not exist, doing nothing" + +#: src/modules/unpackfs/main.py:453 src/modules/unpackfs/main.py:457 +#: src/modules/unpackfs/main.py:463 src/modules/unpackfs/main.py:478 +msgid "Bad unsquash configuration" +msgstr "Bad unsquash configuration" + +#: src/modules/unpackfs/main.py:454 +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:458 +msgid "The source filesystem \"{}\" does not exist" +msgstr "The source filesystem \"{}\" does not exist" + +#: src/modules/unpackfs/main.py:464 +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/luksopenswaphookcfg/main.py:26 +msgid "Configuring encrypted swap." +msgstr "Configuring encrypted swap." diff --git a/lang/python/ar/LC_MESSAGES/python.po b/lang/python/ar/LC_MESSAGES/python.po index 24bf52316..307690be8 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-22 11:02+0200\n" +"POT-Creation-Date: 2021-11-02 15:45+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" @@ -22,132 +22,73 @@ 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/initramfscfg/main.py:32 +msgid "Configuring initramfs." +msgstr "" + +#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 +#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361 +#: src/modules/fstab/main.py:388 src/modules/networkcfg/main.py:105 +#: src/modules/initcpiocfg/main.py:227 src/modules/initcpiocfg/main.py:231 +#: src/modules/localecfg/main.py:135 src/modules/mount/main.py:144 +#: src/modules/rawfs/main.py:164 src/modules/openrcdmcryptcfg/main.py:72 +#: src/modules/openrcdmcryptcfg/main.py:76 +#: src/modules/luksopenswaphookcfg/main.py:86 +#: src/modules/luksopenswaphookcfg/main.py:90 +msgid "Configuration Error" +msgstr "خطأ في الضبط" + +#: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356 +#: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145 +#: src/modules/rawfs/main.py:165 src/modules/openrcdmcryptcfg/main.py:73 +#: src/modules/luksopenswaphookcfg/main.py:87 +msgid "No partitions are defined for 
{!s}
to use." +msgstr "" + +#: src/modules/initramfscfg/main.py:90 src/modules/fstab/main.py:362 +#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232 +#: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77 +#: src/modules/luksopenswaphookcfg/main.py:91 +msgid "No root mount point is given for 
{!s}
to use." +msgstr "" + #: src/modules/grubcfg/main.py:28 msgid "Configure GRUB." msgstr "" -#: src/modules/mount/main.py:30 -msgid "Mounting partitions." -msgstr "جاري تركيب الأقسام" +#: src/modules/bootloader/main.py:43 +msgid "Install bootloader." +msgstr "تثبيت محمل الإقلاع" -#: 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 -#: src/modules/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: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." +#: 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:59 -#: src/modules/services-openrc/main.py:93 -msgid "Cannot modify service" -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 "" -#: src/modules/services-systemd/main.py:63 -#: src/modules/services-systemd/main.py:67 -msgid "Cannot enable systemd service {name!s}." +#: src/modules/fstab/main.py:29 +msgid "Writing fstab." msgstr "" -#: src/modules/services-systemd/main.py:65 -msgid "Cannot enable systemd target {name!s}." +#: src/modules/fstab/main.py:389 +msgid "No 
{!s}
configuration is given for 
{!s}
to use." msgstr "" -#: 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}." +#: src/modules/dracut/main.py:49 +msgid "Failed to run dracut on the target" 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/dracut/main.py:50 src/modules/mkinitfs/main.py:50 +msgid "The exit code was {}" +msgstr "كود الخروج كان {}" #: src/modules/displaymanager/main.py:526 msgid "Cannot write KDM configuration file" @@ -203,26 +144,6 @@ msgstr "" msgid "Display manager configuration was incomplete" msgstr "إعداد مدير العرض لم يكتمل" -#: src/modules/initcpiocfg/main.py:28 -msgid "Configuring mkinitcpio." -msgstr "" - -#: 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 "" - -#: 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 "" @@ -241,6 +162,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,9 +192,9 @@ msgid "" "exist." msgstr "" -#: src/modules/plymouthcfg/main.py:27 -msgid "Configure Plymouth theme" -msgstr "" +#: src/modules/networkcfg/main.py:29 +msgid "Saving network configuration." +msgstr "جاري حفظ الإعدادات" #: src/modules/packages/main.py:50 src/modules/packages/main.py:59 #: src/modules/packages/main.py:69 @@ -325,58 +251,24 @@ msgid "" "command 
{!s}
returned error code {!s}." msgstr "" -#: src/modules/bootloader/main.py:43 -msgid "Install bootloader." -msgstr "تثبيت محمل الإقلاع" - -#: src/modules/bootloader/main.py:508 -msgid "Bootloader installation error" +#: src/modules/plymouthcfg/main.py:27 +msgid "Configure Plymouth theme" msgstr "" -#: src/modules/bootloader/main.py:509 -msgid "" -"The bootloader could not be installed. The installation command " -"
{!s}
returned error code {!s}." +#: src/modules/initcpiocfg/main.py:28 +msgid "Configuring mkinitcpio." 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/localecfg/main.py:30 +msgid "Configuring locales." 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/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." +#: src/modules/rawfs/main.py:26 +msgid "Installing data." msgstr "" #: src/modules/dummypython/main.py:35 @@ -388,10 +280,121 @@ msgstr "عملية بايثون دميه" msgid "Dummy python step {}" msgstr "عملية دميه خطوه بايثون {}" -#: src/modules/localecfg/main.py:30 -msgid "Configuring locales." +#: src/modules/hwclock/main.py:26 +msgid "Setting hardware clock." +msgstr "جاري إعداد ساعة الهاردوير" + +#: src/modules/umount/main.py:31 +msgid "Unmount file systems." +msgstr "الغاء تحميل ملف النظام" + +#: src/modules/openrcdmcryptcfg/main.py:26 +msgid "Configuring OpenRC dmcrypt service." msgstr "" -#: src/modules/networkcfg/main.py:29 -msgid "Saving network configuration." -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 "" + +#: src/modules/services-systemd/main.py:63 +#: src/modules/services-systemd/main.py:69 +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:67 +msgid "Cannot enable systemd timer {name!s}." +msgstr "" + +#: src/modules/services-systemd/main.py:71 +msgid "Cannot disable systemd target {name!s}." +msgstr "" + +#: src/modules/services-systemd/main.py:73 +msgid "Cannot mask systemd unit {name!s}." +msgstr "" + +#: src/modules/services-systemd/main.py:75 +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 "" + +#: src/modules/mkinitfs/main.py:49 +msgid "Failed to run mkinitfs on the target" +msgstr "" + +#: src/modules/unpackfs/main.py:34 +msgid "Filling up filesystems." +msgstr "جاري ملئ أنظمة الملفات" + +#: src/modules/unpackfs/main.py:254 +msgid "rsync failed with error code {}." +msgstr "فشل rsync مع رمز الخطأ {}." + +#: src/modules/unpackfs/main.py:299 +msgid "Unpacking image {}/{}, file {}/{}" +msgstr "" + +#: src/modules/unpackfs/main.py:314 +msgid "Starting to unpack {}" +msgstr "" + +#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:465 +msgid "Failed to unpack image \"{}\"" +msgstr "" + +#: src/modules/unpackfs/main.py:430 +msgid "No mount point for root partition" +msgstr "" + +#: src/modules/unpackfs/main.py:431 +msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing" +msgstr "" + +#: src/modules/unpackfs/main.py:436 +msgid "Bad mount point for root partition" +msgstr "" + +#: src/modules/unpackfs/main.py:437 +msgid "rootMountPoint is \"{}\", which does not exist, doing nothing" +msgstr "" + +#: src/modules/unpackfs/main.py:453 src/modules/unpackfs/main.py:457 +#: src/modules/unpackfs/main.py:463 src/modules/unpackfs/main.py:478 +msgid "Bad unsquash configuration" +msgstr "" + +#: src/modules/unpackfs/main.py:454 +msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel" +msgstr "" + +#: src/modules/unpackfs/main.py:458 +msgid "The source filesystem \"{}\" does not exist" +msgstr "" + +#: src/modules/unpackfs/main.py:464 +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/luksopenswaphookcfg/main.py:26 +msgid "Configuring encrypted swap." +msgstr "" diff --git a/lang/python/as/LC_MESSAGES/python.po b/lang/python/as/LC_MESSAGES/python.po index 15832959e..44f7e5800 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-22 11:02+0200\n" +"POT-Creation-Date: 2021-11-02 15:45+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" @@ -21,136 +21,73 @@ msgstr "" "Language: as\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#: src/modules/initramfscfg/main.py:32 +msgid "Configuring initramfs." +msgstr "initramfs কন্ফিগাৰ কৰি আছে।" + +#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 +#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361 +#: src/modules/fstab/main.py:388 src/modules/networkcfg/main.py:105 +#: src/modules/initcpiocfg/main.py:227 src/modules/initcpiocfg/main.py:231 +#: src/modules/localecfg/main.py:135 src/modules/mount/main.py:144 +#: src/modules/rawfs/main.py:164 src/modules/openrcdmcryptcfg/main.py:72 +#: src/modules/openrcdmcryptcfg/main.py:76 +#: src/modules/luksopenswaphookcfg/main.py:86 +#: src/modules/luksopenswaphookcfg/main.py:90 +msgid "Configuration Error" +msgstr "কনফিগাৰেচন ত্ৰুটি" + +#: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356 +#: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145 +#: src/modules/rawfs/main.py:165 src/modules/openrcdmcryptcfg/main.py:73 +#: src/modules/luksopenswaphookcfg/main.py:87 +msgid "No partitions are defined for 
{!s}
to use." +msgstr "
{!s}
ৰ ব্যৱহাৰৰ বাবে কোনো বিভাজনৰ বৰ্ণনা দিয়া হোৱা নাই।" + +#: src/modules/initramfscfg/main.py:90 src/modules/fstab/main.py:362 +#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232 +#: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77 +#: src/modules/luksopenswaphookcfg/main.py:91 +msgid "No root mount point is given for 
{!s}
to use." +msgstr "ব্যৱহাৰৰ বাবে 
{!s}
ৰ কোনো মাউন্ট্ পাইন্ট্ দিয়া হোৱা নাই।" + #: src/modules/grubcfg/main.py:28 msgid "Configure GRUB." msgstr "GRUB কনফিগাৰ কৰক।" -#: src/modules/mount/main.py:30 -msgid "Mounting partitions." -msgstr "বিভাজন মাউন্ট্ কৰা।" +#: src/modules/bootloader/main.py:43 +msgid "Install bootloader." +msgstr "বুতলোডাৰ ইন্স্তল কৰক।" -#: 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 -#: src/modules/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/bootloader/main.py:508 +msgid "Bootloader installation error" +msgstr "" -#: 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 "
{!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 +#: src/modules/bootloader/main.py:509 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 {}/{}" +"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 {}" +#: 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 "" -#: 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/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/dracut/main.py:50 src/modules/mkinitfs/main.py:50 +msgid "The exit code was {}" +msgstr "এক্সিড্ কোড্ আছিল {}" #: src/modules/displaymanager/main.py:526 msgid "Cannot write KDM configuration file" @@ -206,26 +143,6 @@ msgstr "" msgid "Display manager configuration was incomplete" msgstr "ডিস্প্লে প্ৰবন্ধক কন্ফিগাৰেচন অসমাপ্ত" -#: src/modules/initcpiocfg/main.py:28 -msgid "Configuring mkinitcpio." -msgstr "mkinitcpio কনফিগাৰ কৰি আছে।" - -#: 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 "ব্যৱহাৰৰ বাবে 
{!s}
ৰ কোনো মাউন্ট্ পাইন্ট্ দিয়া হোৱা নাই।" - -#: 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 "OpenRC সেৱা সমুহ কনফিগাৰ কৰক" @@ -246,6 +163,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,9 +194,9 @@ msgid "" "exist." msgstr "{name!s}ৰ বাবে পথ হ'ল {path!s} যিটো উপস্থিত নাই।" -#: src/modules/plymouthcfg/main.py:27 -msgid "Configure Plymouth theme" -msgstr "Plymouth theme কন্ফিগাৰ কৰি আছে।​" +#: src/modules/networkcfg/main.py:29 +msgid "Saving network configuration." +msgstr "নেটৱৰ্ক কন্ফিগাৰ জমা কৰি আছে।" #: src/modules/packages/main.py:50 src/modules/packages/main.py:59 #: src/modules/packages/main.py:69 @@ -323,59 +245,25 @@ msgid "" "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 theme কন্ফিগাৰ কৰি আছে।​" -#: src/modules/bootloader/main.py:508 -msgid "Bootloader installation error" -msgstr "" +#: src/modules/initcpiocfg/main.py:28 +msgid "Configuring mkinitcpio." +msgstr "mkinitcpio কনফিগাৰ কৰি আছে।" -#: src/modules/bootloader/main.py:509 -msgid "" -"The bootloader could not be installed. The installation command " -"
{!s}
returned error code {!s}." -msgstr "" +#: src/modules/localecfg/main.py:30 +msgid "Configuring locales." +msgstr "স্থানীয়বোৰ কন্ফিগাৰ কৰি আছে।" -#: src/modules/hwclock/main.py:26 -msgid "Setting hardware clock." -msgstr "হাৰ্ডৱেৰৰ ঘড়ী চেত্ কৰি আছে।" +#: src/modules/mount/main.py:30 +msgid "Mounting partitions." +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 "dracutৰ সৈতে initramfs বনাই আছে।" - -#: src/modules/dracut/main.py:49 -msgid "Failed to run dracut on the target" -msgstr "গন্তব্য স্থানত dracut চলোৱাত বিফল হ'ল" - -#: src/modules/initramfscfg/main.py:32 -msgid "Configuring initramfs." -msgstr "initramfs কন্ফিগাৰ কৰি আছে।" - -#: src/modules/openrcdmcryptcfg/main.py:26 -msgid "Configuring OpenRC dmcrypt service." -msgstr "OpenRC dmcrypt সেৱা কন্ফিগাৰ কৰি আছে।" - -#: 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 "" +#: src/modules/rawfs/main.py:26 +msgid "Installing data." +msgstr "ডাটা ইন্স্তল কৰি আছে।" #: src/modules/dummypython/main.py:35 msgid "Dummy python job." @@ -386,10 +274,123 @@ msgstr "ডামী Pythonৰ কায্য" msgid "Dummy python step {}" msgstr "ডামী Pythonৰ পদক্ষেপ {}" -#: src/modules/localecfg/main.py:30 -msgid "Configuring locales." -msgstr "স্থানীয়বোৰ কন্ফিগাৰ কৰি আছে।" +#: src/modules/hwclock/main.py:26 +msgid "Setting hardware clock." +msgstr "হাৰ্ডৱেৰৰ ঘড়ী চেত্ কৰি আছে।" -#: src/modules/networkcfg/main.py:29 -msgid "Saving network configuration." -msgstr "নেটৱৰ্ক কন্ফিগাৰ জমা কৰি আছে।" +#: src/modules/umount/main.py:31 +msgid "Unmount file systems." +msgstr "ফাইল চিছটেম​বোৰ মাউণ্টৰ পৰা আতৰাওক।" + +#: src/modules/openrcdmcryptcfg/main.py:26 +msgid "Configuring OpenRC dmcrypt service." +msgstr "OpenRC dmcrypt সেৱা কন্ফিগাৰ কৰি আছে।" + +#: 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:69 +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:67 +msgid "Cannot enable systemd timer {name!s}." +msgstr "" + +#: src/modules/services-systemd/main.py:71 +msgid "Cannot disable systemd target {name!s}." +msgstr "systemd গন্তব্য স্থান {name!s} নিষ্ক্ৰিয় কৰিব নোৱাৰি।" + +#: src/modules/services-systemd/main.py:73 +msgid "Cannot mask systemd unit {name!s}." +msgstr "systemd একক {name!s} মাস্ক্ কৰিব নোৱাৰি।" + +#: src/modules/services-systemd/main.py:75 +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." +msgstr "" + +#: src/modules/mkinitfs/main.py:49 +msgid "Failed to run mkinitfs on the target" +msgstr "" + +#: src/modules/unpackfs/main.py:34 +msgid "Filling up filesystems." +msgstr "ফাইল চিছটেম​বোৰ পূৰণ কৰা হৈ আছে।" + +#: src/modules/unpackfs/main.py:254 +msgid "rsync failed with error code {}." +msgstr "rsync ক্ৰুটি কোড {}ৰ সৈতে বিফল হ'ল।" + +#: src/modules/unpackfs/main.py:299 +msgid "Unpacking image {}/{}, file {}/{}" +msgstr "" + +#: src/modules/unpackfs/main.py:314 +msgid "Starting to unpack {}" +msgstr "" + +#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:465 +msgid "Failed to unpack image \"{}\"" +msgstr "ইমেজ \"{}\" খোলাত ব্যৰ্থ হ'ল" + +#: src/modules/unpackfs/main.py:430 +msgid "No mount point for root partition" +msgstr "ৰুট বিভাজনত কোনো মাউণ্ট পইণ্ট্ নাই" + +#: src/modules/unpackfs/main.py:431 +msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing" +msgstr "globalstorage ত rootMountPoint key নাই, একো কৰিব পৰা নাযায়" + +#: src/modules/unpackfs/main.py:436 +msgid "Bad mount point for root partition" +msgstr "মুল বিভাজনৰ বাবে বেয়া মাউন্ট্ পইন্ট্" + +#: src/modules/unpackfs/main.py:437 +msgid "rootMountPoint is \"{}\", which does not exist, doing nothing" +msgstr "rootMountPoint হ'ল \"{}\", যিটো উপস্থিত নাই, একো কৰিব পৰা নাযায়" + +#: src/modules/unpackfs/main.py:453 src/modules/unpackfs/main.py:457 +#: src/modules/unpackfs/main.py:463 src/modules/unpackfs/main.py:478 +msgid "Bad unsquash configuration" +msgstr "বেয়া unsquash কনফিগাৰেচন" + +#: src/modules/unpackfs/main.py:454 +msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel" +msgstr "" + +#: src/modules/unpackfs/main.py:458 +msgid "The source filesystem \"{}\" does not exist" +msgstr "\"{}\" ফাইল চিছটেম উপস্থিত নাই" + +#: src/modules/unpackfs/main.py:464 +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/luksopenswaphookcfg/main.py:26 +msgid "Configuring encrypted swap." +msgstr "এন্ক্ৰিপ্টেড স্ৱেপ কন্ফিগাৰ কৰি আছে।" diff --git a/lang/python/ast/LC_MESSAGES/python.po b/lang/python/ast/LC_MESSAGES/python.po index 4e2c43c10..535a1ead2 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-22 11:02+0200\n" +"POT-Creation-Date: 2021-11-02 15:45+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" @@ -21,135 +21,73 @@ msgstr "" "Language: ast\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#: src/modules/initramfscfg/main.py:32 +msgid "Configuring initramfs." +msgstr "" + +#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 +#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361 +#: src/modules/fstab/main.py:388 src/modules/networkcfg/main.py:105 +#: src/modules/initcpiocfg/main.py:227 src/modules/initcpiocfg/main.py:231 +#: src/modules/localecfg/main.py:135 src/modules/mount/main.py:144 +#: src/modules/rawfs/main.py:164 src/modules/openrcdmcryptcfg/main.py:72 +#: src/modules/openrcdmcryptcfg/main.py:76 +#: src/modules/luksopenswaphookcfg/main.py:86 +#: src/modules/luksopenswaphookcfg/main.py:90 +msgid "Configuration Error" +msgstr "" + +#: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356 +#: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145 +#: src/modules/rawfs/main.py:165 src/modules/openrcdmcryptcfg/main.py:73 +#: src/modules/luksopenswaphookcfg/main.py:87 +msgid "No partitions are defined for 
{!s}
to use." +msgstr "" + +#: src/modules/initramfscfg/main.py:90 src/modules/fstab/main.py:362 +#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232 +#: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77 +#: src/modules/luksopenswaphookcfg/main.py:91 +msgid "No root mount point is given for 
{!s}
to use." +msgstr "" + #: src/modules/grubcfg/main.py:28 msgid "Configure GRUB." msgstr "" -#: src/modules/mount/main.py:30 -msgid "Mounting partitions." +#: src/modules/bootloader/main.py:43 +msgid "Install bootloader." +msgstr "Instalando'l xestor d'arrinque." + +#: src/modules/bootloader/main.py:508 +msgid "Bootloader installation error" msgstr "" -#: 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 -#: src/modules/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: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 "" - -#: 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 +#: 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/fstab/main.py:29 +msgid "Writing fstab." msgstr "" -#: src/modules/services-systemd/main.py:65 -msgid "Cannot enable systemd target {name!s}." +#: src/modules/fstab/main.py:389 +msgid "No 
{!s}
configuration is given for 
{!s}
to use." msgstr "" -#: 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}." -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/dracut/main.py:50 src/modules/mkinitfs/main.py:50 +msgid "The exit code was {}" +msgstr "El códigu de salida foi {}" #: src/modules/displaymanager/main.py:526 msgid "Cannot write KDM configuration file" @@ -205,26 +143,6 @@ 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: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 "" - -#: src/modules/luksopenswaphookcfg/main.py:26 -msgid "Configuring encrypted swap." -msgstr "Configurando l'intercambéu cifráu." - -#: src/modules/rawfs/main.py:26 -msgid "Installing data." -msgstr "Instalando datos." - #: src/modules/services-openrc/main.py:29 msgid "Configure OpenRC services" msgstr "" @@ -244,6 +162,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,8 +192,8 @@ msgid "" "exist." msgstr "" -#: src/modules/plymouthcfg/main.py:27 -msgid "Configure Plymouth theme" +#: src/modules/networkcfg/main.py:29 +msgid "Saving network configuration." msgstr "" #: src/modules/packages/main.py:50 src/modules/packages/main.py:59 @@ -320,59 +243,25 @@ msgid "" "command 
{!s}
returned error code {!s}." msgstr "" -#: src/modules/bootloader/main.py:43 -msgid "Install bootloader." -msgstr "Instalando'l xestor d'arrinque." - -#: src/modules/bootloader/main.py:508 -msgid "Bootloader installation error" +#: src/modules/plymouthcfg/main.py:27 +msgid "Configure Plymouth theme" msgstr "" -#: src/modules/bootloader/main.py:509 -msgid "" -"The bootloader could not be installed. The installation command " -"
{!s}
returned error code {!s}." +#: src/modules/initcpiocfg/main.py:28 +msgid "Configuring mkinitcpio." +msgstr "Configurando mkinitcpio." + +#: src/modules/localecfg/main.py:30 +msgid "Configuring locales." +msgstr "Configurando locales." + +#: src/modules/mount/main.py:30 +msgid "Mounting partitions." msgstr "" -#: src/modules/hwclock/main.py:26 -msgid "Setting hardware clock." -msgstr "Configurando'l reló de hardware." - -#: 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 "El códigu de salida foi {}" - -#: 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/initramfscfg/main.py:32 -msgid "Configuring initramfs." -msgstr "" - -#: src/modules/openrcdmcryptcfg/main.py:26 -msgid "Configuring OpenRC dmcrypt service." -msgstr "Configurando'l serviciu dmcrypt d'OpenRC." - -#: 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/rawfs/main.py:26 +msgid "Installing data." +msgstr "Instalando datos." #: src/modules/dummypython/main.py:35 msgid "Dummy python job." @@ -383,10 +272,122 @@ msgstr "Trabayu maniquín en Python." msgid "Dummy python step {}" msgstr "Pasu maniquín {} en Python" -#: src/modules/localecfg/main.py:30 -msgid "Configuring locales." -msgstr "Configurando locales." +#: src/modules/hwclock/main.py:26 +msgid "Setting hardware clock." +msgstr "Configurando'l reló de hardware." -#: src/modules/networkcfg/main.py:29 -msgid "Saving network configuration." +#: src/modules/umount/main.py:31 +msgid "Unmount file systems." +msgstr "Desmontaxe de sistemes de ficheros." + +#: src/modules/openrcdmcryptcfg/main.py:26 +msgid "Configuring OpenRC dmcrypt service." +msgstr "Configurando'l serviciu dmcrypt d'OpenRC." + +#: 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:69 +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:67 +msgid "Cannot enable systemd timer {name!s}." +msgstr "" + +#: src/modules/services-systemd/main.py:71 +msgid "Cannot disable systemd target {name!s}." +msgstr "" + +#: src/modules/services-systemd/main.py:73 +msgid "Cannot mask systemd unit {name!s}." +msgstr "" + +#: src/modules/services-systemd/main.py:75 +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 "" + +#: src/modules/mkinitfs/main.py:49 +msgid "Failed to run mkinitfs on the target" +msgstr "" + +#: src/modules/unpackfs/main.py:34 +msgid "Filling up filesystems." +msgstr "Rellenando los sistemes de ficheros." + +#: src/modules/unpackfs/main.py:254 +msgid "rsync failed with error code {}." +msgstr "rsync falló col códigu de fallu {}." + +#: src/modules/unpackfs/main.py:299 +msgid "Unpacking image {}/{}, file {}/{}" +msgstr "" + +#: src/modules/unpackfs/main.py:314 +msgid "Starting to unpack {}" +msgstr "" + +#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:465 +msgid "Failed to unpack image \"{}\"" +msgstr "Fallu al desempaquetar la imaxe «{}»" + +#: src/modules/unpackfs/main.py:430 +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:431 +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:436 +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:437 +msgid "rootMountPoint is \"{}\", which does not exist, doing nothing" +msgstr "rootMountPoint ye «{}» que nun esiste. Nun va facese nada" + +#: src/modules/unpackfs/main.py:453 src/modules/unpackfs/main.py:457 +#: src/modules/unpackfs/main.py:463 src/modules/unpackfs/main.py:478 +msgid "Bad unsquash configuration" +msgstr "La configuración d'espardimientu ye incorreuta" + +#: src/modules/unpackfs/main.py:454 +msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel" +msgstr "" + +#: src/modules/unpackfs/main.py:458 +msgid "The source filesystem \"{}\" does not exist" +msgstr "El sistema de ficheros d'orixe «{}» nun esiste" + +#: src/modules/unpackfs/main.py:464 +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 "El destín «{}» nel sistema de destín nun ye un direutoriu" + +#: src/modules/luksopenswaphookcfg/main.py:26 +msgid "Configuring encrypted swap." +msgstr "Configurando l'intercambéu cifráu." diff --git a/lang/python/az/LC_MESSAGES/python.po b/lang/python/az/LC_MESSAGES/python.po index 4e66da4b7..3dc3ec79a 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-22 11:02+0200\n" +"POT-Creation-Date: 2021-11-02 15:45+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Xəyyam Qocayev , 2021\n" "Language-Team: Azerbaijani (https://www.transifex.com/calamares/teams/20061/az/)\n" @@ -21,141 +21,78 @@ msgstr "" "Language: az\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#: src/modules/initramfscfg/main.py:32 +msgid "Configuring initramfs." +msgstr "initramfs tənzimlənir." + +#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 +#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361 +#: src/modules/fstab/main.py:388 src/modules/networkcfg/main.py:105 +#: src/modules/initcpiocfg/main.py:227 src/modules/initcpiocfg/main.py:231 +#: src/modules/localecfg/main.py:135 src/modules/mount/main.py:144 +#: src/modules/rawfs/main.py:164 src/modules/openrcdmcryptcfg/main.py:72 +#: src/modules/openrcdmcryptcfg/main.py:76 +#: src/modules/luksopenswaphookcfg/main.py:86 +#: src/modules/luksopenswaphookcfg/main.py:90 +msgid "Configuration Error" +msgstr "Tənzimləmə xətası" + +#: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356 +#: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145 +#: src/modules/rawfs/main.py:165 src/modules/openrcdmcryptcfg/main.py:73 +#: src/modules/luksopenswaphookcfg/main.py:87 +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/initramfscfg/main.py:90 src/modules/fstab/main.py:362 +#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232 +#: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77 +#: src/modules/luksopenswaphookcfg/main.py:91 +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/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/bootloader/main.py:43 +msgid "Install bootloader." +msgstr "Önyükləyici qurulur." -#: 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 -#: src/modules/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/bootloader/main.py:508 +msgid "Bootloader installation error" +msgstr "Önyükləyicinin quraşdırılmasında xəta" -#: 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 "
{!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 +#: 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}." +"Ö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: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/fstab/main.py:29 +msgid "Writing fstab." +msgstr "fstab yazı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/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}." +#: src/modules/fstab/main.py:389 +msgid "No 
{!s}
configuration is given for 
{!s}
to use." msgstr "" -"Naməlum systemd əmrləri {command!s} və {suffix!s} " -"{name!s} vahidi üçün." +"İstifadə etmək üçün, 
{!s}
tənzimləməsi, 
{!s}
üçün " +"göstərilməyib." -#: src/modules/umount/main.py:31 -msgid "Unmount file systems." -msgstr "Fayl sistemini ayırmaq." +#: src/modules/dracut/main.py:27 +msgid "Creating initramfs with dracut." +msgstr "Dracut ilə initramfs yaratmaq." -#: src/modules/unpackfs/main.py:35 -msgid "Filling up filesystems." -msgstr "Fayl sistemlərini doldurmaq." +#: 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: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/dracut/main.py:50 src/modules/mkinitfs/main.py:50 +msgid "The exit code was {}" +msgstr "Çıxış kodu {} idi" #: src/modules/displaymanager/main.py:526 msgid "Cannot write KDM configuration file" @@ -213,27 +150,6 @@ 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/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 "" -"
{!s}
istifadə etmək üçün kök qoşulma nöqtəsi təyin edilmə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/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" @@ -254,6 +170,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,9 +203,9 @@ 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/networkcfg/main.py:29 +msgid "Saving network configuration." +msgstr "Şəbəkə ayarları saxlanılır." #: src/modules/packages/main.py:50 src/modules/packages/main.py:59 #: src/modules/packages/main.py:69 @@ -339,63 +260,25 @@ 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." -msgstr "Önyükləyici qurulur." +#: src/modules/plymouthcfg/main.py:27 +msgid "Configure Plymouth theme" +msgstr "Plymouth mövzusu tənzimlənməsi" -#: src/modules/bootloader/main.py:508 -msgid "Bootloader installation error" -msgstr "Önyükləyicinin quraşdırılmasında xəta" +#: src/modules/initcpiocfg/main.py:28 +msgid "Configuring mkinitcpio." +msgstr "mkinitcpio tənzimlənir." -#: src/modules/bootloader/main.py:509 -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/localecfg/main.py:30 +msgid "Configuring locales." +msgstr "Lokallaşma tənzimlənir." -#: src/modules/hwclock/main.py:26 -msgid "Setting hardware clock." -msgstr "Aparat saatını ayarlamaq." +#: src/modules/mount/main.py:30 +msgid "Mounting partitions." +msgstr "Disk bölmələri qoşulur." -#: 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/mkinitfs/main.py:50 src/modules/dracut/main.py:50 -msgid "The exit code was {}" -msgstr "Çıxış kodu {} idi" - -#: 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/initramfscfg/main.py:32 -msgid "Configuring initramfs." -msgstr "initramfs tənzimlənir." - -#: src/modules/openrcdmcryptcfg/main.py:26 -msgid "Configuring OpenRC dmcrypt service." -msgstr "OpenRC dmcrypt xidməti tənzimlənir." - -#: 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 "" -"İstifadə etmək üçün, 
{!s}
tənzimləməsi, 
{!s}
üçün " -"göstərilməyib." +#: src/modules/rawfs/main.py:26 +msgid "Installing data." +msgstr "Quraşdırılma tarixi." #: src/modules/dummypython/main.py:35 msgid "Dummy python job." @@ -406,10 +289,129 @@ msgstr "Dummy python işi." 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/hwclock/main.py:26 +msgid "Setting hardware clock." +msgstr "Aparat saatını ayarlamaq." -#: src/modules/networkcfg/main.py:29 -msgid "Saving network configuration." -msgstr "Şəbəkə ayarları saxlanılır." +#: src/modules/umount/main.py:31 +msgid "Unmount file systems." +msgstr "Fayl sistemini ayırmaq." + +#: src/modules/openrcdmcryptcfg/main.py:26 +msgid "Configuring OpenRC dmcrypt service." +msgstr "OpenRC dmcrypt xidməti tənzimlənir." + +#: 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: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:69 +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:67 +msgid "Cannot enable systemd timer {name!s}." +msgstr "" + +#: src/modules/services-systemd/main.py:71 +msgid "Cannot disable systemd target {name!s}." +msgstr "{name!s} systemd hədfi sönsürülmədi." + +#: src/modules/services-systemd/main.py:73 +msgid "Cannot mask systemd unit {name!s}." +msgstr "{name!s} systemd vahidi maskalanmır." + +#: src/modules/services-systemd/main.py:75 +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/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:34 +msgid "Filling up filesystems." +msgstr "Fayl sistemlərini doldurmaq." + +#: src/modules/unpackfs/main.py:254 +msgid "rsync failed with error code {}." +msgstr "rsync uğursuz oldu, xəta kodu: {}." + +#: src/modules/unpackfs/main.py:299 +msgid "Unpacking image {}/{}, file {}/{}" +msgstr "" +"Tərkibi çıxarılan quraşdırma faylı - image {}/{}, çıxarılan faylların sayı " +"{}/{}" + +#: src/modules/unpackfs/main.py:314 +msgid "Starting to unpack {}" +msgstr "Tərkiblərini açmağa başladılır {}" + +#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:465 +msgid "Failed to unpack image \"{}\"" +msgstr "\"{}\" quraşdırma faylının tərkibini çıxarmaq alınmadı" + +#: src/modules/unpackfs/main.py:430 +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:431 +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:436 +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:437 +msgid "rootMountPoint is \"{}\", which does not exist, doing nothing" +msgstr "rootMountPoint \"{}\" mövcud deyil, heç bir əməliyyat getmir" + +#: src/modules/unpackfs/main.py:453 src/modules/unpackfs/main.py:457 +#: src/modules/unpackfs/main.py:463 src/modules/unpackfs/main.py:478 +msgid "Bad unsquash configuration" +msgstr "Unsquash xətalı tənzimlənməsi" + +#: src/modules/unpackfs/main.py:454 +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:458 +msgid "The source filesystem \"{}\" does not exist" +msgstr "\"{}\" mənbə fayl sistemi mövcud deyil" + +#: src/modules/unpackfs/main.py:464 +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 "Hədəf sistemində təyin edilən \"{}\", qovluq deyil" + +#: src/modules/luksopenswaphookcfg/main.py:26 +msgid "Configuring encrypted swap." +msgstr "Çifrələnmiş mübadilə sahəsi - swap tənzimlənir." diff --git a/lang/python/az_AZ/LC_MESSAGES/python.po b/lang/python/az_AZ/LC_MESSAGES/python.po index 9eb806944..eda09d8bf 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-22 11:02+0200\n" +"POT-Creation-Date: 2021-11-02 15:45+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Xəyyam Qocayev , 2021\n" "Language-Team: Azerbaijani (Azerbaijan) (https://www.transifex.com/calamares/teams/20061/az_AZ/)\n" @@ -21,141 +21,78 @@ msgstr "" "Language: az_AZ\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#: src/modules/initramfscfg/main.py:32 +msgid "Configuring initramfs." +msgstr "initramfs tənzimlənir." + +#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 +#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361 +#: src/modules/fstab/main.py:388 src/modules/networkcfg/main.py:105 +#: src/modules/initcpiocfg/main.py:227 src/modules/initcpiocfg/main.py:231 +#: src/modules/localecfg/main.py:135 src/modules/mount/main.py:144 +#: src/modules/rawfs/main.py:164 src/modules/openrcdmcryptcfg/main.py:72 +#: src/modules/openrcdmcryptcfg/main.py:76 +#: src/modules/luksopenswaphookcfg/main.py:86 +#: src/modules/luksopenswaphookcfg/main.py:90 +msgid "Configuration Error" +msgstr "Tənzimləmə xətası" + +#: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356 +#: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145 +#: src/modules/rawfs/main.py:165 src/modules/openrcdmcryptcfg/main.py:73 +#: src/modules/luksopenswaphookcfg/main.py:87 +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/initramfscfg/main.py:90 src/modules/fstab/main.py:362 +#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232 +#: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77 +#: src/modules/luksopenswaphookcfg/main.py:91 +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/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/bootloader/main.py:43 +msgid "Install bootloader." +msgstr "Önyükləyici qurulur." -#: 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 -#: src/modules/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/bootloader/main.py:508 +msgid "Bootloader installation error" +msgstr "Önyükləyicinin quraşdırılmasında xəta" -#: 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 "
{!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 +#: 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}." +"Ö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: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/fstab/main.py:29 +msgid "Writing fstab." +msgstr "fstab yazı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/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}." +#: src/modules/fstab/main.py:389 +msgid "No 
{!s}
configuration is given for 
{!s}
to use." msgstr "" -"Naməlum systemd əmrləri {command!s} və {suffix!s} " -"{name!s} vahidi üçün." +"İstifadə etmək üçün, 
{!s}
tənzimləməsi, 
{!s}
üçün " +"göstərilməyib." -#: src/modules/umount/main.py:31 -msgid "Unmount file systems." -msgstr "Fayl sistemini ayırmaq." +#: src/modules/dracut/main.py:27 +msgid "Creating initramfs with dracut." +msgstr "Dracut ilə initramfs yaratmaq." -#: src/modules/unpackfs/main.py:35 -msgid "Filling up filesystems." -msgstr "Fayl sistemlərini doldurmaq." +#: 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: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/dracut/main.py:50 src/modules/mkinitfs/main.py:50 +msgid "The exit code was {}" +msgstr "Çıxış kodu {} idi" #: src/modules/displaymanager/main.py:526 msgid "Cannot write KDM configuration file" @@ -213,27 +150,6 @@ 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/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 "" -"
{!s}
istifadə etmək üçün kök qoşulma nöqtəsi təyin edilmə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/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" @@ -254,6 +170,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,9 +203,9 @@ 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/networkcfg/main.py:29 +msgid "Saving network configuration." +msgstr "Şəbəkə ayarları saxlanılır." #: src/modules/packages/main.py:50 src/modules/packages/main.py:59 #: src/modules/packages/main.py:69 @@ -339,63 +260,25 @@ 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." -msgstr "Önyükləyici qurulur." +#: src/modules/plymouthcfg/main.py:27 +msgid "Configure Plymouth theme" +msgstr "Plymouth mövzusu tənzimlənməsi" -#: src/modules/bootloader/main.py:508 -msgid "Bootloader installation error" -msgstr "Önyükləyicinin quraşdırılmasında xəta" +#: src/modules/initcpiocfg/main.py:28 +msgid "Configuring mkinitcpio." +msgstr "mkinitcpio tənzimlənir." -#: src/modules/bootloader/main.py:509 -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/localecfg/main.py:30 +msgid "Configuring locales." +msgstr "Lokallaşma tənzimlənir." -#: src/modules/hwclock/main.py:26 -msgid "Setting hardware clock." -msgstr "Aparat saatını ayarlamaq." +#: src/modules/mount/main.py:30 +msgid "Mounting partitions." +msgstr "Disk bölmələri qoşulur." -#: 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/mkinitfs/main.py:50 src/modules/dracut/main.py:50 -msgid "The exit code was {}" -msgstr "Çıxış kodu {} idi" - -#: 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/initramfscfg/main.py:32 -msgid "Configuring initramfs." -msgstr "initramfs tənzimlənir." - -#: src/modules/openrcdmcryptcfg/main.py:26 -msgid "Configuring OpenRC dmcrypt service." -msgstr "OpenRC dmcrypt xidməti tənzimlənir." - -#: 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 "" -"İstifadə etmək üçün, 
{!s}
tənzimləməsi, 
{!s}
üçün " -"göstərilməyib." +#: src/modules/rawfs/main.py:26 +msgid "Installing data." +msgstr "Quraşdırılma tarixi." #: src/modules/dummypython/main.py:35 msgid "Dummy python job." @@ -406,10 +289,129 @@ msgstr "Dummy python işi." 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/hwclock/main.py:26 +msgid "Setting hardware clock." +msgstr "Aparat saatını ayarlamaq." -#: src/modules/networkcfg/main.py:29 -msgid "Saving network configuration." -msgstr "Şəbəkə ayarları saxlanılır." +#: src/modules/umount/main.py:31 +msgid "Unmount file systems." +msgstr "Fayl sistemini ayırmaq." + +#: src/modules/openrcdmcryptcfg/main.py:26 +msgid "Configuring OpenRC dmcrypt service." +msgstr "OpenRC dmcrypt xidməti tənzimlənir." + +#: 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: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:69 +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:67 +msgid "Cannot enable systemd timer {name!s}." +msgstr "" + +#: src/modules/services-systemd/main.py:71 +msgid "Cannot disable systemd target {name!s}." +msgstr "{name!s} systemd hədfi sönsürülmədi." + +#: src/modules/services-systemd/main.py:73 +msgid "Cannot mask systemd unit {name!s}." +msgstr "{name!s} systemd vahidi maskalanmır." + +#: src/modules/services-systemd/main.py:75 +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/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:34 +msgid "Filling up filesystems." +msgstr "Fayl sistemlərini doldurmaq." + +#: src/modules/unpackfs/main.py:254 +msgid "rsync failed with error code {}." +msgstr "rsync uğursuz oldu, xəta kodu: {}." + +#: src/modules/unpackfs/main.py:299 +msgid "Unpacking image {}/{}, file {}/{}" +msgstr "" +"Tərkibi çıxarılan quraşdırma faylı - image {}/{}, çıxarılan faylların sayı " +"{}/{}" + +#: src/modules/unpackfs/main.py:314 +msgid "Starting to unpack {}" +msgstr "Tərkiblərini açmağa başladılır {}" + +#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:465 +msgid "Failed to unpack image \"{}\"" +msgstr "\"{}\" quraşdırma faylının tərkibini çıxarmaq alınmadı" + +#: src/modules/unpackfs/main.py:430 +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:431 +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:436 +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:437 +msgid "rootMountPoint is \"{}\", which does not exist, doing nothing" +msgstr "rootMountPoint \"{}\" mövcud deyil, heç bir əməliyyat getmir" + +#: src/modules/unpackfs/main.py:453 src/modules/unpackfs/main.py:457 +#: src/modules/unpackfs/main.py:463 src/modules/unpackfs/main.py:478 +msgid "Bad unsquash configuration" +msgstr "Unsquash xətalı tənzimlənməsi" + +#: src/modules/unpackfs/main.py:454 +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:458 +msgid "The source filesystem \"{}\" does not exist" +msgstr "\"{}\" mənbə fayl sistemi mövcud deyil" + +#: src/modules/unpackfs/main.py:464 +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 "Hədəf sistemində təyin edilən \"{}\", qovluq deyil" + +#: src/modules/luksopenswaphookcfg/main.py:26 +msgid "Configuring encrypted swap." +msgstr "Çifrələnmiş mübadilə sahəsi - swap tənzimlənir." diff --git a/lang/python/be/LC_MESSAGES/python.po b/lang/python/be/LC_MESSAGES/python.po index e0780e9a0..91adf6ced 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-22 11:02+0200\n" +"POT-Creation-Date: 2021-11-02 15:45+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" @@ -21,136 +21,73 @@ 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/initramfscfg/main.py:32 +msgid "Configuring initramfs." +msgstr "Наладка initramfs." + +#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 +#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361 +#: src/modules/fstab/main.py:388 src/modules/networkcfg/main.py:105 +#: src/modules/initcpiocfg/main.py:227 src/modules/initcpiocfg/main.py:231 +#: src/modules/localecfg/main.py:135 src/modules/mount/main.py:144 +#: src/modules/rawfs/main.py:164 src/modules/openrcdmcryptcfg/main.py:72 +#: src/modules/openrcdmcryptcfg/main.py:76 +#: src/modules/luksopenswaphookcfg/main.py:86 +#: src/modules/luksopenswaphookcfg/main.py:90 +msgid "Configuration Error" +msgstr "Памылка канфігурацыі" + +#: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356 +#: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145 +#: src/modules/rawfs/main.py:165 src/modules/openrcdmcryptcfg/main.py:73 +#: src/modules/luksopenswaphookcfg/main.py:87 +msgid "No partitions are defined for 
{!s}
to use." +msgstr "Раздзелы для 
{!s}
не вызначаныя." + +#: src/modules/initramfscfg/main.py:90 src/modules/fstab/main.py:362 +#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232 +#: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77 +#: src/modules/luksopenswaphookcfg/main.py:91 +msgid "No root mount point is given for 
{!s}
to use." +msgstr "Каранёвы пункт мантавання для
{!s}
не пададзены." + #: src/modules/grubcfg/main.py:28 msgid "Configure GRUB." msgstr "Наладзіць GRUB." -#: src/modules/mount/main.py:30 -msgid "Mounting partitions." -msgstr "Мантаванне раздзелаў." +#: src/modules/bootloader/main.py:43 +msgid "Install bootloader." +msgstr "Усталяваць загрузчык." -#: 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 -#: src/modules/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: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 "Раздзелы для 
{!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}." +#: 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/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 "" + +#: 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/displaymanager/main.py:526 msgid "Cannot write KDM configuration file" @@ -208,26 +145,6 @@ msgstr "" msgid "Display manager configuration was incomplete" msgstr "Наладка дысплейнага кіраўніка не завершаная." -#: src/modules/initcpiocfg/main.py:28 -msgid "Configuring mkinitcpio." -msgstr "Наладка mkinitcpio." - -#: 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 "Каранёвы пункт мантавання для
{!s}
не пададзены." - -#: src/modules/luksopenswaphookcfg/main.py:26 -msgid "Configuring encrypted swap." -msgstr "Наладка зашыфраванага swap." - -#: src/modules/rawfs/main.py:26 -msgid "Installing data." -msgstr "Усталёўка даных." - #: src/modules/services-openrc/main.py:29 msgid "Configure OpenRC services" msgstr "Наладзіць службы OpenRC" @@ -248,6 +165,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,9 +196,9 @@ msgid "" "exist." msgstr "Шлях {path!s} да службы {level!s} не існуе." -#: src/modules/plymouthcfg/main.py:27 -msgid "Configure Plymouth theme" -msgstr "Наладзіць тэму Plymouth" +#: src/modules/networkcfg/main.py:29 +msgid "Saving network configuration." +msgstr "Захаванне сеткавай канфігурацыі." #: src/modules/packages/main.py:50 src/modules/packages/main.py:59 #: src/modules/packages/main.py:69 @@ -329,59 +251,25 @@ msgid "" "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:508 -msgid "Bootloader installation error" -msgstr "" +#: src/modules/initcpiocfg/main.py:28 +msgid "Configuring mkinitcpio." +msgstr "Наладка mkinitcpio." -#: src/modules/bootloader/main.py:509 -msgid "" -"The bootloader could not be installed. The installation command " -"
{!s}
returned error code {!s}." -msgstr "" +#: src/modules/localecfg/main.py:30 +msgid "Configuring locales." +msgstr "Наладка лакаляў." -#: src/modules/hwclock/main.py:26 -msgid "Setting hardware clock." -msgstr "Наладка апаратнага гадзінніка." +#: src/modules/mount/main.py:30 +msgid "Mounting partitions." +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/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 "Стварэнне initramfs з dracut." - -#: src/modules/dracut/main.py:49 -msgid "Failed to run dracut on the target" -msgstr "Не атрымалася запусціць dracut у пункце прызначэння" - -#: src/modules/initramfscfg/main.py:32 -msgid "Configuring initramfs." -msgstr "Наладка initramfs." - -#: src/modules/openrcdmcryptcfg/main.py:26 -msgid "Configuring OpenRC dmcrypt service." -msgstr "Наладка OpenRC dmcrypt." - -#: 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 "" +#: src/modules/rawfs/main.py:26 +msgid "Installing data." +msgstr "Усталёўка даных." #: src/modules/dummypython/main.py:35 msgid "Dummy python job." @@ -392,10 +280,123 @@ msgstr "Задача Dummy python." msgid "Dummy python step {}" msgstr "Крок Dummy python {}" -#: src/modules/localecfg/main.py:30 -msgid "Configuring locales." -msgstr "Наладка лакаляў." +#: src/modules/hwclock/main.py:26 +msgid "Setting hardware clock." +msgstr "Наладка апаратнага гадзінніка." -#: src/modules/networkcfg/main.py:29 -msgid "Saving network configuration." -msgstr "Захаванне сеткавай канфігурацыі." +#: src/modules/umount/main.py:31 +msgid "Unmount file systems." +msgstr "Адмантаваць файлавыя сістэмы." + +#: src/modules/openrcdmcryptcfg/main.py:26 +msgid "Configuring OpenRC dmcrypt service." +msgstr "Наладка OpenRC dmcrypt." + +#: 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:69 +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:67 +msgid "Cannot enable systemd timer {name!s}." +msgstr "" + +#: src/modules/services-systemd/main.py:71 +msgid "Cannot disable systemd target {name!s}." +msgstr "Немагчыма выключыць мэту systemd {name!s}." + +#: src/modules/services-systemd/main.py:73 +msgid "Cannot mask systemd unit {name!s}." +msgstr "Немагчыма замаскаваць адзінку systemd {name!s}. " + +#: src/modules/services-systemd/main.py:75 +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/mkinitfs/main.py:49 +msgid "Failed to run mkinitfs on the target" +msgstr "Не атрымалася запусціць mkinitfs у пункце прызначэння" + +#: src/modules/unpackfs/main.py:34 +msgid "Filling up filesystems." +msgstr "Запаўненне файлавых сістэм." + +#: src/modules/unpackfs/main.py:254 +msgid "rsync failed with error code {}." +msgstr "памылка rsync з кодам {}." + +#: src/modules/unpackfs/main.py:299 +msgid "Unpacking image {}/{}, file {}/{}" +msgstr "Распакоўванне вобраза {}/{}, файл {}/{}" + +#: src/modules/unpackfs/main.py:314 +msgid "Starting to unpack {}" +msgstr "Запуск распакоўвання {}" + +#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:465 +msgid "Failed to unpack image \"{}\"" +msgstr "Не атрымалася распакаваць вобраз \"{}\"" + +#: src/modules/unpackfs/main.py:430 +msgid "No mount point for root partition" +msgstr "Для каранёвага раздзела няма пункта мантавання" + +#: src/modules/unpackfs/main.py:431 +msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing" +msgstr "globalstorage не змяшчае ключа \"rootMountPoint\", нічога не выконваецца" + +#: src/modules/unpackfs/main.py:436 +msgid "Bad mount point for root partition" +msgstr "Хібны пункт мантавання для каранёвага раздзела" + +#: src/modules/unpackfs/main.py:437 +msgid "rootMountPoint is \"{}\", which does not exist, doing nothing" +msgstr "rootMountPoint \"{}\" не існуе, нічога не выконваецца" + +#: src/modules/unpackfs/main.py:453 src/modules/unpackfs/main.py:457 +#: src/modules/unpackfs/main.py:463 src/modules/unpackfs/main.py:478 +msgid "Bad unsquash configuration" +msgstr "Хібная канфігурацыя unsquash" + +#: src/modules/unpackfs/main.py:454 +msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel" +msgstr "Файлавая сістэма для \"{}\" ({}) не падтрымліваецца вашым бягучым ядром" + +#: src/modules/unpackfs/main.py:458 +msgid "The source filesystem \"{}\" does not exist" +msgstr "Зыходная файлавая сістэма \"{}\" не існуе" + +#: src/modules/unpackfs/main.py:464 +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/luksopenswaphookcfg/main.py:26 +msgid "Configuring encrypted swap." +msgstr "Наладка зашыфраванага swap." diff --git a/lang/python/bg/LC_MESSAGES/python.po b/lang/python/bg/LC_MESSAGES/python.po index 592a69d02..1a5f794e4 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-22 11:02+0200\n" +"POT-Creation-Date: 2021-11-02 15:45+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" @@ -21,131 +21,72 @@ msgstr "" "Language: bg\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#: src/modules/initramfscfg/main.py:32 +msgid "Configuring initramfs." +msgstr "" + +#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 +#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361 +#: src/modules/fstab/main.py:388 src/modules/networkcfg/main.py:105 +#: src/modules/initcpiocfg/main.py:227 src/modules/initcpiocfg/main.py:231 +#: src/modules/localecfg/main.py:135 src/modules/mount/main.py:144 +#: src/modules/rawfs/main.py:164 src/modules/openrcdmcryptcfg/main.py:72 +#: src/modules/openrcdmcryptcfg/main.py:76 +#: src/modules/luksopenswaphookcfg/main.py:86 +#: src/modules/luksopenswaphookcfg/main.py:90 +msgid "Configuration Error" +msgstr "" + +#: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356 +#: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145 +#: src/modules/rawfs/main.py:165 src/modules/openrcdmcryptcfg/main.py:73 +#: src/modules/luksopenswaphookcfg/main.py:87 +msgid "No partitions are defined for 
{!s}
to use." +msgstr "" + +#: src/modules/initramfscfg/main.py:90 src/modules/fstab/main.py:362 +#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232 +#: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77 +#: src/modules/luksopenswaphookcfg/main.py:91 +msgid "No root mount point is given for 
{!s}
to use." +msgstr "" + #: src/modules/grubcfg/main.py:28 msgid "Configure GRUB." msgstr "" -#: src/modules/mount/main.py:30 -msgid "Mounting partitions." +#: src/modules/bootloader/main.py:43 +msgid "Install bootloader." msgstr "" -#: 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 -#: src/modules/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" +#: src/modules/bootloader/main.py:508 +msgid "Bootloader installation error" msgstr "" -#: 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 "" - -#: 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 +#: 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/fstab/main.py:29 +msgid "Writing fstab." msgstr "" -#: src/modules/services-systemd/main.py:65 -msgid "Cannot enable systemd target {name!s}." +#: src/modules/fstab/main.py:389 +msgid "No 
{!s}
configuration is given for 
{!s}
to use." msgstr "" -#: 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}." +#: src/modules/dracut/main.py:49 +msgid "Failed to run dracut on the target" 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" +#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50 +msgid "The exit code was {}" msgstr "" #: src/modules/displaymanager/main.py:526 @@ -202,26 +143,6 @@ msgstr "" msgid "Display manager configuration was incomplete" msgstr "" -#: src/modules/initcpiocfg/main.py:28 -msgid "Configuring mkinitcpio." -msgstr "" - -#: 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 "" - -#: 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 "" @@ -240,6 +161,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,8 +191,8 @@ msgid "" "exist." msgstr "" -#: src/modules/plymouthcfg/main.py:27 -msgid "Configure Plymouth theme" +#: src/modules/networkcfg/main.py:29 +msgid "Saving network configuration." msgstr "" #: src/modules/packages/main.py:50 src/modules/packages/main.py:59 @@ -316,58 +242,24 @@ msgid "" "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:508 -msgid "Bootloader installation error" +#: src/modules/initcpiocfg/main.py:28 +msgid "Configuring mkinitcpio." msgstr "" -#: src/modules/bootloader/main.py:509 -msgid "" -"The bootloader could not be installed. The installation command " -"
{!s}
returned error code {!s}." +#: src/modules/localecfg/main.py:30 +msgid "Configuring locales." msgstr "" -#: src/modules/hwclock/main.py:26 -msgid "Setting hardware clock." +#: src/modules/mount/main.py:30 +msgid "Mounting partitions." 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." +#: src/modules/rawfs/main.py:26 +msgid "Installing data." msgstr "" #: src/modules/dummypython/main.py:35 @@ -379,10 +271,121 @@ msgstr "Фиктивна задача на python." msgid "Dummy python step {}" msgstr "Фиктивна стъпка на python {}" -#: src/modules/localecfg/main.py:30 -msgid "Configuring locales." +#: src/modules/hwclock/main.py:26 +msgid "Setting hardware clock." msgstr "" -#: src/modules/networkcfg/main.py:29 -msgid "Saving network configuration." +#: src/modules/umount/main.py:31 +msgid "Unmount file systems." +msgstr "Демонтирай файловите системи." + +#: src/modules/openrcdmcryptcfg/main.py:26 +msgid "Configuring OpenRC dmcrypt service." +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:69 +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:67 +msgid "Cannot enable systemd timer {name!s}." +msgstr "" + +#: src/modules/services-systemd/main.py:71 +msgid "Cannot disable systemd target {name!s}." +msgstr "" + +#: src/modules/services-systemd/main.py:73 +msgid "Cannot mask systemd unit {name!s}." +msgstr "" + +#: src/modules/services-systemd/main.py:75 +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 "" + +#: src/modules/mkinitfs/main.py:49 +msgid "Failed to run mkinitfs on the target" +msgstr "" + +#: src/modules/unpackfs/main.py:34 +msgid "Filling up filesystems." +msgstr "" + +#: src/modules/unpackfs/main.py:254 +msgid "rsync failed with error code {}." +msgstr "" + +#: src/modules/unpackfs/main.py:299 +msgid "Unpacking image {}/{}, file {}/{}" +msgstr "" + +#: src/modules/unpackfs/main.py:314 +msgid "Starting to unpack {}" +msgstr "" + +#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:465 +msgid "Failed to unpack image \"{}\"" +msgstr "" + +#: src/modules/unpackfs/main.py:430 +msgid "No mount point for root partition" +msgstr "" + +#: src/modules/unpackfs/main.py:431 +msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing" +msgstr "" + +#: src/modules/unpackfs/main.py:436 +msgid "Bad mount point for root partition" +msgstr "" + +#: src/modules/unpackfs/main.py:437 +msgid "rootMountPoint is \"{}\", which does not exist, doing nothing" +msgstr "" + +#: src/modules/unpackfs/main.py:453 src/modules/unpackfs/main.py:457 +#: src/modules/unpackfs/main.py:463 src/modules/unpackfs/main.py:478 +msgid "Bad unsquash configuration" +msgstr "" + +#: src/modules/unpackfs/main.py:454 +msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel" +msgstr "" + +#: src/modules/unpackfs/main.py:458 +msgid "The source filesystem \"{}\" does not exist" +msgstr "" + +#: src/modules/unpackfs/main.py:464 +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/luksopenswaphookcfg/main.py:26 +msgid "Configuring encrypted swap." msgstr "" diff --git a/lang/python/bn/LC_MESSAGES/python.po b/lang/python/bn/LC_MESSAGES/python.po index bb34c2bb2..ca3a6db2f 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-22 11:02+0200\n" +"POT-Creation-Date: 2021-11-02 15:45+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" @@ -21,132 +21,72 @@ msgstr "" "Language: bn\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#: src/modules/initramfscfg/main.py:32 +msgid "Configuring initramfs." +msgstr "" + +#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 +#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361 +#: src/modules/fstab/main.py:388 src/modules/networkcfg/main.py:105 +#: src/modules/initcpiocfg/main.py:227 src/modules/initcpiocfg/main.py:231 +#: src/modules/localecfg/main.py:135 src/modules/mount/main.py:144 +#: src/modules/rawfs/main.py:164 src/modules/openrcdmcryptcfg/main.py:72 +#: src/modules/openrcdmcryptcfg/main.py:76 +#: src/modules/luksopenswaphookcfg/main.py:86 +#: src/modules/luksopenswaphookcfg/main.py:90 +msgid "Configuration Error" +msgstr "কনফিগারেশন ত্রুটি" + +#: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356 +#: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145 +#: src/modules/rawfs/main.py:165 src/modules/openrcdmcryptcfg/main.py:73 +#: src/modules/luksopenswaphookcfg/main.py:87 +msgid "No partitions are defined for 
{!s}
to use." +msgstr "কোন পার্টিশন নির্দিষ্ট করা হয়নি
{!এস}
ব্যবহার করার জন্য।" + +#: src/modules/initramfscfg/main.py:90 src/modules/fstab/main.py:362 +#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232 +#: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77 +#: src/modules/luksopenswaphookcfg/main.py:91 +msgid "No root mount point is given for 
{!s}
to use." +msgstr "" + #: src/modules/grubcfg/main.py:28 msgid "Configure GRUB." msgstr "কনফিগার করুন জিআরইউবি।" -#: src/modules/mount/main.py:30 -msgid "Mounting partitions." -msgstr "মাউন্ট করছে পার্টিশনগুলো।" +#: src/modules/bootloader/main.py:43 +msgid "Install bootloader." +msgstr "" -#: 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 -#: src/modules/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/bootloader/main.py:508 +msgid "Bootloader installation error" +msgstr "" -#: 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 "কোন পার্টিশন নির্দিষ্ট করা হয়নি
{!এস}
ব্যবহার করার জন্য।" - -#: 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 +#: src/modules/bootloader/main.py:509 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}." +"The bootloader could not be installed. The installation command " +"
{!s}
returned error code {!s}." msgstr "" -#: src/modules/services-systemd/main.py:65 -msgid "Cannot enable systemd target {name!s}." +#: src/modules/fstab/main.py:29 +msgid "Writing fstab." msgstr "" -#: src/modules/services-systemd/main.py:69 -msgid "Cannot disable systemd target {name!s}." +#: src/modules/fstab/main.py:389 +msgid "No 
{!s}
configuration is given for 
{!s}
to use." msgstr "" -#: src/modules/services-systemd/main.py:71 -msgid "Cannot mask systemd unit {name!s}." +#: 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/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" +#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50 +msgid "The exit code was {}" msgstr "" #: src/modules/displaymanager/main.py:526 @@ -203,26 +143,6 @@ msgstr "" msgid "Display manager configuration was incomplete" msgstr "" -#: src/modules/initcpiocfg/main.py:28 -msgid "Configuring mkinitcpio." -msgstr "" - -#: 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 "" - -#: 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 "" @@ -241,6 +161,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,8 +191,8 @@ msgid "" "exist." msgstr "" -#: src/modules/plymouthcfg/main.py:27 -msgid "Configure Plymouth theme" +#: src/modules/networkcfg/main.py:29 +msgid "Saving network configuration." msgstr "" #: src/modules/packages/main.py:50 src/modules/packages/main.py:59 @@ -317,58 +242,24 @@ msgid "" "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:508 -msgid "Bootloader installation error" +#: src/modules/initcpiocfg/main.py:28 +msgid "Configuring mkinitcpio." msgstr "" -#: src/modules/bootloader/main.py:509 -msgid "" -"The bootloader could not be installed. The installation command " -"
{!s}
returned error code {!s}." +#: src/modules/localecfg/main.py:30 +msgid "Configuring locales." msgstr "" -#: src/modules/hwclock/main.py:26 -msgid "Setting hardware clock." -msgstr "" +#: src/modules/mount/main.py:30 +msgid "Mounting partitions." +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." +#: src/modules/rawfs/main.py:26 +msgid "Installing data." msgstr "" #: src/modules/dummypython/main.py:35 @@ -380,10 +271,122 @@ msgstr "" msgid "Dummy python step {}" msgstr "" -#: src/modules/localecfg/main.py:30 -msgid "Configuring locales." +#: src/modules/hwclock/main.py:26 +msgid "Setting hardware clock." msgstr "" -#: src/modules/networkcfg/main.py:29 -msgid "Saving network configuration." +#: src/modules/umount/main.py:31 +msgid "Unmount file systems." +msgstr "আনমাউন্ট ফাইল সিস্টেমগুলি করুন।" + +#: src/modules/openrcdmcryptcfg/main.py:26 +msgid "Configuring OpenRC dmcrypt service." +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 "" +"সিস্টেমসিটিএল {এআরজি!এস}সিএইচরুট ফেরত ত্রুটি কোড দে{NUM! গুলি}।" + +#: src/modules/services-systemd/main.py:63 +#: src/modules/services-systemd/main.py:69 +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:67 +msgid "Cannot enable systemd timer {name!s}." +msgstr "" + +#: src/modules/services-systemd/main.py:71 +msgid "Cannot disable systemd target {name!s}." +msgstr "" + +#: src/modules/services-systemd/main.py:73 +msgid "Cannot mask systemd unit {name!s}." +msgstr "" + +#: src/modules/services-systemd/main.py:75 +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 "" + +#: src/modules/mkinitfs/main.py:49 +msgid "Failed to run mkinitfs on the target" +msgstr "" + +#: src/modules/unpackfs/main.py:34 +msgid "Filling up filesystems." +msgstr "ফাইলসিস্টেমগুলিপূরণ করছে।" + +#: src/modules/unpackfs/main.py:254 +msgid "rsync failed with error code {}." +msgstr "ত্রুটি কোড সহ আরসিঙ্ক ব্যর্থ হয়েছে {}।" + +#: src/modules/unpackfs/main.py:299 +msgid "Unpacking image {}/{}, file {}/{}" +msgstr "চিত্র আনপ্যাক করছে {} / {}, ফাইল {} / {}" + +#: src/modules/unpackfs/main.py:314 +msgid "Starting to unpack {}" +msgstr "আনপ্যাক করা শুরু করছে {}" + +#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:465 +msgid "Failed to unpack image \"{}\"" +msgstr "চিত্র আনপ্যাক করতে ব্যর্থ হয়েছে \"{}\"" + +#: src/modules/unpackfs/main.py:430 +msgid "No mount point for root partition" +msgstr "" + +#: src/modules/unpackfs/main.py:431 +msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing" +msgstr "" + +#: src/modules/unpackfs/main.py:436 +msgid "Bad mount point for root partition" +msgstr "" + +#: src/modules/unpackfs/main.py:437 +msgid "rootMountPoint is \"{}\", which does not exist, doing nothing" +msgstr "" + +#: src/modules/unpackfs/main.py:453 src/modules/unpackfs/main.py:457 +#: src/modules/unpackfs/main.py:463 src/modules/unpackfs/main.py:478 +msgid "Bad unsquash configuration" +msgstr "" + +#: src/modules/unpackfs/main.py:454 +msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel" +msgstr "" + +#: src/modules/unpackfs/main.py:458 +msgid "The source filesystem \"{}\" does not exist" +msgstr "" + +#: src/modules/unpackfs/main.py:464 +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/luksopenswaphookcfg/main.py:26 +msgid "Configuring encrypted swap." msgstr "" diff --git a/lang/python/ca/LC_MESSAGES/python.po b/lang/python/ca/LC_MESSAGES/python.po index 24cf02961..236391ceb 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-22 11:02+0200\n" +"POT-Creation-Date: 2021-11-02 15:45+0100\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,77 @@ msgstr "" "Language: ca\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#: src/modules/initramfscfg/main.py:32 +msgid "Configuring initramfs." +msgstr "Es configuren initramfs." + +#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 +#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361 +#: src/modules/fstab/main.py:388 src/modules/networkcfg/main.py:105 +#: src/modules/initcpiocfg/main.py:227 src/modules/initcpiocfg/main.py:231 +#: src/modules/localecfg/main.py:135 src/modules/mount/main.py:144 +#: src/modules/rawfs/main.py:164 src/modules/openrcdmcryptcfg/main.py:72 +#: src/modules/openrcdmcryptcfg/main.py:76 +#: src/modules/luksopenswaphookcfg/main.py:86 +#: src/modules/luksopenswaphookcfg/main.py:90 +msgid "Configuration Error" +msgstr "Error de configuració" + +#: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356 +#: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145 +#: src/modules/rawfs/main.py:165 src/modules/openrcdmcryptcfg/main.py:73 +#: src/modules/luksopenswaphookcfg/main.py:87 +msgid "No partitions are defined for 
{!s}
to use." +msgstr "No s'han definit particions perquè les usi 
{!s}
." + +#: src/modules/initramfscfg/main.py:90 src/modules/fstab/main.py:362 +#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232 +#: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77 +#: src/modules/luksopenswaphookcfg/main.py:91 +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/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/bootloader/main.py:43 +msgid "Install bootloader." +msgstr "S'instal·la el carregador d'arrencada." -#: 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 -#: src/modules/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/bootloader/main.py:508 +msgid "Bootloader installation error" +msgstr "Error d'instal·lació del carregador d'arrencada" -#: 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 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 +#: 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 "" -"La crida de systemctl {arg!s} a chroot ha retornat el codi " -"d'error {num!s}." +"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-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/fstab/main.py:29 +msgid "Writing fstab." +msgstr "S'escriu fstab." -#: 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}." +#: 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}." +"No hi ha cap configuració de 
{!s}
perquè la usi 
{!s}
." -#: src/modules/umount/main.py:31 -msgid "Unmount file systems." -msgstr "Desmunta els sistemes de fitxers." +#: src/modules/dracut/main.py:27 +msgid "Creating initramfs with dracut." +msgstr "Es creen initramfs amb dracut." -#: src/modules/unpackfs/main.py:35 -msgid "Filling up filesystems." -msgstr "S'omplen els sistemes de fitxers." +#: 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: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/dracut/main.py:50 src/modules/mkinitfs/main.py:50 +msgid "The exit code was {}" +msgstr "El codi de sortida ha estat {}" #: src/modules/displaymanager/main.py:526 msgid "Cannot write KDM configuration file" @@ -211,27 +150,6 @@ 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/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 s'ha proporcionat el punt de muntatge perquè l'usi 
{!s}
." - -#: src/modules/luksopenswaphookcfg/main.py:26 -msgid "Configuring encrypted swap." -msgstr "Es configura l'intercanvi encriptat." - -#: 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" @@ -253,6 +171,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,9 +206,9 @@ 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/networkcfg/main.py:29 +msgid "Saving network configuration." +msgstr "Es desa la configuració de la xarxa." #: src/modules/packages/main.py:50 src/modules/packages/main.py:59 #: src/modules/packages/main.py:69 @@ -340,62 +263,25 @@ 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/bootloader/main.py:43 -msgid "Install bootloader." -msgstr "S'instal·la el carregador d'arrencada." +#: src/modules/plymouthcfg/main.py:27 +msgid "Configure Plymouth theme" +msgstr "Configura el tema del Plymouth" -#: src/modules/bootloader/main.py:508 -msgid "Bootloader installation error" -msgstr "Error d'instal·lació del carregador d'arrencada" +#: src/modules/initcpiocfg/main.py:28 +msgid "Configuring mkinitcpio." +msgstr "Es configura mkinitcpio." -#: src/modules/bootloader/main.py:509 -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/localecfg/main.py:30 +msgid "Configuring locales." +msgstr "Es configuren les llengües." -#: src/modules/hwclock/main.py:26 -msgid "Setting hardware clock." -msgstr "S'estableix el rellotge del maquinari." +#: src/modules/mount/main.py:30 +msgid "Mounting partitions." +msgstr "Es munten les particions." -#: 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/mkinitfs/main.py:50 src/modules/dracut/main.py:50 -msgid "The exit code was {}" -msgstr "El codi de sortida ha estat {}" - -#: 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/initramfscfg/main.py:32 -msgid "Configuring initramfs." -msgstr "Es configuren initramfs." - -#: src/modules/openrcdmcryptcfg/main.py:26 -msgid "Configuring OpenRC dmcrypt service." -msgstr "Es configura el sevei OpenRC dmcrypt." - -#: 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 "" -"No hi ha cap configuració de 
{!s}
perquè la usi 
{!s}
." +#: src/modules/rawfs/main.py:26 +msgid "Installing data." +msgstr "S'instal·len dades." #: src/modules/dummypython/main.py:35 msgid "Dummy python job." @@ -406,10 +292,125 @@ msgstr "Tasca de python fictícia." 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/hwclock/main.py:26 +msgid "Setting hardware clock." +msgstr "S'estableix el rellotge del maquinari." -#: src/modules/networkcfg/main.py:29 -msgid "Saving network configuration." -msgstr "Es desa la configuració de la xarxa." +#: src/modules/umount/main.py:31 +msgid "Unmount file systems." +msgstr "Desmunta els sistemes de fitxers." + +#: src/modules/openrcdmcryptcfg/main.py:26 +msgid "Configuring OpenRC dmcrypt service." +msgstr "Es configura el sevei OpenRC dmcrypt." + +#: src/modules/services-systemd/main.py:26 +msgid "Configure systemd services" +msgstr "Configura els serveis de systemd" + +#: 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:69 +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:67 +msgid "Cannot enable systemd timer {name!s}." +msgstr "" + +#: src/modules/services-systemd/main.py:71 +msgid "Cannot disable systemd target {name!s}." +msgstr "No es pot inhabilitar la destinació de systemd {name!s}." + +#: src/modules/services-systemd/main.py:73 +msgid "Cannot mask systemd unit {name!s}." +msgstr "No es pot emmascarar la unitat de systemd {name!s}." + +#: src/modules/services-systemd/main.py:75 +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/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:34 +msgid "Filling up filesystems." +msgstr "S'omplen els sistemes de fitxers." + +#: src/modules/unpackfs/main.py:254 +msgid "rsync failed with error code {}." +msgstr "Ha fallat rsync amb el codi d'error {}." + +#: src/modules/unpackfs/main.py:299 +msgid "Unpacking image {}/{}, file {}/{}" +msgstr "Es desempaqueta la imatge {}/{}, fitxer {}/{}" + +#: src/modules/unpackfs/main.py:314 +msgid "Starting to unpack {}" +msgstr "Es comença a desempaquetar {}" + +#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:465 +msgid "Failed to unpack image \"{}\"" +msgstr "Ha fallat desempaquetar la imatge \"{}\"." + +#: src/modules/unpackfs/main.py:430 +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:431 +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:436 +msgid "Bad mount point for root partition" +msgstr "Punt de muntatge incorrecte per a la partició d'arrel" + +#: src/modules/unpackfs/main.py:437 +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:453 src/modules/unpackfs/main.py:457 +#: src/modules/unpackfs/main.py:463 src/modules/unpackfs/main.py:478 +msgid "Bad unsquash configuration" +msgstr "Configuració incorrecta d'unsquash." + +#: src/modules/unpackfs/main.py:454 +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:458 +msgid "The source filesystem \"{}\" does not exist" +msgstr "El sistema de fitxers font \"{}\" no existeix." + +#: src/modules/unpackfs/main.py:464 +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 "La destinació \"{}\" al sistema de destinació no és un directori." + +#: src/modules/luksopenswaphookcfg/main.py:26 +msgid "Configuring encrypted swap." +msgstr "Es configura l'intercanvi encriptat." diff --git a/lang/python/ca@valencia/LC_MESSAGES/python.po b/lang/python/ca@valencia/LC_MESSAGES/python.po index f93bced23..6e4184341 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-22 11:02+0200\n" +"POT-Creation-Date: 2021-11-02 15:45+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" @@ -21,140 +21,74 @@ msgstr "" "Language: ca@valencia\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#: src/modules/initramfscfg/main.py:32 +msgid "Configuring initramfs." +msgstr "Es configuren initramfs." + +#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 +#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361 +#: src/modules/fstab/main.py:388 src/modules/networkcfg/main.py:105 +#: src/modules/initcpiocfg/main.py:227 src/modules/initcpiocfg/main.py:231 +#: src/modules/localecfg/main.py:135 src/modules/mount/main.py:144 +#: src/modules/rawfs/main.py:164 src/modules/openrcdmcryptcfg/main.py:72 +#: src/modules/openrcdmcryptcfg/main.py:76 +#: src/modules/luksopenswaphookcfg/main.py:86 +#: src/modules/luksopenswaphookcfg/main.py:90 +msgid "Configuration Error" +msgstr "S'ha produït un error en la configuració." + +#: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356 +#: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145 +#: src/modules/rawfs/main.py:165 src/modules/openrcdmcryptcfg/main.py:73 +#: src/modules/luksopenswaphookcfg/main.py:87 +msgid "No partitions are defined for 
{!s}
to use." +msgstr "No s'han definit particions perquè les use 
{!s}
." + +#: src/modules/initramfscfg/main.py:90 src/modules/fstab/main.py:362 +#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232 +#: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77 +#: src/modules/luksopenswaphookcfg/main.py:91 +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/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/bootloader/main.py:43 +msgid "Install bootloader." +msgstr "Instal·la el carregador d'arrancada." -#: 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 -#: src/modules/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/bootloader/main.py:508 +msgid "Bootloader installation error" +msgstr "" -#: 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 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 +#: 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 "" -"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/fstab/main.py:29 +msgid "Writing fstab." +msgstr "Escriptura d’fstab." -#: 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}." +#: src/modules/fstab/main.py:389 +msgid "No 
{!s}
configuration is given for 
{!s}
to use." 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/dracut/main.py:27 +msgid "Creating initramfs with dracut." +msgstr "Creació d’initramfs amb dracut." -#: src/modules/unpackfs/main.py:35 -msgid "Filling up filesystems." -msgstr "S'estan emplenant els sistemes de fitxers." +#: 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: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/dracut/main.py:50 src/modules/mkinitfs/main.py:50 +msgid "The exit code was {}" +msgstr "El codi d'eixida ha estat {}" #: src/modules/displaymanager/main.py:526 msgid "Cannot write KDM configuration file" @@ -213,27 +147,6 @@ 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/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 s'ha proporcionat el punt de muntatge perquè l'use 
{!s}
." - -#: src/modules/luksopenswaphookcfg/main.py:26 -msgid "Configuring encrypted swap." -msgstr "S’està configurant l'intercanvi encriptat." - -#: src/modules/rawfs/main.py:26 -msgid "Installing data." -msgstr "S'estan instal·lant les dades." - #: src/modules/services-openrc/main.py:29 msgid "Configure OpenRC services" msgstr "Configura els serveis d'OpenRC" @@ -255,6 +168,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,9 +203,9 @@ 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/networkcfg/main.py:29 +msgid "Saving network configuration." +msgstr "S'està guardant la configuració de la xarxa." #: src/modules/packages/main.py:50 src/modules/packages/main.py:59 #: src/modules/packages/main.py:69 @@ -336,59 +254,25 @@ msgid "" "command 
{!s}
returned error code {!s}." msgstr "" -#: src/modules/bootloader/main.py:43 -msgid "Install bootloader." -msgstr "Instal·la el carregador d'arrancada." +#: src/modules/plymouthcfg/main.py:27 +msgid "Configure Plymouth theme" +msgstr "Configura el tema del Plymouth" -#: src/modules/bootloader/main.py:508 -msgid "Bootloader installation error" -msgstr "" +#: src/modules/initcpiocfg/main.py:28 +msgid "Configuring mkinitcpio." +msgstr "S'està configurant mkinitcpio." -#: src/modules/bootloader/main.py:509 -msgid "" -"The bootloader could not be installed. The installation command " -"
{!s}
returned error code {!s}." -msgstr "" +#: src/modules/localecfg/main.py:30 +msgid "Configuring locales." +msgstr "Configuració d’idioma." -#: src/modules/hwclock/main.py:26 -msgid "Setting hardware clock." -msgstr "Configuració del rellotge del maquinari." +#: src/modules/mount/main.py:30 +msgid "Mounting partitions." +msgstr "S'estan muntant les particions." -#: 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/mkinitfs/main.py:50 src/modules/dracut/main.py:50 -msgid "The exit code was {}" -msgstr "El codi d'eixida ha estat {}" - -#: 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/initramfscfg/main.py:32 -msgid "Configuring initramfs." -msgstr "Es configuren initramfs." - -#: src/modules/openrcdmcryptcfg/main.py:26 -msgid "Configuring OpenRC dmcrypt service." -msgstr "Configuració del servei OpenRC dmcrypt." - -#: src/modules/fstab/main.py:29 -msgid "Writing fstab." -msgstr "Escriptura d’fstab." - -#: 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 "S'estan instal·lant les dades." #: src/modules/dummypython/main.py:35 msgid "Dummy python job." @@ -399,10 +283,127 @@ msgstr "Tasca de python de proves." msgid "Dummy python step {}" msgstr "Pas de python de proves {}" -#: src/modules/localecfg/main.py:30 -msgid "Configuring locales." -msgstr "Configuració d’idioma." +#: src/modules/hwclock/main.py:26 +msgid "Setting hardware clock." +msgstr "Configuració del rellotge del maquinari." -#: src/modules/networkcfg/main.py:29 -msgid "Saving network configuration." -msgstr "S'està guardant la configuració de la xarxa." +#: src/modules/umount/main.py:31 +msgid "Unmount file systems." +msgstr "Desmunta els sistemes de fitxers." + +#: src/modules/openrcdmcryptcfg/main.py:26 +msgid "Configuring OpenRC dmcrypt service." +msgstr "Configuració del servei OpenRC dmcrypt." + +#: src/modules/services-systemd/main.py:26 +msgid "Configure systemd services" +msgstr "Configura els serveis de systemd" + +#: 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:69 +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:67 +msgid "Cannot enable systemd timer {name!s}." +msgstr "" + +#: src/modules/services-systemd/main.py:71 +msgid "Cannot disable systemd target {name!s}." +msgstr "No es pot inhabilitar la destinació de systemd {name!s}." + +#: src/modules/services-systemd/main.py:73 +msgid "Cannot mask systemd unit {name!s}." +msgstr "No es pot emmascarar la unitat de systemd {name!s}." + +#: src/modules/services-systemd/main.py:75 +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/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:34 +msgid "Filling up filesystems." +msgstr "S'estan emplenant els sistemes de fitxers." + +#: src/modules/unpackfs/main.py:254 +msgid "rsync failed with error code {}." +msgstr "Ha fallat rsync amb el codi d'error {}." + +#: src/modules/unpackfs/main.py:299 +msgid "Unpacking image {}/{}, file {}/{}" +msgstr "S’està desempaquetant la imatge {}/{}, fitxer {}/{}" + +#: src/modules/unpackfs/main.py:314 +msgid "Starting to unpack {}" +msgstr "S’està començant a desempaquetar {}" + +#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:465 +msgid "Failed to unpack image \"{}\"" +msgstr "No s’ha pogut desempaquetar la imatge \"{}\"." + +#: src/modules/unpackfs/main.py:430 +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:431 +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:436 +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:437 +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:453 src/modules/unpackfs/main.py:457 +#: src/modules/unpackfs/main.py:463 src/modules/unpackfs/main.py:478 +msgid "Bad unsquash configuration" +msgstr "La configuració d'unsquash és incorrecta." + +#: src/modules/unpackfs/main.py:454 +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:458 +msgid "The source filesystem \"{}\" does not exist" +msgstr "El sistema de fitxers font \"{}\" no existeix." + +#: src/modules/unpackfs/main.py:464 +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 "La destinació \"{}\" en el sistema de destinació no és un directori." + +#: src/modules/luksopenswaphookcfg/main.py:26 +msgid "Configuring encrypted swap." +msgstr "S’està configurant l'intercanvi encriptat." diff --git a/lang/python/cs_CZ/LC_MESSAGES/python.po b/lang/python/cs_CZ/LC_MESSAGES/python.po index a299596f6..70e9d5b77 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-22 11:02+0200\n" +"POT-Creation-Date: 2021-11-02 15:45+0100\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,139 +23,77 @@ 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/initramfscfg/main.py:32 +msgid "Configuring initramfs." +msgstr "Nastavování initramfs." + +#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 +#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361 +#: src/modules/fstab/main.py:388 src/modules/networkcfg/main.py:105 +#: src/modules/initcpiocfg/main.py:227 src/modules/initcpiocfg/main.py:231 +#: src/modules/localecfg/main.py:135 src/modules/mount/main.py:144 +#: src/modules/rawfs/main.py:164 src/modules/openrcdmcryptcfg/main.py:72 +#: src/modules/openrcdmcryptcfg/main.py:76 +#: src/modules/luksopenswaphookcfg/main.py:86 +#: src/modules/luksopenswaphookcfg/main.py:90 +msgid "Configuration Error" +msgstr "Chyba nastavení" + +#: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356 +#: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145 +#: src/modules/rawfs/main.py:165 src/modules/openrcdmcryptcfg/main.py:73 +#: src/modules/luksopenswaphookcfg/main.py:87 +msgid "No partitions are defined for 
{!s}
to use." +msgstr "Pro 
{!s}
nejsou zadány žádné oddíly." + +#: src/modules/initramfscfg/main.py:90 src/modules/fstab/main.py:362 +#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232 +#: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77 +#: src/modules/luksopenswaphookcfg/main.py:91 +msgid "No root mount point is given for 
{!s}
to use." +msgstr "Pro 
{!s}
není zadán žádný přípojný bod." + #: 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/bootloader/main.py:43 +msgid "Install bootloader." +msgstr "Instalace zavaděče systému." -#: 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 -#: src/modules/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/bootloader/main.py:508 +msgid "Bootloader installation error" +msgstr "Chyba při instalaci zavaděče systému" -#: 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 "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 +#: 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 "" -"Volání systemctl {arg!s} v chroot vrátilo chybový kód {num!s}." +"Zavaděč systému se nepodařilo nainstalovat. Instalační příkaz 
{!s} "
+"vrátil chybový kód {!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/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Zapisování fstab."
 
-#: 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}."
+#: 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}."
+"Pro 
{!s}
 není zadáno žádné nastavení 
{!s}
, které "
+"použít. "
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Odpojit souborové systémy."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Vytváření initramfs s dracut."
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Naplňování souborových systémů."
+#: 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: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/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "Návratový kód byl {}"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -213,26 +151,6 @@ 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/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 "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/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"
@@ -255,6 +173,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,9 +208,9 @@ 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/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Ukládání nastavení sítě."
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
 #: src/modules/packages/main.py:69
@@ -346,63 +269,25 @@ msgstr ""
 "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
-msgid "Install bootloader."
-msgstr "Instalace zavaděče systému."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Nastavit téma vzhledu pro Plymouth"
 
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
-msgstr "Chyba při instalaci zavaděče systému"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Nastavování mkinitcpio."
 
-#: src/modules/bootloader/main.py:509
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-"Zavaděč systému se nepodařilo nainstalovat. Instalační příkaz 
{!s} "
-"vrátil chybový kód {!s}."
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Nastavování místních a jazykových nastavení."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Nastavování hardwarových hodin."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Připojování oddílů."
 
-#: 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/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Návratový kód byl {}"
-
-#: 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/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Nastavování initramfs."
-
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Nastavování služby OpenRC dmcrypt."
-
-#: 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 ""
-"Pro 
{!s}
 není zadáno žádné nastavení 
{!s}
, které "
-"použít. "
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Instalace dat."
 
 #: src/modules/dummypython/main.py:35
 msgid "Dummy python job."
@@ -413,10 +298,126 @@ msgstr "Testovací úloha python."
 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/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Nastavování hardwarových hodin."
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Ukládání nastavení sítě."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Odpojit souborové systémy."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Nastavování služby OpenRC dmcrypt."
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Nastavit služby systemd"
+
+#: 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:69
+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:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Nedaří se vypnout systemd cíl {name!s}."
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Nedaří se maskovat systemd jednotku {name!s}."
+
+#: src/modules/services-systemd/main.py:75
+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 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/unpackfs/main.py:34
+msgid "Filling up filesystems."
+msgstr "Naplňování souborových systémů."
+
+#: src/modules/unpackfs/main.py:254
+msgid "rsync failed with error code {}."
+msgstr "rsync se nezdařilo s chybových kódem {}."
+
+#: src/modules/unpackfs/main.py:299
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Rozbalování obrazu {}/{}, soubor {}/{}"
+
+#: src/modules/unpackfs/main.py:314
+msgid "Starting to unpack {}"
+msgstr "Zahajování rozbalení {}"
+
+#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:465
+msgid "Failed to unpack image \"{}\""
+msgstr "Nepodařilo se rozbalit obraz „{}“"
+
+#: src/modules/unpackfs/main.py:430
+msgid "No mount point for root partition"
+msgstr "Žádný přípojný bot pro kořenový oddíl"
+
+#: src/modules/unpackfs/main.py:431
+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:436
+msgid "Bad mount point for root partition"
+msgstr "Chybný přípojný bod pro kořenový oddíl"
+
+#: src/modules/unpackfs/main.py:437
+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:453 src/modules/unpackfs/main.py:457
+#: src/modules/unpackfs/main.py:463 src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Chybná nastavení unsquash"
+
+#: src/modules/unpackfs/main.py:454
+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:458
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Zdrojový souborový systém „{}“ neexistuje"
+
+#: src/modules/unpackfs/main.py:464
+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 "Cíl „{}“ v cílovém systému není složka"
+
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr "Nastavování šifrovaného prostoru pro odkládání stránek paměti."
diff --git a/lang/python/da/LC_MESSAGES/python.po b/lang/python/da/LC_MESSAGES/python.po
index 08fc39593..bd33039aa 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-22 11:02+0200\n"
+"POT-Creation-Date: 2021-11-02 15:45+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"
@@ -22,137 +22,74 @@ msgstr ""
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Konfigurerer initramfs."
+
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/networkcfg/main.py:105
+#: src/modules/initcpiocfg/main.py:227 src/modules/initcpiocfg/main.py:231
+#: src/modules/localecfg/main.py:135 src/modules/mount/main.py:144
+#: src/modules/rawfs/main.py:164 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90
+msgid "Configuration Error"
+msgstr "Fejl ved konfiguration"
+
+#: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356
+#: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145
+#: src/modules/rawfs/main.py:165 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/luksopenswaphookcfg/main.py:87
+msgid "No partitions are defined for 
{!s}
 to use."
+msgstr "Der er ikke angivet nogle partitioner som 
{!s}
 kan bruge."
+
+#: src/modules/initramfscfg/main.py:90 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232
+#: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/luksopenswaphookcfg/main.py:91
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+"Der er ikke angivet noget rodmonteringspunkt som 
{!s}
 kan bruge."
+
 #: 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/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Installér bootloader."
 
-#: 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
-#: src/modules/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: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 "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}."
+#: 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}."
+"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/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Skriver fstab."
 
-#: 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"
+#: 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/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/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -211,27 +148,6 @@ 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/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 ""
-"Der er ikke angivet noget rodmonteringspunkt som 
{!s}
 kan bruge."
-
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
-msgstr "Konfigurerer krypteret swap."
-
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Installerer data."
-
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
 msgstr "Konfigurer OpenRC-tjenester"
@@ -252,6 +168,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,9 +202,9 @@ 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/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Gemmer netværkskonfiguration."
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
 #: src/modules/packages/main.py:69
@@ -332,59 +253,25 @@ msgid ""
 "command 
{!s}
 returned error code {!s}."
 msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Installér bootloader."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Konfigurer Plymouth-tema"
 
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
-msgstr ""
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Konfigurerer mkinitcpio."
 
-#: src/modules/bootloader/main.py:509
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Konfigurerer lokaliteter."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Indstiller hardwareur."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Monterer partitioner."
 
-#: 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/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Afslutningskoden var {}"
-
-#: 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/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Konfigurerer initramfs."
-
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Konfigurerer OpenRC dmcrypt-tjeneste."
-
-#: 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 ""
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Installerer data."
 
 #: src/modules/dummypython/main.py:35
 msgid "Dummy python job."
@@ -395,10 +282,124 @@ msgstr "Dummy python-job."
 msgid "Dummy python step {}"
 msgstr "Dummy python-trin {}"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Konfigurerer lokaliteter."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Indstiller hardwareur."
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Gemmer netværkskonfiguration."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Afmonter filsystemer."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Konfigurerer OpenRC dmcrypt-tjeneste."
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Konfigurer systemd-tjenester"
+
+#: 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/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+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:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Kan ikke deaktivere systemd-målet {name!s}."
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Kan ikke maskere systemd-enheden {name!s}."
+
+#: src/modules/services-systemd/main.py:75
+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/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:34
+msgid "Filling up filesystems."
+msgstr "Udfylder filsystemer."
+
+#: src/modules/unpackfs/main.py:254
+msgid "rsync failed with error code {}."
+msgstr "rsync mislykkede med fejlkoden {}."
+
+#: src/modules/unpackfs/main.py:299
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Udpakker aftrykket {}/{}, filen {}/{}"
+
+#: src/modules/unpackfs/main.py:314
+msgid "Starting to unpack {}"
+msgstr "Begynder at udpakke {}"
+
+#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:465
+msgid "Failed to unpack image \"{}\""
+msgstr "Kunne ikke udpakke aftrykket \"{}\""
+
+#: src/modules/unpackfs/main.py:430
+msgid "No mount point for root partition"
+msgstr "Intet monteringspunkt til rodpartition"
+
+#: src/modules/unpackfs/main.py:431
+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:436
+msgid "Bad mount point for root partition"
+msgstr "Dårligt monteringspunkt til rodpartition"
+
+#: src/modules/unpackfs/main.py:437
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint er \"{}\", hvilket ikke findes, gør intet"
+
+#: src/modules/unpackfs/main.py:453 src/modules/unpackfs/main.py:457
+#: src/modules/unpackfs/main.py:463 src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Dårlig unsquash-konfiguration"
+
+#: src/modules/unpackfs/main.py:454
+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:458
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Kildefilsystemet \"{}\" findes ikke"
+
+#: src/modules/unpackfs/main.py:464
+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 "Destinationen \"{}\" i målsystemet er ikke en mappe"
+
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr "Konfigurerer krypteret swap."
diff --git a/lang/python/de/LC_MESSAGES/python.po b/lang/python/de/LC_MESSAGES/python.po
index 703718bc7..0baff8013 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-22 11:02+0200\n"
+"POT-Creation-Date: 2021-11-02 15:45+0100\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,79 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Konfiguriere initramfs."
+
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/networkcfg/main.py:105
+#: src/modules/initcpiocfg/main.py:227 src/modules/initcpiocfg/main.py:231
+#: src/modules/localecfg/main.py:135 src/modules/mount/main.py:144
+#: src/modules/rawfs/main.py:164 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90
+msgid "Configuration Error"
+msgstr "Konfigurationsfehler"
+
+#: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356
+#: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145
+#: src/modules/rawfs/main.py:165 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/luksopenswaphookcfg/main.py:87
+msgid "No partitions are defined for 
{!s}
 to use."
+msgstr "Für 
{!s}
 sind keine zu verwendenden Partitionen definiert."
+
+#: src/modules/initramfscfg/main.py:90 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232
+#: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/luksopenswaphookcfg/main.py:91
+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/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/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Installiere Bootloader."
 
-#: 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
-#: src/modules/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/bootloader/main.py:508
+msgid "Bootloader installation error"
+msgstr "Fehler beim Installieren des Bootloaders"
 
-#: 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 "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
+#: 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."
+"Der Bootloader konnte nicht installiert werden. Der Installationsbefehl "
+"
{!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/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Schreibe fstab."
 
-#: 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}."
+#: src/modules/fstab/main.py:389
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
 msgstr ""
-"Unbekannte systemd-Befehle {command!s} und "
-"{suffix!s} für Einheit {name!s}."
+"Keine 
{!s}
 Konfiguration gegeben die 
{!s}
 benutzen "
+"könnte."
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Dateisysteme aushängen."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Erstelle initramfs mit dracut."
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Befüllen von Dateisystemen."
+#: 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: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/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "Der Exit-Code war {}"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -215,28 +153,6 @@ 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/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 ""
-"Für 
{!s}
 wurde kein Einhängepunkt für die Root-Partition "
-"angegeben."
-
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
-msgstr "Konfiguriere verschlüsselten Auslagerungsspeicher."
-
-#: 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"
@@ -257,6 +173,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,9 +209,9 @@ 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/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Speichere Netzwerkkonfiguration."
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
 #: src/modules/packages/main.py:69
@@ -345,63 +266,25 @@ 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."
-msgstr "Installiere Bootloader."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Konfiguriere Plymouth-Thema"
 
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
-msgstr "Fehler beim Installieren des Bootloaders"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Konfiguriere mkinitcpio. "
 
-#: src/modules/bootloader/main.py:509
-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/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Konfiguriere Lokalisierungen."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Einstellen der Hardware-Uhr."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Hänge Partitionen ein."
 
-#: 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/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Der Exit-Code war {}"
-
-#: 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/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Konfiguriere initramfs."
-
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Konfiguriere den dmcrypt-Dienst von OpenRC."
-
-#: 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 ""
-"Keine 
{!s}
 Konfiguration gegeben die 
{!s}
 benutzen "
-"könnte."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Installiere Daten."
 
 #: src/modules/dummypython/main.py:35
 msgid "Dummy python job."
@@ -412,10 +295,128 @@ msgstr "Dummy Python-Job"
 msgid "Dummy python step {}"
 msgstr "Dummy Python-Schritt {}"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Konfiguriere Lokalisierungen."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Einstellen der Hardware-Uhr."
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Speichere Netzwerkkonfiguration."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Dateisysteme aushängen."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Konfiguriere den dmcrypt-Dienst von OpenRC."
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Konfiguriere systemd-Dienste"
+
+#: 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:69
+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:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Das systemd-Ziel {name!s} kann nicht deaktiviert werden."
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Die systemd-Einheit {name!s} kann nicht maskiert werden."
+
+#: src/modules/services-systemd/main.py:75
+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/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:34
+msgid "Filling up filesystems."
+msgstr "Befüllen von Dateisystemen."
+
+#: src/modules/unpackfs/main.py:254
+msgid "rsync failed with error code {}."
+msgstr "rsync fehlgeschlagen mit Fehlercode {}."
+
+#: src/modules/unpackfs/main.py:299
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Abbilddatei Entpacken {}/{}, Datei {}/{}"
+
+#: src/modules/unpackfs/main.py:314
+msgid "Starting to unpack {}"
+msgstr "Beginn des Entpackens {}"
+
+#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:465
+msgid "Failed to unpack image \"{}\""
+msgstr "Entpacken der Abbilddatei \"{}\" fehlgeschlagen"
+
+#: src/modules/unpackfs/main.py:430
+msgid "No mount point for root partition"
+msgstr "Kein Einhängepunkt für die Root-Partition"
+
+#: src/modules/unpackfs/main.py:431
+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:436
+msgid "Bad mount point for root partition"
+msgstr "Ungültiger Einhängepunkt für die Root-Partition"
+
+#: src/modules/unpackfs/main.py:437
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint ist \"{}\", welcher nicht existiert, tue nichts"
+
+#: src/modules/unpackfs/main.py:453 src/modules/unpackfs/main.py:457
+#: src/modules/unpackfs/main.py:463 src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Ungültige unsquash-Konfiguration"
+
+#: src/modules/unpackfs/main.py:454
+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:458
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Das Quelldateisystem \"{}\" existiert nicht"
+
+#: src/modules/unpackfs/main.py:464
+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 "Das Ziel \"{}\" im Zielsystem ist kein Verzeichnis"
+
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr "Konfiguriere verschlüsselten Auslagerungsspeicher."
diff --git a/lang/python/el/LC_MESSAGES/python.po b/lang/python/el/LC_MESSAGES/python.po
index 507049313..0d214b96e 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-22 11:02+0200\n"
+"POT-Creation-Date: 2021-11-02 15:45+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"
@@ -21,131 +21,72 @@ msgstr ""
 "Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/networkcfg/main.py:105
+#: src/modules/initcpiocfg/main.py:227 src/modules/initcpiocfg/main.py:231
+#: src/modules/localecfg/main.py:135 src/modules/mount/main.py:144
+#: src/modules/rawfs/main.py:164 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356
+#: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145
+#: src/modules/rawfs/main.py:165 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/luksopenswaphookcfg/main.py:87
+msgid "No partitions are defined for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:90 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232
+#: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/luksopenswaphookcfg/main.py:91
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
 #: src/modules/grubcfg/main.py:28
 msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: 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
-#: src/modules/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"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: 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 ""
-
-#: 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
+#: 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/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/fstab/main.py:389
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
 msgstr ""
 
-#: 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}."
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 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"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
 #: src/modules/displaymanager/main.py:526
@@ -202,26 +143,6 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr ""
-
-#: 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 ""
-
-#: 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 ""
@@ -240,6 +161,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,8 +191,8 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
@@ -316,58 +242,24 @@ msgid ""
 "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:508
-msgid "Bootloader installation error"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/bootloader/main.py:509
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 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."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
 
 #: src/modules/dummypython/main.py:35
@@ -379,10 +271,121 @@ msgstr ""
 msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr ""
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+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:69
+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:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+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 ""
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:34
+msgid "Filling up filesystems."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:254
+msgid "rsync failed with error code {}."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:299
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:314
+msgid "Starting to unpack {}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:465
+msgid "Failed to unpack image \"{}\""
+msgstr ""
+
+#: src/modules/unpackfs/main.py:430
+msgid "No mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:431
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:436
+msgid "Bad mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:437
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:453 src/modules/unpackfs/main.py:457
+#: src/modules/unpackfs/main.py:463 src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:454
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:458
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:464
+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/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
diff --git a/lang/python/en_GB/LC_MESSAGES/python.po b/lang/python/en_GB/LC_MESSAGES/python.po
index 3d7632573..34fcd2d7a 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-22 11:02+0200\n"
+"POT-Creation-Date: 2021-11-02 15:45+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"
@@ -21,131 +21,72 @@ msgstr ""
 "Language: en_GB\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/networkcfg/main.py:105
+#: src/modules/initcpiocfg/main.py:227 src/modules/initcpiocfg/main.py:231
+#: src/modules/localecfg/main.py:135 src/modules/mount/main.py:144
+#: src/modules/rawfs/main.py:164 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356
+#: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145
+#: src/modules/rawfs/main.py:165 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/luksopenswaphookcfg/main.py:87
+msgid "No partitions are defined for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:90 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232
+#: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/luksopenswaphookcfg/main.py:91
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
 #: src/modules/grubcfg/main.py:28
 msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: 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
-#: src/modules/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"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: 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 ""
-
-#: 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
+#: 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/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/fstab/main.py:389
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
 msgstr ""
 
-#: 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}."
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 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 "Unmount file systems."
-
-#: 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"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
 #: src/modules/displaymanager/main.py:526
@@ -202,26 +143,6 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr ""
-
-#: 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 ""
-
-#: 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 ""
@@ -240,6 +161,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,8 +191,8 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
@@ -316,58 +242,24 @@ msgid ""
 "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:508
-msgid "Bootloader installation error"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/bootloader/main.py:509
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 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."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
 
 #: src/modules/dummypython/main.py:35
@@ -379,10 +271,121 @@ msgstr "Dummy python job."
 msgid "Dummy python step {}"
 msgstr "Dummy python step {}"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Unmount file systems."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+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:69
+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:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+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 ""
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:34
+msgid "Filling up filesystems."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:254
+msgid "rsync failed with error code {}."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:299
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:314
+msgid "Starting to unpack {}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:465
+msgid "Failed to unpack image \"{}\""
+msgstr ""
+
+#: src/modules/unpackfs/main.py:430
+msgid "No mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:431
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:436
+msgid "Bad mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:437
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:453 src/modules/unpackfs/main.py:457
+#: src/modules/unpackfs/main.py:463 src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:454
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:458
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:464
+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/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
diff --git a/lang/python/en_HK/LC_MESSAGES/python.po b/lang/python/en_HK/LC_MESSAGES/python.po
index 8d8ff0e32..f1e9f83f5 100644
--- a/lang/python/en_HK/LC_MESSAGES/python.po
+++ b/lang/python/en_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-22 11:02+0200\n"
+"POT-Creation-Date: 2021-11-02 15:45+0100\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: English (Hong Kong) (https://www.transifex.com/calamares/teams/20061/en_HK/)\n"
 "MIME-Version: 1.0\n"
@@ -17,131 +17,72 @@ msgstr ""
 "Language: en_HK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/networkcfg/main.py:105
+#: src/modules/initcpiocfg/main.py:227 src/modules/initcpiocfg/main.py:231
+#: src/modules/localecfg/main.py:135 src/modules/mount/main.py:144
+#: src/modules/rawfs/main.py:164 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356
+#: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145
+#: src/modules/rawfs/main.py:165 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/luksopenswaphookcfg/main.py:87
+msgid "No partitions are defined for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:90 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232
+#: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/luksopenswaphookcfg/main.py:91
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
 #: src/modules/grubcfg/main.py:28
 msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: 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
-#: src/modules/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"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: 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 ""
-
-#: 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
+#: 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/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/fstab/main.py:389
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
 msgstr ""
 
-#: 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}."
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 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"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
 #: src/modules/displaymanager/main.py:526
@@ -198,26 +139,6 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr ""
-
-#: 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 ""
-
-#: 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 ""
@@ -236,6 +157,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,8 +187,8 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
@@ -312,58 +238,24 @@ msgid ""
 "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:508
-msgid "Bootloader installation error"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/bootloader/main.py:509
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 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."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
 
 #: src/modules/dummypython/main.py:35
@@ -375,10 +267,121 @@ msgstr ""
 msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr ""
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+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:69
+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:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+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 ""
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:34
+msgid "Filling up filesystems."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:254
+msgid "rsync failed with error code {}."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:299
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:314
+msgid "Starting to unpack {}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:465
+msgid "Failed to unpack image \"{}\""
+msgstr ""
+
+#: src/modules/unpackfs/main.py:430
+msgid "No mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:431
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:436
+msgid "Bad mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:437
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:453 src/modules/unpackfs/main.py:457
+#: src/modules/unpackfs/main.py:463 src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:454
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:458
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:464
+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/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
diff --git a/lang/python/en_IN/LC_MESSAGES/python.po b/lang/python/en_IN/LC_MESSAGES/python.po
index 720dacb84..86efba711 100644
--- a/lang/python/en_IN/LC_MESSAGES/python.po
+++ b/lang/python/en_IN/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-22 11:02+0200\n"
+"POT-Creation-Date: 2021-11-02 15:45+0100\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: English (India) (https://www.transifex.com/calamares/teams/20061/en_IN/)\n"
 "MIME-Version: 1.0\n"
@@ -17,131 +17,72 @@ msgstr ""
 "Language: en_IN\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/networkcfg/main.py:105
+#: src/modules/initcpiocfg/main.py:227 src/modules/initcpiocfg/main.py:231
+#: src/modules/localecfg/main.py:135 src/modules/mount/main.py:144
+#: src/modules/rawfs/main.py:164 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356
+#: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145
+#: src/modules/rawfs/main.py:165 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/luksopenswaphookcfg/main.py:87
+msgid "No partitions are defined for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:90 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232
+#: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/luksopenswaphookcfg/main.py:91
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
 #: src/modules/grubcfg/main.py:28
 msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: 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
-#: src/modules/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"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: 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 ""
-
-#: 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
+#: 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/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/fstab/main.py:389
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
 msgstr ""
 
-#: 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}."
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 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"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
 #: src/modules/displaymanager/main.py:526
@@ -198,26 +139,6 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr ""
-
-#: 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 ""
-
-#: 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 ""
@@ -236,6 +157,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,8 +187,8 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
@@ -312,58 +238,24 @@ msgid ""
 "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:508
-msgid "Bootloader installation error"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/bootloader/main.py:509
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 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."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
 
 #: src/modules/dummypython/main.py:35
@@ -375,10 +267,121 @@ msgstr ""
 msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr ""
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+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:69
+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:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+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 ""
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:34
+msgid "Filling up filesystems."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:254
+msgid "rsync failed with error code {}."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:299
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:314
+msgid "Starting to unpack {}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:465
+msgid "Failed to unpack image \"{}\""
+msgstr ""
+
+#: src/modules/unpackfs/main.py:430
+msgid "No mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:431
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:436
+msgid "Bad mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:437
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:453 src/modules/unpackfs/main.py:457
+#: src/modules/unpackfs/main.py:463 src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:454
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:458
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:464
+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/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
diff --git a/lang/python/eo/LC_MESSAGES/python.po b/lang/python/eo/LC_MESSAGES/python.po
index 32c73160f..38e54de8c 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-22 11:02+0200\n"
+"POT-Creation-Date: 2021-11-02 15:45+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"
@@ -21,131 +21,72 @@ msgstr ""
 "Language: eo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/networkcfg/main.py:105
+#: src/modules/initcpiocfg/main.py:227 src/modules/initcpiocfg/main.py:231
+#: src/modules/localecfg/main.py:135 src/modules/mount/main.py:144
+#: src/modules/rawfs/main.py:164 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356
+#: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145
+#: src/modules/rawfs/main.py:165 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/luksopenswaphookcfg/main.py:87
+msgid "No partitions are defined for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:90 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232
+#: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/luksopenswaphookcfg/main.py:91
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
 #: src/modules/grubcfg/main.py:28
 msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: 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
-#: src/modules/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"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: 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 ""
-
-#: 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
+#: 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/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/fstab/main.py:389
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
 msgstr ""
 
-#: 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}."
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 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 "Demeti dosieraj sistemoj."
-
-#: 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"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
 #: src/modules/displaymanager/main.py:526
@@ -202,26 +143,6 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr ""
-
-#: 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 ""
-
-#: 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 ""
@@ -240,6 +161,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,8 +191,8 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
@@ -316,58 +242,24 @@ msgid ""
 "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:508
-msgid "Bootloader installation error"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/bootloader/main.py:509
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 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."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
 
 #: src/modules/dummypython/main.py:35
@@ -379,10 +271,121 @@ msgstr "Formala python laboro."
 msgid "Dummy python step {}"
 msgstr "Formala python paŝo {}"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Demeti dosieraj sistemoj."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+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:69
+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:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+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 ""
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:34
+msgid "Filling up filesystems."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:254
+msgid "rsync failed with error code {}."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:299
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:314
+msgid "Starting to unpack {}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:465
+msgid "Failed to unpack image \"{}\""
+msgstr ""
+
+#: src/modules/unpackfs/main.py:430
+msgid "No mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:431
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:436
+msgid "Bad mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:437
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:453 src/modules/unpackfs/main.py:457
+#: src/modules/unpackfs/main.py:463 src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:454
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:458
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:464
+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/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
diff --git a/lang/python/es/LC_MESSAGES/python.po b/lang/python/es/LC_MESSAGES/python.po
index 4ef7be0c5..3523a5fb4 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-22 11:02+0200\n"
+"POT-Creation-Date: 2021-11-02 15:45+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"
@@ -26,143 +26,75 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Configurando initramfs - sistema de inicio -."
+
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/networkcfg/main.py:105
+#: src/modules/initcpiocfg/main.py:227 src/modules/initcpiocfg/main.py:231
+#: src/modules/localecfg/main.py:135 src/modules/mount/main.py:144
+#: src/modules/rawfs/main.py:164 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90
+msgid "Configuration Error"
+msgstr "Error de configuración"
+
+#: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356
+#: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145
+#: src/modules/rawfs/main.py:165 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/luksopenswaphookcfg/main.py:87
+msgid "No partitions are defined for 
{!s}
 to use."
+msgstr "No hay definidas particiones en 1{!s}1 para usar."
+
+#: src/modules/initramfscfg/main.py:90 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232
+#: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/luksopenswaphookcfg/main.py:91
+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/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/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Instalar gestor de arranque."
 
-#: 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
-#: src/modules/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/bootloader/main.py:508
+msgid "Bootloader installation error"
+msgstr ""
 
-#: 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 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
+#: 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 ""
-"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/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Escribiendo la tabla de particiones fstab"
 
-#: 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}."
+#: src/modules/fstab/main.py:389
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
 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"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
-"No especificó un punto de montaje para la  partición raíz - / o root -"
+"Creando initramfs - sistema de arranque - con dracut - su constructor -."
 
-#: 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/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: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/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "El código de salida fue {}"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -220,27 +152,6 @@ 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/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 se facilitó un punto de montaje raíz utilizable para 
{!s}
 "
-
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
-msgstr "Configurando la memoria de intercambio - swap - encriptada."
-
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Instalando datos."
-
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
 msgstr "Configure servicios del sistema de inicio OpenRC"
@@ -265,6 +176,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,9 +211,9 @@ 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/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Guardando la  configuración de red."
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
 #: src/modules/packages/main.py:69
@@ -346,60 +262,25 @@ msgid ""
 "command 
{!s}
 returned error code {!s}."
 msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Instalar gestor de arranque."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Configure el tema de Plymouth - menú de bienvenida."
 
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
-msgstr ""
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Configurando mkinitcpio - sistema de arranque básico -."
 
-#: src/modules/bootloader/main.py:509
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Configurando especificaciones locales o regionales."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Configurando el reloj de la computadora."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Montando particiones"
 
-#: 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 "El código de salida fue {}"
-
-#: 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/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Configurando initramfs - sistema de inicio -."
-
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Configurando el servicio   - de arranque encriptado -. OpenRC dmcrypt"
-
-#: 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 ""
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Instalando datos."
 
 #: src/modules/dummypython/main.py:35
 msgid "Dummy python job."
@@ -410,10 +291,130 @@ msgstr "Tarea de python ficticia."
 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/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Configurando el reloj de la computadora."
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Guardando la  configuración de red."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Desmontar sistemas de archivos."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Configurando el servicio   - de arranque encriptado -. OpenRC dmcrypt"
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Configurar servicios de systemd"
+
+#: 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:69
+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:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr "No se puede desactivar el objetivo de systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "No se puede enmascarar la unidad de systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:75
+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:27
+msgid "Creating initramfs with mkinitfs."
+msgstr ""
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:34
+msgid "Filling up filesystems."
+msgstr "Rellenando los sistemas de archivos."
+
+#: src/modules/unpackfs/main.py:254
+msgid "rsync failed with error code {}."
+msgstr "Falló la sincronización  mediante rsync  con el código de error {}."
+
+#: src/modules/unpackfs/main.py:299
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Desempaquetando la imagen {}/{}, archivo {}/{}"
+
+#: src/modules/unpackfs/main.py:314
+msgid "Starting to unpack {}"
+msgstr "Iniciando el desempaquetado {}"
+
+#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:465
+msgid "Failed to unpack image \"{}\""
+msgstr "No se pudo desempaquetar la imagen «{}»"
+
+#: src/modules/unpackfs/main.py:430
+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:431
+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:436
+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:437
+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:453 src/modules/unpackfs/main.py:457
+#: src/modules/unpackfs/main.py:463 src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Configuración de \"unsquash\" no válida"
+
+#: src/modules/unpackfs/main.py:454
+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:458
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "El sistema de archivos de origen  \"{}\" no existe"
+
+#: src/modules/unpackfs/main.py:464
+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 "El destino \"{}\" en el sistema escogido  no es una carpeta"
+
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr "Configurando la memoria de intercambio - swap - encriptada."
diff --git a/lang/python/es_MX/LC_MESSAGES/python.po b/lang/python/es_MX/LC_MESSAGES/python.po
index 0655f2a8a..90db4b0e5 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-22 11:02+0200\n"
+"POT-Creation-Date: 2021-11-02 15:45+0100\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,73 @@ msgstr ""
 "Language: es_MX\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Configurando initramfs."
+
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/networkcfg/main.py:105
+#: src/modules/initcpiocfg/main.py:227 src/modules/initcpiocfg/main.py:231
+#: src/modules/localecfg/main.py:135 src/modules/mount/main.py:144
+#: src/modules/rawfs/main.py:164 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90
+msgid "Configuration Error"
+msgstr "Error de configuración"
+
+#: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356
+#: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145
+#: src/modules/rawfs/main.py:165 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/luksopenswaphookcfg/main.py:87
+msgid "No partitions are defined for 
{!s}
 to use."
+msgstr "No hay particiones definidas para que 
{!s}
 use."
+
+#: src/modules/initramfscfg/main.py:90 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232
+#: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/luksopenswaphookcfg/main.py:91
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
 #: 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/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Instalar el cargador de arranque."
 
-#: 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
-#: src/modules/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/bootloader/main.py:508
+msgid "Bootloader installation error"
+msgstr ""
 
-#: 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 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
+#: 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 ""
-"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/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Escribiento fstab."
 
-#: 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}."
+#: src/modules/fstab/main.py:389
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
 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/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Creando initramfs con dracut"
 
-#: 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/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Se falló al intentar correr dracut en el objetivo"
 
-#: 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/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "El código de salida fue {}"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -216,26 +147,6 @@ 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/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 ""
-
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
-msgstr "Configurando la swap encriptada."
-
-#: 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"
@@ -254,6 +165,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,9 +195,9 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Configurando el tema de Plymouth"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Guardando configuración de red."
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
 #: src/modules/packages/main.py:69
@@ -330,59 +246,25 @@ msgid ""
 "command 
{!s}
 returned error code {!s}."
 msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Instalar el cargador de arranque."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Configurando el tema de Plymouth"
 
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
-msgstr ""
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Configurando mkinitcpio"
 
-#: src/modules/bootloader/main.py:509
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Configurando locales."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Configurando el reloj del hardware."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Montando particiones."
 
-#: 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/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."
-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/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Configurando initramfs."
-
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Configurando el servicio OpenRc dmcrypt."
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Escribiento fstab."
-
-#: 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 "Instalando data."
 
 #: src/modules/dummypython/main.py:35
 msgid "Dummy python job."
@@ -393,10 +275,129 @@ msgstr "Trabajo python ficticio."
 msgid "Dummy python step {}"
 msgstr "Paso python ficticio {}"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Configurando locales."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Configurando el reloj del hardware."
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Guardando configuración de red."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Desmontar sistemas de archivo."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Configurando el servicio OpenRc dmcrypt."
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Configura los servicios de systemd"
+
+#: 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:69
+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:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+"No se puede deshabilitar el objetivo {name!s} de systemd."
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "No se puede enmascarar la unidad {name!s} de systemd."
+
+#: src/modules/services-systemd/main.py:75
+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/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:34
+msgid "Filling up filesystems."
+msgstr "Llenando sistema de archivos."
+
+#: src/modules/unpackfs/main.py:254
+msgid "rsync failed with error code {}."
+msgstr "rsync falló con código de error {}."
+
+#: src/modules/unpackfs/main.py:299
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Desempaquetando imagen {}/{}, archivo {}/{}"
+
+#: src/modules/unpackfs/main.py:314
+msgid "Starting to unpack {}"
+msgstr "Iniciando a desempaquetar {}"
+
+#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:465
+msgid "Failed to unpack image \"{}\""
+msgstr "Se falló en la desempaquetización de la imagen \"{}\""
+
+#: src/modules/unpackfs/main.py:430
+msgid "No mount point for root partition"
+msgstr "No existe punto de montaje para la partición raíz"
+
+#: src/modules/unpackfs/main.py:431
+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:436
+msgid "Bad mount point for root partition"
+msgstr "Mal punto de montaje para la partición raíz"
+
+#: src/modules/unpackfs/main.py:437
+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:453 src/modules/unpackfs/main.py:457
+#: src/modules/unpackfs/main.py:463 src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Mala configuración del paquete unsquash"
+
+#: src/modules/unpackfs/main.py:454
+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:458
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "El sistema de archivos fuente \"{}\" no existe"
+
+#: src/modules/unpackfs/main.py:464
+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 "El destino \"{}\" en el sistema objetivo no es un directorio"
+
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr "Configurando la swap encriptada."
diff --git a/lang/python/es_PE/LC_MESSAGES/python.po b/lang/python/es_PE/LC_MESSAGES/python.po
index 116f8cbfe..cf0c02779 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-22 11:02+0200\n"
+"POT-Creation-Date: 2021-11-02 15:45+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"
@@ -17,131 +17,72 @@ msgstr ""
 "Language: es_PE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/networkcfg/main.py:105
+#: src/modules/initcpiocfg/main.py:227 src/modules/initcpiocfg/main.py:231
+#: src/modules/localecfg/main.py:135 src/modules/mount/main.py:144
+#: src/modules/rawfs/main.py:164 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356
+#: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145
+#: src/modules/rawfs/main.py:165 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/luksopenswaphookcfg/main.py:87
+msgid "No partitions are defined for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:90 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232
+#: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/luksopenswaphookcfg/main.py:91
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
 #: src/modules/grubcfg/main.py:28
 msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: 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
-#: src/modules/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"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: 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 ""
-
-#: 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
+#: 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/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/fstab/main.py:389
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
 msgstr ""
 
-#: 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}."
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 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"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
 #: src/modules/displaymanager/main.py:526
@@ -198,26 +139,6 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr ""
-
-#: 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 ""
-
-#: 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 ""
@@ -236,6 +157,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,8 +187,8 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
@@ -312,58 +238,24 @@ msgid ""
 "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:508
-msgid "Bootloader installation error"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/bootloader/main.py:509
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 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."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
 
 #: src/modules/dummypython/main.py:35
@@ -375,10 +267,121 @@ msgstr ""
 msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr ""
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+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:69
+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:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+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 ""
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:34
+msgid "Filling up filesystems."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:254
+msgid "rsync failed with error code {}."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:299
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:314
+msgid "Starting to unpack {}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:465
+msgid "Failed to unpack image \"{}\""
+msgstr ""
+
+#: src/modules/unpackfs/main.py:430
+msgid "No mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:431
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:436
+msgid "Bad mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:437
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:453 src/modules/unpackfs/main.py:457
+#: src/modules/unpackfs/main.py:463 src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:454
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:458
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:464
+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/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
diff --git a/lang/python/es_PR/LC_MESSAGES/python.po b/lang/python/es_PR/LC_MESSAGES/python.po
index a3558eaee..859947f19 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-22 11:02+0200\n"
+"POT-Creation-Date: 2021-11-02 15:45+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"
@@ -17,131 +17,72 @@ msgstr ""
 "Language: es_PR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/networkcfg/main.py:105
+#: src/modules/initcpiocfg/main.py:227 src/modules/initcpiocfg/main.py:231
+#: src/modules/localecfg/main.py:135 src/modules/mount/main.py:144
+#: src/modules/rawfs/main.py:164 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356
+#: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145
+#: src/modules/rawfs/main.py:165 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/luksopenswaphookcfg/main.py:87
+msgid "No partitions are defined for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:90 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232
+#: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/luksopenswaphookcfg/main.py:91
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
 #: src/modules/grubcfg/main.py:28
 msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: 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
-#: src/modules/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"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: 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 ""
-
-#: 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
+#: 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/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/fstab/main.py:389
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
 msgstr ""
 
-#: 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}."
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 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"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
 #: src/modules/displaymanager/main.py:526
@@ -198,26 +139,6 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr ""
-
-#: 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 ""
-
-#: 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 ""
@@ -236,6 +157,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,8 +187,8 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
@@ -312,58 +238,24 @@ msgid ""
 "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:508
-msgid "Bootloader installation error"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/bootloader/main.py:509
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 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."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
 
 #: src/modules/dummypython/main.py:35
@@ -375,10 +267,121 @@ msgstr ""
 msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr ""
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+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:69
+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:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+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 ""
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:34
+msgid "Filling up filesystems."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:254
+msgid "rsync failed with error code {}."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:299
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:314
+msgid "Starting to unpack {}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:465
+msgid "Failed to unpack image \"{}\""
+msgstr ""
+
+#: src/modules/unpackfs/main.py:430
+msgid "No mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:431
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:436
+msgid "Bad mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:437
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:453 src/modules/unpackfs/main.py:457
+#: src/modules/unpackfs/main.py:463 src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:454
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:458
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:464
+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/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
diff --git a/lang/python/et/LC_MESSAGES/python.po b/lang/python/et/LC_MESSAGES/python.po
index b04400972..dde13010d 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-22 11:02+0200\n"
+"POT-Creation-Date: 2021-11-02 15:45+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"
@@ -21,131 +21,72 @@ msgstr ""
 "Language: et\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/networkcfg/main.py:105
+#: src/modules/initcpiocfg/main.py:227 src/modules/initcpiocfg/main.py:231
+#: src/modules/localecfg/main.py:135 src/modules/mount/main.py:144
+#: src/modules/rawfs/main.py:164 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356
+#: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145
+#: src/modules/rawfs/main.py:165 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/luksopenswaphookcfg/main.py:87
+msgid "No partitions are defined for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:90 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232
+#: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/luksopenswaphookcfg/main.py:91
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
 #: src/modules/grubcfg/main.py:28
 msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: 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
-#: src/modules/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"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: 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 ""
-
-#: 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
+#: 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/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/fstab/main.py:389
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
 msgstr ""
 
-#: 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}."
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 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"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
 #: src/modules/displaymanager/main.py:526
@@ -202,26 +143,6 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr ""
-
-#: 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 ""
-
-#: 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 ""
@@ -240,6 +161,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,8 +191,8 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
@@ -316,58 +242,24 @@ msgid ""
 "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:508
-msgid "Bootloader installation error"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/bootloader/main.py:509
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 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."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
 
 #: src/modules/dummypython/main.py:35
@@ -379,10 +271,121 @@ msgstr "Testiv python'i töö."
 msgid "Dummy python step {}"
 msgstr "Testiv python'i aste {}"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Haagi failisüsteemid lahti."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+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:69
+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:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+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 ""
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:34
+msgid "Filling up filesystems."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:254
+msgid "rsync failed with error code {}."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:299
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:314
+msgid "Starting to unpack {}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:465
+msgid "Failed to unpack image \"{}\""
+msgstr ""
+
+#: src/modules/unpackfs/main.py:430
+msgid "No mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:431
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:436
+msgid "Bad mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:437
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:453 src/modules/unpackfs/main.py:457
+#: src/modules/unpackfs/main.py:463 src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:454
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:458
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:464
+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/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
diff --git a/lang/python/eu/LC_MESSAGES/python.po b/lang/python/eu/LC_MESSAGES/python.po
index 9da156012..b08ed33ff 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-22 11:02+0200\n"
+"POT-Creation-Date: 2021-11-02 15:45+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"
@@ -21,131 +21,72 @@ msgstr ""
 "Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/networkcfg/main.py:105
+#: src/modules/initcpiocfg/main.py:227 src/modules/initcpiocfg/main.py:231
+#: src/modules/localecfg/main.py:135 src/modules/mount/main.py:144
+#: src/modules/rawfs/main.py:164 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356
+#: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145
+#: src/modules/rawfs/main.py:165 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/luksopenswaphookcfg/main.py:87
+msgid "No partitions are defined for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:90 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232
+#: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/luksopenswaphookcfg/main.py:91
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
 #: src/modules/grubcfg/main.py:28
 msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: 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
-#: src/modules/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"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: 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 ""
-
-#: 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
+#: 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/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/fstab/main.py:389
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
 msgstr ""
 
-#: 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}."
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 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"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
 #: src/modules/displaymanager/main.py:526
@@ -203,26 +144,6 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "Pantaila kudeatzaile konfigurazioa osotu gabe"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr ""
-
-#: 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 ""
-
-#: 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 ""
@@ -241,6 +162,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,8 +192,8 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
@@ -317,58 +243,24 @@ msgid ""
 "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:508
-msgid "Bootloader installation error"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/bootloader/main.py:509
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 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."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
 
 #: src/modules/dummypython/main.py:35
@@ -380,10 +272,121 @@ msgstr "Dummy python lana."
 msgid "Dummy python step {}"
 msgstr "Dummy python urratsa {}"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Fitxategi sistemak desmuntatu."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+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:69
+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:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+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 ""
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:34
+msgid "Filling up filesystems."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:254
+msgid "rsync failed with error code {}."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:299
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:314
+msgid "Starting to unpack {}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:465
+msgid "Failed to unpack image \"{}\""
+msgstr ""
+
+#: src/modules/unpackfs/main.py:430
+msgid "No mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:431
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:436
+msgid "Bad mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:437
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:453 src/modules/unpackfs/main.py:457
+#: src/modules/unpackfs/main.py:463 src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:454
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:458
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:464
+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/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
diff --git a/lang/python/fa/LC_MESSAGES/python.po b/lang/python/fa/LC_MESSAGES/python.po
index 3dc17bd5e..914c8c70c 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-22 11:02+0200\n"
+"POT-Creation-Date: 2021-11-02 15:45+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"
@@ -22,136 +22,73 @@ msgstr ""
 "Language: fa\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "در حال پیکربندی initramfs."
+
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/networkcfg/main.py:105
+#: src/modules/initcpiocfg/main.py:227 src/modules/initcpiocfg/main.py:231
+#: src/modules/localecfg/main.py:135 src/modules/mount/main.py:144
+#: src/modules/rawfs/main.py:164 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90
+msgid "Configuration Error"
+msgstr "خطای پیکربندی"
+
+#: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356
+#: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145
+#: src/modules/rawfs/main.py:165 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/luksopenswaphookcfg/main.py:87
+msgid "No partitions are defined for 
{!s}
 to use."
+msgstr "هیچ افرازی برای استفادهٔ 
{!s}
 تعریف نشده."
+
+#: src/modules/initramfscfg/main.py:90 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232
+#: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/luksopenswaphookcfg/main.py:91
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr "هیچ نقطهٔ اتّصال ریشه‌ای برای استفادهٔ 
{!s}
 داده نشده."
+
 #: src/modules/grubcfg/main.py:28
 msgid "Configure GRUB."
 msgstr "در حال پیکربندی گراب."
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "در حال سوار کردن افرازها."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "نصب بارکنندهٔ راه‌اندازی."
 
-#: 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
-#: src/modules/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: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 "هیچ افرازی برای استفادهٔ 
{!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}."
+#: 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/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "در حال نوشتن fstab."
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "در حال پر کردن سامانه‌پرونده‌ها."
+#: src/modules/fstab/main.py:389
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
 
-#: 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 "در حال ایجاد 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/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/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "رمز خروج {} بود"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -207,26 +144,6 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "پیکربندی مدیر نمایش کامل نبود"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "پیکربندی mkinitcpio."
-
-#: 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 "هیچ نقطهٔ اتّصال ریشه‌ای برای استفادهٔ 
{!s}
 داده نشده."
-
-#: 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 "پیکربندی خدمات OpenRC"
@@ -245,6 +162,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,9 +192,9 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "در حال پیکربندی زمینهٔ پلی‌موث"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "در حال ذخیرهٔ پیکربندی شبکه."
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
 #: src/modules/packages/main.py:69
@@ -321,59 +243,25 @@ msgid ""
 "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:508
-msgid "Bootloader installation error"
-msgstr ""
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "پیکربندی mkinitcpio."
 
-#: src/modules/bootloader/main.py:509
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "پیکربندی مکانها"
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "در حال تنظیم ساعت سخت‌افزاری."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+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 "در حال ایجاد initramfs با dracut."
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "شکست در اجرای dracut روی هدف"
-
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "در حال پیکربندی initramfs."
-
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "در حال پیکربندی خدمت dmcrypt OpenRC."
-
-#: 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 ""
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "داده‌های نصب"
 
 #: src/modules/dummypython/main.py:35
 msgid "Dummy python job."
@@ -384,10 +272,125 @@ msgstr "کار پایتونی الکی."
 msgid "Dummy python step {}"
 msgstr "گام پایتونی الکی {}"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "پیکربندی مکانها"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "در حال تنظیم ساعت سخت‌افزاری."
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "در حال ذخیرهٔ پیکربندی شبکه."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "پیاده کردن سامانه‌های پرونده."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "در حال پیکربندی خدمت dmcrypt OpenRC."
+
+#: 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 ""
+"فراخوانی systemctl {arg!s} در chroot رمز خطای {num!s} را "
+"برگرداند."
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+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:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr "نمی‌توان خدمت سیستم‌دی {name!s} را از کار انداخت."
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "نمی‌توان واحد سیستم‌دی {name!s} را پوشاند."
+
+#: src/modules/services-systemd/main.py:75
+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:27
+msgid "Creating initramfs with mkinitfs."
+msgstr ""
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:34
+msgid "Filling up filesystems."
+msgstr "در حال پر کردن سامانه‌پرونده‌ها."
+
+#: src/modules/unpackfs/main.py:254
+msgid "rsync failed with error code {}."
+msgstr "آرسینک با رمز خطای {} شکست خورد."
+
+#: src/modules/unpackfs/main.py:299
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "در حال بسته‌گشایی تصویر {}/{}، پروندهٔ {}/{}"
+
+#: src/modules/unpackfs/main.py:314
+msgid "Starting to unpack {}"
+msgstr "در حال شروع بسته‌گشایی {}"
+
+#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:465
+msgid "Failed to unpack image \"{}\""
+msgstr "شکست در بسته‌گشایی تصویر {}"
+
+#: src/modules/unpackfs/main.py:430
+msgid "No mount point for root partition"
+msgstr "هیچ نقطهٔ اتّصالی برای افراز ریشه وجود ندارد"
+
+#: src/modules/unpackfs/main.py:431
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage کلید rootMountPoint را ندارد. کاری انجام نمی‌شود"
+
+#: src/modules/unpackfs/main.py:436
+msgid "Bad mount point for root partition"
+msgstr "نقطهٔ اتّصال بد برای افراز ریشه"
+
+#: src/modules/unpackfs/main.py:437
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "نقطهٔ اتّصال ریشه {} است که وجود ندارد. کاری انجام نمی‌شود"
+
+#: src/modules/unpackfs/main.py:453 src/modules/unpackfs/main.py:457
+#: src/modules/unpackfs/main.py:463 src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "پیکربندی بد unsquash"
+
+#: src/modules/unpackfs/main.py:454
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "کرنل کنونیتان از سامانه‌پروندهٔ {} ({}) پشتیبانی نمی‌کند"
+
+#: src/modules/unpackfs/main.py:458
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "سامانهٔ پروندهٔ مبدأ {} وجود ندارد"
+
+#: src/modules/unpackfs/main.py:464
+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/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr "در حال پیکربندی مبادلهٔ رمزشده."
diff --git a/lang/python/fi_FI/LC_MESSAGES/python.po b/lang/python/fi_FI/LC_MESSAGES/python.po
index 53bc01098..d902a569a 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-22 11:02+0200\n"
+"POT-Creation-Date: 2021-11-02 15:45+0100\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,76 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Määritetään initramfs."
+
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/networkcfg/main.py:105
+#: src/modules/initcpiocfg/main.py:227 src/modules/initcpiocfg/main.py:231
+#: src/modules/localecfg/main.py:135 src/modules/mount/main.py:144
+#: src/modules/rawfs/main.py:164 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90
+msgid "Configuration Error"
+msgstr "Määritysvirhe"
+
+#: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356
+#: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145
+#: src/modules/rawfs/main.py:165 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/luksopenswaphookcfg/main.py:87
+msgid "No partitions are defined for 
{!s}
 to use."
+msgstr "Ei ole määritetty käyttämään osioita 
{!s}
 ."
+
+#: src/modules/initramfscfg/main.py:90 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232
+#: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/luksopenswaphookcfg/main.py:91
+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/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/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Asenna bootloader."
 
-#: 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
-#: src/modules/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/bootloader/main.py:508
+msgid "Bootloader installation error"
+msgstr "Bootloader asennusvirhe"
 
-#: 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 "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
+#: src/modules/bootloader/main.py:509
 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}."
+"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}."
+"Bootloaderia ei voitu asentaa. Asennuskomento 
{!s}
 palautti "
+"virhekoodin {!s}."
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Irrota tiedostojärjestelmät käytöstä."
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Fstab kirjoittaminen."
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Paikannetaan tiedostojärjestelmiä."
+#: 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: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/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/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "Poistumiskoodi oli {}"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -208,27 +148,6 @@ 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/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 ""
-"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/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"
@@ -249,6 +168,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,9 +200,9 @@ 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/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Tallennetaan verkon määrityksiä."
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
 #: src/modules/packages/main.py:69
@@ -333,61 +257,25 @@ 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:508
-msgid "Bootloader installation error"
-msgstr "Bootloader asennusvirhe"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Määritetään mkinitcpio."
 
-#: src/modules/bootloader/main.py:509
-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/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Määritetään locales."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Laitteiston kellon asettaminen."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Yhdistä osiot."
 
-#: 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/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Poistumiskoodi oli {}"
-
-#: 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/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Määritetään initramfs."
-
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "OpenRC dmcrypt-palvelun määrittäminen."
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Fstab kirjoittaminen."
-
-#: 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/dummypython/main.py:35
 msgid "Dummy python job."
@@ -398,10 +286,125 @@ msgstr "Harjoitus python job."
 msgid "Dummy python step {}"
 msgstr "Harjoitus python vaihe {}"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Määritetään locales."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Laitteiston kellon asettaminen."
 
-#: src/modules/networkcfg/main.py:29
-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/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "OpenRC dmcrypt-palvelun määrittäminen."
+
+#: 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:69
+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:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr "Systemd timer, ei voi ottaa käyttöön {name!s}."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Systemd-kohdetta ei-voi poistaa käytöstä {name!s}."
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Ei voi peittää systemd-yksikköä {name!s}."
+
+#: src/modules/services-systemd/main.py:75
+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/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Kohteen mkinitfs-suoritus epäonnistui."
+
+#: src/modules/unpackfs/main.py:34
+msgid "Filling up filesystems."
+msgstr "Paikannetaan tiedostojärjestelmiä."
+
+#: src/modules/unpackfs/main.py:254
+msgid "rsync failed with error code {}."
+msgstr "rsync epäonnistui virhekoodilla {}."
+
+#: src/modules/unpackfs/main.py:299
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Kuvan purkaminen {}/{}, tiedosto {}/{}"
+
+#: src/modules/unpackfs/main.py:314
+msgid "Starting to unpack {}"
+msgstr "Pakkauksen purkaminen alkaa {}"
+
+#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:465
+msgid "Failed to unpack image \"{}\""
+msgstr "Kuvan purkaminen epäonnistui \"{}\""
+
+#: src/modules/unpackfs/main.py:430
+msgid "No mount point for root partition"
+msgstr "Ei liitoskohtaa juuri root osiolle"
+
+#: src/modules/unpackfs/main.py:431
+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:436
+msgid "Bad mount point for root partition"
+msgstr "Huono kiinnityspiste root-osioon"
+
+#: src/modules/unpackfs/main.py:437
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint on \"{}\", jota ei ole, eikä tee mitään"
+
+#: src/modules/unpackfs/main.py:453 src/modules/unpackfs/main.py:457
+#: src/modules/unpackfs/main.py:463 src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Huono epäpuhdas kokoonpano"
+
+#: src/modules/unpackfs/main.py:454
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "Tiedostojärjestelmä \"{}\" ({}) ei tue sinun nykyistä kerneliä "
+
+#: src/modules/unpackfs/main.py:458
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Lähde tiedostojärjestelmää \"{}\" ei ole olemassa"
+
+#: src/modules/unpackfs/main.py:464
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed."
+msgstr ""
+"Unsquashfs-tiedostoja ei löytynyt, varmista, että squashfs-tools paketti on "
+"asennettu."
+
+#: 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/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr "Salatun swapin määrittäminen."
diff --git a/lang/python/fr/LC_MESSAGES/python.po b/lang/python/fr/LC_MESSAGES/python.po
index 0463a3fa2..61657a3ef 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-22 11:02+0200\n"
+"POT-Creation-Date: 2021-11-02 15:45+0100\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,76 @@ 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/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Configuration du initramfs."
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Montage des partitions."
-
-#: 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
-#: src/modules/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
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/networkcfg/main.py:105
+#: src/modules/initcpiocfg/main.py:227 src/modules/initcpiocfg/main.py:231
+#: src/modules/localecfg/main.py:135 src/modules/mount/main.py:144
+#: src/modules/rawfs/main.py:164 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90
 msgid "Configuration Error"
 msgstr "Erreur de configuration"
 
-#: 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
+#: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356
+#: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145
+#: src/modules/rawfs/main.py:165 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/luksopenswaphookcfg/main.py:87
 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/initramfscfg/main.py:90 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232
+#: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/luksopenswaphookcfg/main.py:91
+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/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Impossible de modifier le service"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Configuration du GRUB."
 
-#: src/modules/services-systemd/main.py:60
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Installation du bootloader."
+
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
+msgstr ""
+
+#: 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 ""
-"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/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Écriture du fstab."
 
-#: 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}."
+#: src/modules/fstab/main.py:389
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
 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/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Configuration du initramfs avec dracut."
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Remplir les systèmes de fichiers."
+#: 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: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/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "Le code de sortie était {}"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -224,28 +159,6 @@ 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/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 ""
-"Aucun point de montage racine n'a été donné pour être utilisé par "
-"
{!s}
."
-
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
-msgstr "Configuration du swap chiffrée."
-
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Installation de données."
-
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
 msgstr "Configurer les services OpenRC"
@@ -266,6 +179,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,9 +215,9 @@ 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/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Sauvegarde de la configuration du réseau en cours."
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
 #: src/modules/packages/main.py:69
@@ -348,59 +266,25 @@ msgid ""
 "command 
{!s}
 returned error code {!s}."
 msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Installation du bootloader."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Configurer le thème Plymouth"
 
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
-msgstr ""
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Configuration de mkinitcpio."
 
-#: src/modules/bootloader/main.py:509
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Configuration des locales."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Configuration de l'horloge matériel."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Montage des partitions."
 
-#: 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/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Le code de sortie était {}"
-
-#: 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/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Configuration du initramfs."
-
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Configuration du service OpenRC dmcrypt."
-
-#: 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 ""
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Installation de données."
 
 #: src/modules/dummypython/main.py:35
 msgid "Dummy python job."
@@ -411,10 +295,127 @@ msgstr "Tâche factice de python"
 msgid "Dummy python step {}"
 msgstr "Étape factice de python {}"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Configuration des locales."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Configuration de l'horloge matériel."
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Sauvegarde de la configuration du réseau en cours."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Démonter les systèmes de fichiers"
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Configuration du service OpenRC dmcrypt."
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Configurer les services systemd"
+
+#: 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:69
+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:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Impossible de désactiver la cible systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Impossible de masquer l'unit systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:75
+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/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:34
+msgid "Filling up filesystems."
+msgstr "Remplir les systèmes de fichiers."
+
+#: src/modules/unpackfs/main.py:254
+msgid "rsync failed with error code {}."
+msgstr "rsync a échoué avec le code d'erreur {}."
+
+#: src/modules/unpackfs/main.py:299
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Décompression de l'image {}/{}, fichier {}/{}"
+
+#: src/modules/unpackfs/main.py:314
+msgid "Starting to unpack {}"
+msgstr "Commencer à décompresser {}"
+
+#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:465
+msgid "Failed to unpack image \"{}\""
+msgstr "Impossible de décompresser l'image \"{}\""
+
+#: src/modules/unpackfs/main.py:430
+msgid "No mount point for root partition"
+msgstr "Pas de point de montage pour la partition racine"
+
+#: src/modules/unpackfs/main.py:431
+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:436
+msgid "Bad mount point for root partition"
+msgstr "Mauvais point de montage pour la partition racine"
+
+#: src/modules/unpackfs/main.py:437
+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:453 src/modules/unpackfs/main.py:457
+#: src/modules/unpackfs/main.py:463 src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Mauvaise configuration unsquash"
+
+#: src/modules/unpackfs/main.py:454
+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:458
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Le système de fichiers source \"{}\" n'existe pas"
+
+#: src/modules/unpackfs/main.py:464
+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 "La destination \"{}\" dans le système cible n'est pas un répertoire"
+
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr "Configuration du swap chiffrée."
diff --git a/lang/python/fr_CH/LC_MESSAGES/python.po b/lang/python/fr_CH/LC_MESSAGES/python.po
index 10e1b7ff1..4da36ca36 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-22 11:02+0200\n"
+"POT-Creation-Date: 2021-11-02 15:45+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"
@@ -17,131 +17,72 @@ msgstr ""
 "Language: fr_CH\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/networkcfg/main.py:105
+#: src/modules/initcpiocfg/main.py:227 src/modules/initcpiocfg/main.py:231
+#: src/modules/localecfg/main.py:135 src/modules/mount/main.py:144
+#: src/modules/rawfs/main.py:164 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356
+#: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145
+#: src/modules/rawfs/main.py:165 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/luksopenswaphookcfg/main.py:87
+msgid "No partitions are defined for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:90 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232
+#: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/luksopenswaphookcfg/main.py:91
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
 #: src/modules/grubcfg/main.py:28
 msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: 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
-#: src/modules/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"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: 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 ""
-
-#: 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
+#: 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/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/fstab/main.py:389
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
 msgstr ""
 
-#: 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}."
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 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"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
 #: src/modules/displaymanager/main.py:526
@@ -198,26 +139,6 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr ""
-
-#: 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 ""
-
-#: 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 ""
@@ -236,6 +157,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,8 +187,8 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
@@ -312,58 +238,24 @@ msgid ""
 "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:508
-msgid "Bootloader installation error"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/bootloader/main.py:509
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 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."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
 
 #: src/modules/dummypython/main.py:35
@@ -375,10 +267,121 @@ msgstr ""
 msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr ""
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+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:69
+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:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+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 ""
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:34
+msgid "Filling up filesystems."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:254
+msgid "rsync failed with error code {}."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:299
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:314
+msgid "Starting to unpack {}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:465
+msgid "Failed to unpack image \"{}\""
+msgstr ""
+
+#: src/modules/unpackfs/main.py:430
+msgid "No mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:431
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:436
+msgid "Bad mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:437
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:453 src/modules/unpackfs/main.py:457
+#: src/modules/unpackfs/main.py:463 src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:454
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:458
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:464
+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/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
diff --git a/lang/python/fur/LC_MESSAGES/python.po b/lang/python/fur/LC_MESSAGES/python.po
index bc6081bc0..5ecb36b0f 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-22 11:02+0200\n"
+"POT-Creation-Date: 2021-11-02 15:45+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"
@@ -21,140 +21,74 @@ msgstr ""
 "Language: fur\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Daûr a configurâ initramfs."
+
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/networkcfg/main.py:105
+#: src/modules/initcpiocfg/main.py:227 src/modules/initcpiocfg/main.py:231
+#: src/modules/localecfg/main.py:135 src/modules/mount/main.py:144
+#: src/modules/rawfs/main.py:164 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90
+msgid "Configuration Error"
+msgstr "Erôr di configurazion"
+
+#: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356
+#: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145
+#: src/modules/rawfs/main.py:165 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/luksopenswaphookcfg/main.py:87
+msgid "No partitions are defined for 
{!s}
 to use."
+msgstr "No je stade definide nissune partizion di doprâ par 
{!s}
."
+
+#: src/modules/initramfscfg/main.py:90 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232
+#: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/luksopenswaphookcfg/main.py:91
+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/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/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Instale il bootloader."
 
-#: 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
-#: src/modules/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/bootloader/main.py:508
+msgid "Bootloader installation error"
+msgstr ""
 
-#: 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 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
+#: 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 ""
-"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/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Daûr a scrivi fstab."
 
-#: 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}."
+#: src/modules/fstab/main.py:389
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
 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/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Daûr a creâ initramfs cun dracut."
 
-#: 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/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/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/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "Il codiç di jessude al jere {}"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -212,27 +146,6 @@ 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/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 ""
-"Nol è stât indicât nissun pont di montaç di doprâ par 
{!s}
."
-
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
-msgstr "Daûr a configurâ la memorie di scambi (swap) cifrade."
-
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Daûr a instalâ i dâts."
-
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
 msgstr "Configure i servizis OpenRC"
@@ -253,6 +166,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,9 +200,9 @@ 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/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Salvament de configurazion di rêt."
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
 #: src/modules/packages/main.py:69
@@ -333,59 +251,25 @@ msgid ""
 "command 
{!s}
 returned error code {!s}."
 msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Instale il bootloader."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Configure il teme di Plymouth"
 
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
-msgstr ""
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Daûr a configurâ di mkinitcpio."
 
-#: src/modules/bootloader/main.py:509
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Daûr a configurâ la localizazion."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Daûr a configurâ l'orloi hardware."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Montaç des partizions."
 
-#: 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/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Il codiç di jessude al jere {}"
-
-#: 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/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Daûr a configurâ initramfs."
-
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Daûr a configurâ il servizi dmcrypt di OpenRC."
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Daûr a scrivi fstab."
-
-#: 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 "Daûr a instalâ i dâts."
 
 #: src/modules/dummypython/main.py:35
 msgid "Dummy python job."
@@ -396,10 +280,127 @@ msgstr "Lavôr di python pustiç."
 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/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Daûr a configurâ l'orloi hardware."
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Salvament de configurazion di rêt."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Dismonte i file-systems."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Daûr a configurâ il servizi dmcrypt di OpenRC."
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Configure i servizis di systemd"
+
+#: 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:69
+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:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+"Impussibil disabilitâ la destinazion di systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Impussibil mascarâ la unitât di systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:75
+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/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:34
+msgid "Filling up filesystems."
+msgstr "Daûr a jemplâ i filesystems."
+
+#: src/modules/unpackfs/main.py:254
+msgid "rsync failed with error code {}."
+msgstr "Sincronizazion cun rsync falide cun codiç di erôr {}. "
+
+#: src/modules/unpackfs/main.py:299
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Estrazion imagjin {}/{}, file {}/{}"
+
+#: src/modules/unpackfs/main.py:314
+msgid "Starting to unpack {}"
+msgstr "Daûr a scomençâ la estrazion {}"
+
+#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:465
+msgid "Failed to unpack image \"{}\""
+msgstr "No si è rivâts a estrai la imagjin \"{}\""
+
+#: src/modules/unpackfs/main.py:430
+msgid "No mount point for root partition"
+msgstr "Nissun pont di montaç pe partizion lidrîs"
+
+#: src/modules/unpackfs/main.py:431
+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:436
+msgid "Bad mount point for root partition"
+msgstr "Pont di montaç sbaliât pe partizion lidrîs"
+
+#: src/modules/unpackfs/main.py:437
+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:453 src/modules/unpackfs/main.py:457
+#: src/modules/unpackfs/main.py:463 src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Configurazion di \"unsquash\" sbaliade"
+
+#: src/modules/unpackfs/main.py:454
+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:458
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Il filesystem sorzint \"{}\" nol esist"
+
+#: src/modules/unpackfs/main.py:464
+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 "La destinazion \"{}\" tal sisteme che si va a creâ no je une cartele"
+
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr "Daûr a configurâ la memorie di scambi (swap) cifrade."
diff --git a/lang/python/gl/LC_MESSAGES/python.po b/lang/python/gl/LC_MESSAGES/python.po
index d00e842fa..a42c15dec 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-22 11:02+0200\n"
+"POT-Creation-Date: 2021-11-02 15:45+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"
@@ -21,131 +21,72 @@ msgstr ""
 "Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/networkcfg/main.py:105
+#: src/modules/initcpiocfg/main.py:227 src/modules/initcpiocfg/main.py:231
+#: src/modules/localecfg/main.py:135 src/modules/mount/main.py:144
+#: src/modules/rawfs/main.py:164 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356
+#: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145
+#: src/modules/rawfs/main.py:165 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/luksopenswaphookcfg/main.py:87
+msgid "No partitions are defined for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:90 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232
+#: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/luksopenswaphookcfg/main.py:91
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
 #: src/modules/grubcfg/main.py:28
 msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: 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
-#: src/modules/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"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: 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 ""
-
-#: 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
+#: 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/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/fstab/main.py:389
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
 msgstr ""
 
-#: 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}."
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 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"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
 #: src/modules/displaymanager/main.py:526
@@ -203,26 +144,6 @@ 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."
-msgstr ""
-
-#: 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 ""
-
-#: 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 ""
@@ -241,6 +162,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,8 +192,8 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
@@ -317,58 +243,24 @@ msgid ""
 "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:508
-msgid "Bootloader installation error"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/bootloader/main.py:509
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 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."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
 
 #: src/modules/dummypython/main.py:35
@@ -380,10 +272,121 @@ msgstr "Tarefa parva de python."
 msgid "Dummy python step {}"
 msgstr "Paso parvo de python {}"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Desmontar sistemas de ficheiros."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+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:69
+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:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+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 ""
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:34
+msgid "Filling up filesystems."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:254
+msgid "rsync failed with error code {}."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:299
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:314
+msgid "Starting to unpack {}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:465
+msgid "Failed to unpack image \"{}\""
+msgstr ""
+
+#: src/modules/unpackfs/main.py:430
+msgid "No mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:431
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:436
+msgid "Bad mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:437
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:453 src/modules/unpackfs/main.py:457
+#: src/modules/unpackfs/main.py:463 src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:454
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:458
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:464
+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/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
diff --git a/lang/python/gu/LC_MESSAGES/python.po b/lang/python/gu/LC_MESSAGES/python.po
index cb78e3bff..67efd6f6a 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-22 11:02+0200\n"
+"POT-Creation-Date: 2021-11-02 15:45+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"
@@ -17,131 +17,72 @@ msgstr ""
 "Language: gu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/networkcfg/main.py:105
+#: src/modules/initcpiocfg/main.py:227 src/modules/initcpiocfg/main.py:231
+#: src/modules/localecfg/main.py:135 src/modules/mount/main.py:144
+#: src/modules/rawfs/main.py:164 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356
+#: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145
+#: src/modules/rawfs/main.py:165 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/luksopenswaphookcfg/main.py:87
+msgid "No partitions are defined for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:90 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232
+#: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/luksopenswaphookcfg/main.py:91
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
 #: src/modules/grubcfg/main.py:28
 msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: 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
-#: src/modules/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"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: 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 ""
-
-#: 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
+#: 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/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/fstab/main.py:389
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
 msgstr ""
 
-#: 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}."
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 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"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
 #: src/modules/displaymanager/main.py:526
@@ -198,26 +139,6 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr ""
-
-#: 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 ""
-
-#: 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 ""
@@ -236,6 +157,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,8 +187,8 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
@@ -312,58 +238,24 @@ msgid ""
 "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:508
-msgid "Bootloader installation error"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/bootloader/main.py:509
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 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."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
 
 #: src/modules/dummypython/main.py:35
@@ -375,10 +267,121 @@ msgstr ""
 msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr ""
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+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:69
+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:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+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 ""
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:34
+msgid "Filling up filesystems."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:254
+msgid "rsync failed with error code {}."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:299
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:314
+msgid "Starting to unpack {}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:465
+msgid "Failed to unpack image \"{}\""
+msgstr ""
+
+#: src/modules/unpackfs/main.py:430
+msgid "No mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:431
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:436
+msgid "Bad mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:437
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:453 src/modules/unpackfs/main.py:457
+#: src/modules/unpackfs/main.py:463 src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:454
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:458
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:464
+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/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
diff --git a/lang/python/he/LC_MESSAGES/python.po b/lang/python/he/LC_MESSAGES/python.po
index 2d64b17b9..a024a1cab 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 , 2021
 # 
 #, fuzzy
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-22 11:02+0200\n"
+"POT-Creation-Date: 2021-11-02 15:45+0100\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,75 @@ 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/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "initramfs מוגדר."
+
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/networkcfg/main.py:105
+#: src/modules/initcpiocfg/main.py:227 src/modules/initcpiocfg/main.py:231
+#: src/modules/localecfg/main.py:135 src/modules/mount/main.py:144
+#: src/modules/rawfs/main.py:164 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90
+msgid "Configuration Error"
+msgstr "שגיאת הגדרות"
+
+#: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356
+#: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145
+#: src/modules/rawfs/main.py:165 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/luksopenswaphookcfg/main.py:87
+msgid "No partitions are defined for 
{!s}
 to use."
+msgstr "לא הוגדרו מחיצות לשימוש של 
{!s}
."
+
+#: src/modules/initramfscfg/main.py:90 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232
+#: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/luksopenswaphookcfg/main.py:91
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr "לא סופקה נקודת עגינת שורש לשימוש של 
{!s}
."
+
 #: src/modules/grubcfg/main.py:28
 msgid "Configure GRUB."
 msgstr "הגדרת GRUB."
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "מחיצות מעוגנות."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "התקנת מנהל אתחול."
 
-#: 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
-#: src/modules/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/bootloader/main.py:508
+msgid "Bootloader installation error"
+msgstr "שגיאת התקנת מנהל אתחול"
 
-#: 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 "לא הוגדרו מחיצות לשימוש של 
{!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
+#: 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 החזירה את קוד השגיאה {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 "לא ניתן להפעיל את השירות הבא של systemd:‏ {name!s}."
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "fstab נכתב."
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {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:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "לא ניתן להשבית את היעד של systemd בשם  {name!s}."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "נוצר initramfs עם dracut."
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {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: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/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "קוד היציאה היה {}"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -209,26 +149,6 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "תצורת מנהל התצוגה אינה שלמה"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "mkinitcpio מותקן."
-
-#: 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 "לא סופקה נקודת עגינת שורש לשימוש של 
{!s}
."
-
-#: 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 "הגדרת שירותי OpenRC"
@@ -249,6 +169,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,9 +202,9 @@ msgid ""
 "exist."
 msgstr "הנתיב לשירות {name!s} הוא {path!s}, שאינו קיים."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "הגדרת ערכת עיצוב של Plymouth"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "הגדרות הרשת נשמרות."
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
 #: src/modules/packages/main.py:69
@@ -338,61 +263,25 @@ 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:508
-msgid "Bootloader installation error"
-msgstr "שגיאת התקנת מנהל אתחול"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "mkinitcpio מותקן."
 
-#: 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/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "השפות מוגדרות."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "שעון החומרה מוגדר."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+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/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 "נוצר initramfs עם dracut."
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "הרצת dracut על היעד נכשלה"
-
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "initramfs מוגדר."
-
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "שירות dmcrypt ל־OpenRC מוגדר."
-
-#: 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 "לא סופקה תצורת 
{!s}
 לשימוש 
{!s}
."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "הנתונים מותקנים."
 
 #: src/modules/dummypython/main.py:35
 msgid "Dummy python job."
@@ -403,10 +292,128 @@ msgstr "משימת דמה של Python."
 msgid "Dummy python step {}"
 msgstr "צעד דמה של Python {}"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "השפות מוגדרות."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "שעון החומרה מוגדר."
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "הגדרות הרשת נשמרות."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "ניתוק עיגון מערכות קבצים."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "שירות dmcrypt ל־OpenRC מוגדר."
+
+#: 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:69
+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:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr ""
+"לא ניתן להפעיל את המתזמן ב־systemd בשם "
+"{name!s}."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr "לא ניתן להשבית את היעד של systemd בשם  {name!s}."
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "לא ניתן למסך את היחידה של systemd בשם  {name!s}."
+
+#: src/modules/services-systemd/main.py:75
+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/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "הרצת mkinitfs על היעד נכשלה"
+
+#: src/modules/unpackfs/main.py:34
+msgid "Filling up filesystems."
+msgstr "מערכות הקבצים מתמלאות."
+
+#: src/modules/unpackfs/main.py:254
+msgid "rsync failed with error code {}."
+msgstr "rsync נכשל עם קוד השגיאה {}."
+
+#: src/modules/unpackfs/main.py:299
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "קובץ הדמות נפרס {}/{}, קובץ {}/{}"
+
+#: src/modules/unpackfs/main.py:314
+msgid "Starting to unpack {}"
+msgstr "הפריסה של {} מתחילה"
+
+#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:465
+msgid "Failed to unpack image \"{}\""
+msgstr "פריסת קובץ הדמות \"{}\" נכשלה"
+
+#: src/modules/unpackfs/main.py:430
+msgid "No mount point for root partition"
+msgstr "אין נקודת עגינה למחיצת העל"
+
+#: src/modules/unpackfs/main.py:431
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "ב־globalstorage אין את המפתח „rootMountPoint”, לא תתבצע אף פעולה"
+
+#: src/modules/unpackfs/main.py:436
+msgid "Bad mount point for root partition"
+msgstr "נקודת העגינה של מחיצת השורה שגויה"
+
+#: src/modules/unpackfs/main.py:437
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint מוגדרת בתור „{}”, שאינו קיים, לא תתבצע אף פעולה"
+
+#: src/modules/unpackfs/main.py:453 src/modules/unpackfs/main.py:457
+#: src/modules/unpackfs/main.py:463 src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "תצורת unsquash שגויה"
+
+#: src/modules/unpackfs/main.py:454
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "מערכת הקבצים עבור „{}” ‏({}) אינה נתמכת על ידי הליבה הנוכחית שלך."
+
+#: src/modules/unpackfs/main.py:458
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "מערכת הקבצים במקור „{}” אינה קיימת"
+
+#: src/modules/unpackfs/main.py:464
+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/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr "מוגדר שטח החלפה מוצפן."
diff --git a/lang/python/hi/LC_MESSAGES/python.po b/lang/python/hi/LC_MESSAGES/python.po
index 3d2f0dd75..c80f08842 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-22 11:02+0200\n"
+"POT-Creation-Date: 2021-11-02 15:45+0100\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,78 @@ msgstr ""
 "Language: hi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "initramfs को विन्यस्त करना। "
+
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/networkcfg/main.py:105
+#: src/modules/initcpiocfg/main.py:227 src/modules/initcpiocfg/main.py:231
+#: src/modules/localecfg/main.py:135 src/modules/mount/main.py:144
+#: src/modules/rawfs/main.py:164 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90
+msgid "Configuration Error"
+msgstr "विन्यास त्रुटि"
+
+#: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356
+#: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145
+#: src/modules/rawfs/main.py:165 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/luksopenswaphookcfg/main.py:87
+msgid "No partitions are defined for 
{!s}
 to use."
+msgstr "
{!s}
 के उपयोग हेतु कोई विभाजन परिभाषित नहीं हैं।"
+
+#: src/modules/initramfscfg/main.py:90 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232
+#: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/luksopenswaphookcfg/main.py:91
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+"
{!s}
 के उपयोग हेतु कोई रुट माउंट पॉइंट प्रदान नहीं किया गया।"
+
 #: src/modules/grubcfg/main.py:28
 msgid "Configure GRUB."
 msgstr "GRUB विन्यस्त करना।"
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "विभाजन माउंट करना।"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "बूट लोडर इंस्टॉल करना।"
 
-#: 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
-#: src/modules/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/bootloader/main.py:508
+msgid "Bootloader installation error"
+msgstr "बूट लोडर इंस्टॉल त्रुटि"
 
-#: 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 "
{!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
+#: src/modules/bootloader/main.py:509
 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}."
+"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/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "fstab पर राइट करना।"
 
-#: 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"
+#: 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/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/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -207,27 +150,6 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "डिस्प्ले प्रबंधक विन्यास अधूरा था"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "mkinitcpio को विन्यस्त करना।"
-
-#: 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 ""
-"
{!s}
 के उपयोग हेतु कोई रुट माउंट पॉइंट प्रदान नहीं किया गया।"
-
-#: 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 "OpenRC सेवाएँ विन्यस्त करना"
@@ -248,6 +170,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,9 +201,9 @@ msgid ""
 "exist."
 msgstr "सेवा {name!s} हेतु पथ {path!s} है, जो कि मौजूद नहीं है।"
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Plymouth थीम विन्यस्त करना "
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "नेटवर्क विन्यास सेटिंग्स संचित करना।"
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
 #: src/modules/packages/main.py:69
@@ -331,63 +258,25 @@ 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:508
-msgid "Bootloader installation error"
-msgstr "बूट लोडर इंस्टॉल त्रुटि"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "mkinitcpio को विन्यस्त करना।"
 
-#: 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/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "स्थानिकी को विन्यस्त करना।"
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "हार्डवेयर घड़ी सेट करना।"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+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/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 "dracut के साथ initramfs बनाना।"
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "लक्ष्य पर dracut निष्पादन विफल"
-
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "initramfs को विन्यस्त करना। "
-
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "OpenRC dmcrypt सेवा विन्यस्त करना।"
-
-#: 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 ""
-"कोई 
{!s}
 विन्यास प्रदान नहीं किया गया 
{!s}
 के उपयोग "
-"हेतु।"
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "डाटा इंस्टॉल करना।"
 
 #: src/modules/dummypython/main.py:35
 msgid "Dummy python job."
@@ -398,10 +287,123 @@ msgstr "डमी पाइथन प्रक्रिया ।"
 msgid "Dummy python step {}"
 msgstr "डमी पाइथन प्रक्रिया की चरण संख्या {}"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "स्थानिकी को विन्यस्त करना।"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "हार्डवेयर घड़ी सेट करना।"
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "नेटवर्क विन्यास सेटिंग्स संचित करना।"
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "फ़ाइल सिस्टम माउंट से हटाना।"
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "OpenRC dmcrypt सेवा विन्यस्त करना।"
+
+#: 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:69
+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:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr "systemd लक्ष्य {name!s} निष्क्रिय करना विफल।"
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "systemd यूनिट {name!s} को मास्क नहीं किया जा सकता।"
+
+#: src/modules/services-systemd/main.py:75
+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/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "लक्ष्य पर mkinitfs निष्पादन विफल"
+
+#: src/modules/unpackfs/main.py:34
+msgid "Filling up filesystems."
+msgstr "फाइल सिस्टम भरना।"
+
+#: src/modules/unpackfs/main.py:254
+msgid "rsync failed with error code {}."
+msgstr "rsync त्रुटि कोड {} के साथ विफल।"
+
+#: src/modules/unpackfs/main.py:299
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "इमेज फ़ाइल {}/{}, फ़ाइल {}/{} सम्पीड़ित की जा रही है"
+
+#: src/modules/unpackfs/main.py:314
+msgid "Starting to unpack {}"
+msgstr "{} हेतु संपीड़न प्रक्रिया आरंभ हो रही है "
+
+#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:465
+msgid "Failed to unpack image \"{}\""
+msgstr "इमेज फ़ाइल \"{}\" को खोलने में विफल"
+
+#: src/modules/unpackfs/main.py:430
+msgid "No mount point for root partition"
+msgstr "रुट विभाजन हेतु कोई माउंट पॉइंट नहीं है"
+
+#: src/modules/unpackfs/main.py:431
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage में \"rootMountPoint\" कुंजी नहीं है, कुछ नहीं किया जाएगा"
+
+#: src/modules/unpackfs/main.py:436
+msgid "Bad mount point for root partition"
+msgstr "रुट विभाजन हेतु ख़राब माउंट पॉइंट"
+
+#: src/modules/unpackfs/main.py:437
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "रुट माउंट पॉइंट \"{}\" है, जो कि मौजूद नहीं है, कुछ नहीं किया जाएगा"
+
+#: src/modules/unpackfs/main.py:453 src/modules/unpackfs/main.py:457
+#: src/modules/unpackfs/main.py:463 src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "ख़राब unsquash विन्यास सेटिंग्स"
+
+#: src/modules/unpackfs/main.py:454
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "\"{}\" ({}) हेतु फ़ाइल सिस्टम आपके वर्तमान कर्नेल द्वारा समर्थित नहीं है"
+
+#: src/modules/unpackfs/main.py:458
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "\"{}\" स्रोत फ़ाइल सिस्टम मौजूद नहीं है"
+
+#: src/modules/unpackfs/main.py:464
+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/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr "एन्क्रिप्टेड स्वैप को विन्यस्त करना।"
diff --git a/lang/python/hi_IN/LC_MESSAGES/python.po b/lang/python/hi_IN/LC_MESSAGES/python.po
index aa460959b..a3b5a20a4 100644
--- a/lang/python/hi_IN/LC_MESSAGES/python.po
+++ b/lang/python/hi_IN/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-22 11:02+0200\n"
+"POT-Creation-Date: 2021-11-02 15:45+0100\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Hindi (India) (https://www.transifex.com/calamares/teams/20061/hi_IN/)\n"
 "MIME-Version: 1.0\n"
@@ -17,131 +17,72 @@ msgstr ""
 "Language: hi_IN\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/networkcfg/main.py:105
+#: src/modules/initcpiocfg/main.py:227 src/modules/initcpiocfg/main.py:231
+#: src/modules/localecfg/main.py:135 src/modules/mount/main.py:144
+#: src/modules/rawfs/main.py:164 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356
+#: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145
+#: src/modules/rawfs/main.py:165 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/luksopenswaphookcfg/main.py:87
+msgid "No partitions are defined for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:90 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232
+#: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/luksopenswaphookcfg/main.py:91
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
 #: src/modules/grubcfg/main.py:28
 msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: 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
-#: src/modules/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"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: 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 ""
-
-#: 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
+#: 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/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/fstab/main.py:389
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
 msgstr ""
 
-#: 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}."
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 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"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
 #: src/modules/displaymanager/main.py:526
@@ -198,26 +139,6 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr ""
-
-#: 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 ""
-
-#: 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 ""
@@ -236,6 +157,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,8 +187,8 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
@@ -312,58 +238,24 @@ msgid ""
 "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:508
-msgid "Bootloader installation error"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/bootloader/main.py:509
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 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."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
 
 #: src/modules/dummypython/main.py:35
@@ -375,10 +267,121 @@ msgstr ""
 msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr ""
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+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:69
+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:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+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 ""
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:34
+msgid "Filling up filesystems."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:254
+msgid "rsync failed with error code {}."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:299
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:314
+msgid "Starting to unpack {}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:465
+msgid "Failed to unpack image \"{}\""
+msgstr ""
+
+#: src/modules/unpackfs/main.py:430
+msgid "No mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:431
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:436
+msgid "Bad mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:437
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:453 src/modules/unpackfs/main.py:457
+#: src/modules/unpackfs/main.py:463 src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:454
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:458
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:464
+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/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
diff --git a/lang/python/hr/LC_MESSAGES/python.po b/lang/python/hr/LC_MESSAGES/python.po
index e1102a8bc..796af7448 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-22 11:02+0200\n"
+"POT-Creation-Date: 2021-11-02 15:45+0100\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,76 @@ 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/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Konfiguriranje initramfs."
+
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/networkcfg/main.py:105
+#: src/modules/initcpiocfg/main.py:227 src/modules/initcpiocfg/main.py:231
+#: src/modules/localecfg/main.py:135 src/modules/mount/main.py:144
+#: src/modules/rawfs/main.py:164 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90
+msgid "Configuration Error"
+msgstr "Greška konfiguracije"
+
+#: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356
+#: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145
+#: src/modules/rawfs/main.py:165 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/luksopenswaphookcfg/main.py:87
+msgid "No partitions are defined for 
{!s}
 to use."
+msgstr "Nema definiranih particija za 
{!s}
 korištenje."
+
+#: src/modules/initramfscfg/main.py:90 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232
+#: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/luksopenswaphookcfg/main.py:91
+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/grubcfg/main.py:28
 msgid "Configure GRUB."
 msgstr "Konfigurirajte GRUB."
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Montiranje particija."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Instaliram bootloader."
 
-#: 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
-#: src/modules/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/bootloader/main.py:508
+msgid "Bootloader installation error"
+msgstr "Greška prilikom instalacije bootloadera"
 
-#: 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 "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
+#: 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} poziv u chroot-u vratio je kod pogreške "
-"{num!s}."
+"Bootloader nije mogao biti instaliran. Instalacijska 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/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Zapisujem fstab."
 
-#: 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/fstab/main.py:389
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr "Nije dana konfiguracija 
{!s}
 za 
{!s}
 upotrebu."
 
-#: 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/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Stvaranje initramfs s dracut."
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Ne mogu maskirati systemd jedinicu {name!s}."
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Nije uspjelo pokretanje dracuta na ciljanom sustavu"
 
-#: 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/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "Izlazni kod bio je {}"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -210,27 +148,6 @@ 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/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 ""
-"Nijedna root točka montiranja nije definirana za 
{!s}
 korištenje."
-
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
-msgstr "Konfiguriranje šifriranog swapa."
-
-#: 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"
@@ -251,6 +168,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,9 +203,9 @@ 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/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Spremanje mrežne konfiguracije."
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
 #: src/modules/packages/main.py:69
@@ -340,61 +262,25 @@ msgstr ""
 "Upravitelj paketa nije mogao izvršiti promjene na instaliranom sustavu. "
 "Naredba 
{!s}
 je vratila kôd pogreške {!s}."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Instaliram bootloader."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Konfigurirajte Plymouth temu"
 
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
-msgstr "Greška prilikom instalacije bootloadera"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Konfiguriranje mkinitcpio."
 
-#: src/modules/bootloader/main.py:509
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-"Bootloader nije mogao biti instaliran. Instalacijska naredba 
{!s}
"
-" je vratila kod pogreške {!s}."
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Konfiguriranje lokalizacije."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Postavljanje hardverskog sata."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Montiranje particija."
 
-#: 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/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Izlazni kod bio je {}"
-
-#: 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/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Konfiguriranje initramfs."
-
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Konfiguriranje servisa OpenRC dmcrypt."
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Zapisujem fstab."
-
-#: 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/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Instaliranje podataka."
 
 #: src/modules/dummypython/main.py:35
 msgid "Dummy python job."
@@ -405,10 +291,125 @@ msgstr "Testni python posao."
 msgid "Dummy python step {}"
 msgstr "Testni python korak {}"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Konfiguriranje lokalizacije."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Postavljanje hardverskog sata."
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Spremanje mrežne konfiguracije."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Odmontiraj datotečne sustave."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Konfiguriranje servisa OpenRC dmcrypt."
+
+#: 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:69
+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:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Ne mogu onemogućiti systemd cilj {name!s}."
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Ne mogu maskirati systemd jedinicu {name!s}."
+
+#: src/modules/services-systemd/main.py:75
+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/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:34
+msgid "Filling up filesystems."
+msgstr "Popunjavanje datotečnih sustava."
+
+#: src/modules/unpackfs/main.py:254
+msgid "rsync failed with error code {}."
+msgstr "rsync nije uspio s kodom pogreške {}."
+
+#: src/modules/unpackfs/main.py:299
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Otpakiravanje slike {}/{}, datoteka {}/{}"
+
+#: src/modules/unpackfs/main.py:314
+msgid "Starting to unpack {}"
+msgstr "Početak raspakiravanja {}"
+
+#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:465
+msgid "Failed to unpack image \"{}\""
+msgstr "Otpakiravnje slike nije uspjelo \"{}\""
+
+#: src/modules/unpackfs/main.py:430
+msgid "No mount point for root partition"
+msgstr "Nema točke montiranja za root particiju"
+
+#: src/modules/unpackfs/main.py:431
+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:436
+msgid "Bad mount point for root partition"
+msgstr "Neispravna točka montiranja za root particiju"
+
+#: src/modules/unpackfs/main.py:437
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint je \"{}\", što ne postoji, ne radi ništa"
+
+#: src/modules/unpackfs/main.py:453 src/modules/unpackfs/main.py:457
+#: src/modules/unpackfs/main.py:463 src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Neispravna unsquash konfiguracija"
+
+#: src/modules/unpackfs/main.py:454
+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:458
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Izvorni datotečni sustav \"{}\" ne postoji"
+
+#: src/modules/unpackfs/main.py:464
+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 "Odredište \"{}\" u ciljnom sustavu nije direktorij"
+
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr "Konfiguriranje šifriranog swapa."
diff --git a/lang/python/hu/LC_MESSAGES/python.po b/lang/python/hu/LC_MESSAGES/python.po
index a9c62455e..0fc858890 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-22 11:02+0200\n"
+"POT-Creation-Date: 2021-11-02 15:45+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"
@@ -24,139 +24,73 @@ msgstr ""
 "Language: hu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "initramfs konfigurálása."
+
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/networkcfg/main.py:105
+#: src/modules/initcpiocfg/main.py:227 src/modules/initcpiocfg/main.py:231
+#: src/modules/localecfg/main.py:135 src/modules/mount/main.py:144
+#: src/modules/rawfs/main.py:164 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90
+msgid "Configuration Error"
+msgstr "Konfigurációs hiba"
+
+#: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356
+#: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145
+#: src/modules/rawfs/main.py:165 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/luksopenswaphookcfg/main.py:87
+msgid "No partitions are defined for 
{!s}
 to use."
+msgstr "Nincsenek partíciók meghatározva a 
{!s}
 használatához."
+
+#: src/modules/initramfscfg/main.py:90 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232
+#: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/luksopenswaphookcfg/main.py:91
+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/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/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Rendszerbetöltő telepítése."
 
-#: 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
-#: src/modules/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/bootloader/main.py:508
+msgid "Bootloader installation error"
+msgstr ""
 
-#: 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 "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
+#: src/modules/bootloader/main.py:509
 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 {}/{}"
+"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 {}"
+#: 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 ""
 
-#: 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/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/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/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -212,26 +146,6 @@ 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/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 "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/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Adatok telepítése."
-
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
 msgstr "OpenRC szolgáltatások beállítása"
@@ -252,6 +166,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,9 +200,9 @@ 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/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Hálózati konfiguráció mentése."
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
 #: src/modules/packages/main.py:69
@@ -332,59 +251,25 @@ msgid ""
 "command 
{!s}
 returned error code {!s}."
 msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Rendszerbetöltő telepítése."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Plymouth téma beállítása"
 
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
-msgstr ""
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "mkinitcpio konfigurálása."
 
-#: src/modules/bootloader/main.py:509
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "nyelvi értékek konfigurálása."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Rendszeridő beállítása."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Partíciók csatolá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/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/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/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "initramfs konfigurálása."
-
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "OpenRC dmcrypt szolgáltatás konfigurálása."
-
-#: 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 ""
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Adatok telepítése."
 
 #: src/modules/dummypython/main.py:35
 msgid "Dummy python job."
@@ -395,10 +280,126 @@ msgstr "Hamis Python feladat."
 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/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Rendszeridő beállítása."
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Hálózati konfiguráció mentése."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Fájlrendszerek leválasztása."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "OpenRC dmcrypt szolgáltatás konfigurálása."
+
+#: 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: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:69
+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:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+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:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Nem maszkolható systemd egység: {name!s}."
+
+#: src/modules/services-systemd/main.py:75
+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."
+msgstr ""
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:34
+msgid "Filling up filesystems."
+msgstr "Fájlrendszerek betöltése."
+
+#: src/modules/unpackfs/main.py:254
+msgid "rsync failed with error code {}."
+msgstr "az rsync elhalt a(z) {} hibakóddal"
+
+#: src/modules/unpackfs/main.py:299
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:314
+msgid "Starting to unpack {}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:465
+msgid "Failed to unpack image \"{}\""
+msgstr "\"{}\" kép kicsomagolása nem sikerült"
+
+#: src/modules/unpackfs/main.py:430
+msgid "No mount point for root partition"
+msgstr "Nincs betöltési pont a root partíciónál"
+
+#: src/modules/unpackfs/main.py:431
+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:436
+msgid "Bad mount point for root partition"
+msgstr "Rossz betöltési pont a root partíciónál"
+
+#: src/modules/unpackfs/main.py:437
+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:453 src/modules/unpackfs/main.py:457
+#: src/modules/unpackfs/main.py:463 src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Rossz unsquash konfiguráció"
+
+#: src/modules/unpackfs/main.py:454
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:458
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "A forrás fájlrendszer \"{}\" nem létezik"
+
+#: src/modules/unpackfs/main.py:464
+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 "Az elérés \"{}\" nem létező könyvtár a cél rendszerben"
+
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr "Titkosított swap konfigurálása."
diff --git a/lang/python/id/LC_MESSAGES/python.po b/lang/python/id/LC_MESSAGES/python.po
index bc219cfc2..d836a9931 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-22 11:02+0200\n"
+"POT-Creation-Date: 2021-11-02 15:45+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"
@@ -24,131 +24,72 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/networkcfg/main.py:105
+#: src/modules/initcpiocfg/main.py:227 src/modules/initcpiocfg/main.py:231
+#: src/modules/localecfg/main.py:135 src/modules/mount/main.py:144
+#: src/modules/rawfs/main.py:164 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90
+msgid "Configuration Error"
+msgstr "Kesalahan Konfigurasi"
+
+#: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356
+#: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145
+#: src/modules/rawfs/main.py:165 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/luksopenswaphookcfg/main.py:87
+msgid "No partitions are defined for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:90 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232
+#: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/luksopenswaphookcfg/main.py:91
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
 #: src/modules/grubcfg/main.py:28
 msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: 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
-#: src/modules/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: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."
+#: 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:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-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 ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/fstab/main.py:389
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
 msgstr ""
 
-#: 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}."
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 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"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
 #: src/modules/displaymanager/main.py:526
@@ -205,26 +146,6 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "Konfigurasi display manager belum rampung"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr ""
-
-#: 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 ""
-
-#: 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 ""
@@ -243,6 +164,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,8 +194,8 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
@@ -317,58 +243,24 @@ msgid ""
 "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:508
-msgid "Bootloader installation error"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/bootloader/main.py:509
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 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."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
 
 #: src/modules/dummypython/main.py:35
@@ -380,10 +272,121 @@ msgstr "Tugas dumi python."
 msgid "Dummy python step {}"
 msgstr "Langkah {} dumi python"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Lepaskan sistem berkas."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+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:69
+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:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+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 ""
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:34
+msgid "Filling up filesystems."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:254
+msgid "rsync failed with error code {}."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:299
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:314
+msgid "Starting to unpack {}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:465
+msgid "Failed to unpack image \"{}\""
+msgstr ""
+
+#: src/modules/unpackfs/main.py:430
+msgid "No mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:431
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:436
+msgid "Bad mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:437
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:453 src/modules/unpackfs/main.py:457
+#: src/modules/unpackfs/main.py:463 src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:454
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:458
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:464
+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/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
diff --git a/lang/python/id_ID/LC_MESSAGES/python.po b/lang/python/id_ID/LC_MESSAGES/python.po
index 9729b543e..0ed5decfa 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-22 11:02+0200\n"
+"POT-Creation-Date: 2021-11-02 15:45+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"
@@ -17,131 +17,72 @@ msgstr ""
 "Language: id_ID\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/networkcfg/main.py:105
+#: src/modules/initcpiocfg/main.py:227 src/modules/initcpiocfg/main.py:231
+#: src/modules/localecfg/main.py:135 src/modules/mount/main.py:144
+#: src/modules/rawfs/main.py:164 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356
+#: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145
+#: src/modules/rawfs/main.py:165 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/luksopenswaphookcfg/main.py:87
+msgid "No partitions are defined for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:90 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232
+#: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/luksopenswaphookcfg/main.py:91
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
 #: src/modules/grubcfg/main.py:28
 msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: 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
-#: src/modules/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"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: 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 ""
-
-#: 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
+#: 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/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/fstab/main.py:389
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
 msgstr ""
 
-#: 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}."
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 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"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
 #: src/modules/displaymanager/main.py:526
@@ -198,26 +139,6 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr ""
-
-#: 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 ""
-
-#: 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 ""
@@ -236,6 +157,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,8 +187,8 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
@@ -310,58 +236,24 @@ msgid ""
 "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:508
-msgid "Bootloader installation error"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/bootloader/main.py:509
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 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."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
 
 #: src/modules/dummypython/main.py:35
@@ -373,10 +265,121 @@ msgstr ""
 msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr ""
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+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:69
+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:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+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 ""
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:34
+msgid "Filling up filesystems."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:254
+msgid "rsync failed with error code {}."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:299
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:314
+msgid "Starting to unpack {}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:465
+msgid "Failed to unpack image \"{}\""
+msgstr ""
+
+#: src/modules/unpackfs/main.py:430
+msgid "No mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:431
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:436
+msgid "Bad mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:437
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:453 src/modules/unpackfs/main.py:457
+#: src/modules/unpackfs/main.py:463 src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:454
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:458
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:464
+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/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
diff --git a/lang/python/ie/LC_MESSAGES/python.po b/lang/python/ie/LC_MESSAGES/python.po
index c1fa40fa3..903ec580c 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-22 11:02+0200\n"
+"POT-Creation-Date: 2021-11-02 15:45+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"
@@ -21,134 +21,73 @@ msgstr ""
 "Language: ie\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Configurante initramfs."
+
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/networkcfg/main.py:105
+#: src/modules/initcpiocfg/main.py:227 src/modules/initcpiocfg/main.py:231
+#: src/modules/localecfg/main.py:135 src/modules/mount/main.py:144
+#: src/modules/rawfs/main.py:164 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90
+msgid "Configuration Error"
+msgstr "Errore de configuration"
+
+#: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356
+#: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145
+#: src/modules/rawfs/main.py:165 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/luksopenswaphookcfg/main.py:87
+msgid "No partitions are defined for 
{!s}
 to use."
+msgstr "Null partition es definit por usa de 
{!s}
."
+
+#: src/modules/initramfscfg/main.py:90 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232
+#: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/luksopenswaphookcfg/main.py:91
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
 #: 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/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Installante li bootloader."
 
-#: 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
-#: src/modules/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: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 "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"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 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}."
-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}."
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Scrition de fstab."
+
+#: src/modules/fstab/main.py:389
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: 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/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/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "Li code de termination esset {}"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -204,26 +143,6 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Configurante mkinitcpio."
-
-#: 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 ""
-
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
-msgstr ""
-
-#: 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"
@@ -242,6 +161,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,9 +193,9 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Configurante li tema de Plymouth"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr ""
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
 #: src/modules/packages/main.py:69
@@ -320,59 +244,25 @@ msgid ""
 "command 
{!s}
 returned error code {!s}."
 msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Installante li bootloader."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Configurante li tema de Plymouth"
 
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
-msgstr ""
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Configurante mkinitcpio."
 
-#: src/modules/bootloader/main.py:509
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Configurante locales."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr ""
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Montente partitiones."
 
-#: 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 "Li code de termination esset {}"
-
-#: 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 "Configurante initramfs."
-
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr ""
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Scrition de fstab."
-
-#: 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 "Installante li data."
 
 #: src/modules/dummypython/main.py:35
 msgid "Dummy python job."
@@ -383,10 +273,123 @@ msgstr ""
 msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Configurante locales."
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr ""
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr ""
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Configurante servicios de systemd"
+
+#: 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:69
+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:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+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 ""
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:34
+msgid "Filling up filesystems."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:254
+msgid "rsync failed with error code {}."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:299
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:314
+msgid "Starting to unpack {}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:465
+msgid "Failed to unpack image \"{}\""
+msgstr "Ne successat depaccar li image \"{}\""
+
+#: src/modules/unpackfs/main.py:430
+msgid "No mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:431
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:436
+msgid "Bad mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:437
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:453 src/modules/unpackfs/main.py:457
+#: src/modules/unpackfs/main.py:463 src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Ínvalid configuration de unsquash"
+
+#: src/modules/unpackfs/main.py:454
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:458
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:464
+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/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
diff --git a/lang/python/is/LC_MESSAGES/python.po b/lang/python/is/LC_MESSAGES/python.po
index f33450a57..e3ce831ae 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-22 11:02+0200\n"
+"POT-Creation-Date: 2021-11-02 15:45+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"
@@ -21,131 +21,72 @@ msgstr ""
 "Language: is\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);\n"
 
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/networkcfg/main.py:105
+#: src/modules/initcpiocfg/main.py:227 src/modules/initcpiocfg/main.py:231
+#: src/modules/localecfg/main.py:135 src/modules/mount/main.py:144
+#: src/modules/rawfs/main.py:164 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356
+#: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145
+#: src/modules/rawfs/main.py:165 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/luksopenswaphookcfg/main.py:87
+msgid "No partitions are defined for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:90 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232
+#: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/luksopenswaphookcfg/main.py:91
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
 #: src/modules/grubcfg/main.py:28
 msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: 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
-#: src/modules/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"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: 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 ""
-
-#: 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
+#: 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/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/fstab/main.py:389
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
 msgstr ""
 
-#: 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}."
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 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 "Aftengja skráarkerfi."
-
-#: 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"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
 #: src/modules/displaymanager/main.py:526
@@ -202,26 +143,6 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr ""
-
-#: 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 ""
-
-#: 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 ""
@@ -240,6 +161,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,8 +191,8 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
@@ -316,58 +242,24 @@ msgid ""
 "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:508
-msgid "Bootloader installation error"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/bootloader/main.py:509
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 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."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
 
 #: src/modules/dummypython/main.py:35
@@ -379,10 +271,121 @@ msgstr ""
 msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Aftengja skráarkerfi."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+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:69
+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:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+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 ""
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:34
+msgid "Filling up filesystems."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:254
+msgid "rsync failed with error code {}."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:299
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:314
+msgid "Starting to unpack {}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:465
+msgid "Failed to unpack image \"{}\""
+msgstr ""
+
+#: src/modules/unpackfs/main.py:430
+msgid "No mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:431
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:436
+msgid "Bad mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:437
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:453 src/modules/unpackfs/main.py:457
+#: src/modules/unpackfs/main.py:463 src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:454
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:458
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:464
+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/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
diff --git a/lang/python/it_IT/LC_MESSAGES/python.po b/lang/python/it_IT/LC_MESSAGES/python.po
index d4e6c3380..7f9595e9a 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-22 11:02+0200\n"
+"POT-Creation-Date: 2021-11-02 15:45+0100\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,73 @@ msgstr ""
 "Language: it_IT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Configurazione di initramfs."
+
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/networkcfg/main.py:105
+#: src/modules/initcpiocfg/main.py:227 src/modules/initcpiocfg/main.py:231
+#: src/modules/localecfg/main.py:135 src/modules/mount/main.py:144
+#: src/modules/rawfs/main.py:164 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90
+msgid "Configuration Error"
+msgstr "Errore di Configurazione"
+
+#: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356
+#: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145
+#: src/modules/rawfs/main.py:165 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/luksopenswaphookcfg/main.py:87
+msgid "No partitions are defined for 
{!s}
 to use."
+msgstr "Nessuna partizione definita per l'uso con 
{!s}
."
+
+#: src/modules/initramfscfg/main.py:90 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232
+#: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/luksopenswaphookcfg/main.py:91
+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/grubcfg/main.py:28
 msgid "Configure GRUB."
 msgstr "Configura GRUB."
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Montaggio partizioni."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Installa il bootloader."
 
-#: 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
-#: src/modules/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/bootloader/main.py:508
+msgid "Bootloader installation error"
+msgstr ""
 
-#: 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 "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
+#: 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 ""
-"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/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Scrittura di fstab."
 
-#: 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}."
+#: src/modules/fstab/main.py:389
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
 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/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Creazione di initramfs con dracut."
 
-#: 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/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Impossibile eseguire dracut sulla destinazione"
 
-#: 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/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "Il codice di uscita era {}"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -217,26 +149,6 @@ 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/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 "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/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Installazione dei dati."
-
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
 msgstr "Configura i servizi OpenRC"
@@ -257,6 +169,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,9 +203,9 @@ 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/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Salvataggio della configurazione di rete."
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
 #: src/modules/packages/main.py:69
@@ -337,59 +254,25 @@ msgid ""
 "command 
{!s}
 returned error code {!s}."
 msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Installa il bootloader."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Configura il tema Plymouth"
 
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
-msgstr ""
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Configurazione di mkinitcpio."
 
-#: src/modules/bootloader/main.py:509
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Configurazione della localizzazione."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Impostazione del clock hardware."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Montaggio partizioni."
 
-#: 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/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Il codice di uscita era {}"
-
-#: 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/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Configurazione di initramfs."
-
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Configurazione del servizio OpenRC dmcrypt."
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Scrittura di fstab."
-
-#: 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 "Installazione dei dati."
 
 #: src/modules/dummypython/main.py:35
 msgid "Dummy python job."
@@ -400,10 +283,128 @@ msgstr "Job python fittizio."
 msgid "Dummy python step {}"
 msgstr "Python step {} fittizio"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Configurazione della localizzazione."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Impostazione del clock hardware."
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Salvataggio della configurazione di rete."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Smonta i file system."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Configurazione del servizio OpenRC dmcrypt."
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Configura servizi  systemd"
+
+#: 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:69
+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:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+"Impossibile disabilitare la destinazione systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Impossibile mascherare l'unità systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:75
+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/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Impossibile eseguire mkinitfs sulla destinazione"
+
+#: src/modules/unpackfs/main.py:34
+msgid "Filling up filesystems."
+msgstr "Copia dei file system."
+
+#: src/modules/unpackfs/main.py:254
+msgid "rsync failed with error code {}."
+msgstr "rsync fallita con codice d'errore {}."
+
+#: src/modules/unpackfs/main.py:299
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Estrazione immagine {}/{}, file {}/{}"
+
+#: src/modules/unpackfs/main.py:314
+msgid "Starting to unpack {}"
+msgstr "Avvio dell'estrazione {}"
+
+#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:465
+msgid "Failed to unpack image \"{}\""
+msgstr "Estrazione dell'immagine \"{}\" fallita"
+
+#: src/modules/unpackfs/main.py:430
+msgid "No mount point for root partition"
+msgstr "Nessun punto di montaggio per la partizione di root"
+
+#: src/modules/unpackfs/main.py:431
+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:436
+msgid "Bad mount point for root partition"
+msgstr "Punto di montaggio per la partizione di root errato"
+
+#: src/modules/unpackfs/main.py:437
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint è \"{}\" ma non esiste, nessuna azione prevista"
+
+#: src/modules/unpackfs/main.py:453 src/modules/unpackfs/main.py:457
+#: src/modules/unpackfs/main.py:463 src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Configurazione unsquash errata"
+
+#: src/modules/unpackfs/main.py:454
+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:458
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Il filesystem sorgente \"{}\" non esiste"
+
+#: src/modules/unpackfs/main.py:464
+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 "La destinazione del sistema \"{}\" non è una directory"
+
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr "Configurazione per lo swap cifrato."
diff --git a/lang/python/ja/LC_MESSAGES/python.po b/lang/python/ja/LC_MESSAGES/python.po
index a744d664d..fd595034e 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-22 11:02+0200\n"
+"POT-Creation-Date: 2021-11-02 15:45+0100\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,74 @@ msgstr ""
 "Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "initramfsを設定しています。"
+
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/networkcfg/main.py:105
+#: src/modules/initcpiocfg/main.py:227 src/modules/initcpiocfg/main.py:231
+#: src/modules/localecfg/main.py:135 src/modules/mount/main.py:144
+#: src/modules/rawfs/main.py:164 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90
+msgid "Configuration Error"
+msgstr "コンフィグレーションエラー"
+
+#: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356
+#: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145
+#: src/modules/rawfs/main.py:165 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/luksopenswaphookcfg/main.py:87
+msgid "No partitions are defined for 
{!s}
 to use."
+msgstr "
{!s}
 に使用するパーティションが定義されていません。"
+
+#: src/modules/initramfscfg/main.py:90 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232
+#: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/luksopenswaphookcfg/main.py:91
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr " 
{!s}
 を使用するのにルートマウントポイントが与えられていません。"
+
 #: src/modules/grubcfg/main.py:28
 msgid "Configure GRUB."
 msgstr "GRUBを設定にします。"
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "パーティションのマウント。"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "ブートローダーをインストール"
 
-#: 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
-#: src/modules/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/bootloader/main.py:508
+msgid "Bootloader installation error"
+msgstr "ブートローダーのインストールエラー"
 
-#: 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 "
{!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
+#: 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 ""
-"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/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "fstabを書き込んでいます。"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {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:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "systemd でターゲット {name!s}が停止できません。"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "dracutとinitramfsを作成しています。"
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {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: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/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "停止コードは {} でした"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -207,26 +146,6 @@ 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/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 " 
{!s}
 を使用するのにルートマウントポイントが与えられていません。"
-
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
-msgstr "暗号化したswapを設定しています。"
-
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "データのインストール。"
-
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
 msgstr "OpenRCサービスを設定"
@@ -246,6 +165,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,9 +195,9 @@ msgid ""
 "exist."
 msgstr "サービス {name!s} のパスが {path!s} です。これは存在しません。"
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Plymouthテーマを設定"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "ネットワーク設定を保存しています。"
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
 #: src/modules/packages/main.py:69
@@ -324,60 +248,25 @@ 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:508
-msgid "Bootloader installation error"
-msgstr "ブートローダーのインストールエラー"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "mkinitcpioを設定しています。"
 
-#: 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/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "ロケールを設定しています。"
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "ハードウェアクロックの設定"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+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/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 "dracutとinitramfsを作成しています。"
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "ターゲット上で dracut の実行に失敗"
-
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "initramfsを設定しています。"
-
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "OpenRC dmcryptサービスを設定しています。"
-
-#: 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 "
{!s}
 が使用する 
{!s}
 設定が指定されていません。"
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "データのインストール。"
 
 #: src/modules/dummypython/main.py:35
 msgid "Dummy python job."
@@ -388,10 +277,124 @@ msgstr "Dummy python job."
 msgid "Dummy python step {}"
 msgstr "Dummy python step {}"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "ロケールを設定しています。"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "ハードウェアクロックの設定"
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "ネットワーク設定を保存しています。"
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "ファイルシステムをアンマウント。"
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "OpenRC dmcryptサービスを設定しています。"
+
+#: 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:69
+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:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr "systemd タイマー {name!s} を有効にできません。"
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr "systemd でターゲット {name!s}が停止できません。"
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "systemd ユニット {name!s} をマスクできません。"
+
+#: src/modules/services-systemd/main.py:75
+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/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "ターゲットでmkinitfsを実行できませんでした"
+
+#: src/modules/unpackfs/main.py:34
+msgid "Filling up filesystems."
+msgstr "ファイルシステムに書き込んでいます。"
+
+#: src/modules/unpackfs/main.py:254
+msgid "rsync failed with error code {}."
+msgstr "エラーコード {} によりrsyncを失敗。"
+
+#: src/modules/unpackfs/main.py:299
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "イメージ {}/{}, ファイル {}/{} を解凍しています"
+
+#: src/modules/unpackfs/main.py:314
+msgid "Starting to unpack {}"
+msgstr "{} の解凍を開始しています"
+
+#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:465
+msgid "Failed to unpack image \"{}\""
+msgstr "イメージ  \"{}\" の展開に失敗"
+
+#: src/modules/unpackfs/main.py:430
+msgid "No mount point for root partition"
+msgstr "ルートパーティションのためのマウントポイントがありません"
+
+#: src/modules/unpackfs/main.py:431
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage に \"rootMountPoint\" キーが含まれていません。何もしません。"
+
+#: src/modules/unpackfs/main.py:436
+msgid "Bad mount point for root partition"
+msgstr "ルートパーティションのためのマウントポイントが不正です"
+
+#: src/modules/unpackfs/main.py:437
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "ルートマウントポイントは \"{}\" ですが、存在しません。何もできません。"
+
+#: src/modules/unpackfs/main.py:453 src/modules/unpackfs/main.py:457
+#: src/modules/unpackfs/main.py:463 src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "unsquash の設定が不正です"
+
+#: src/modules/unpackfs/main.py:454
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "\"{}\" ({}) のファイルシステムは、現在のカーネルではサポートされていません"
+
+#: src/modules/unpackfs/main.py:458
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "ソースファイルシステム  \"{}\" は存在しません"
+
+#: src/modules/unpackfs/main.py:464
+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/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr "暗号化したswapを設定しています。"
diff --git a/lang/python/kk/LC_MESSAGES/python.po b/lang/python/kk/LC_MESSAGES/python.po
index 85fac58c5..8cbaea22c 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-22 11:02+0200\n"
+"POT-Creation-Date: 2021-11-02 15:45+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"
@@ -17,131 +17,72 @@ msgstr ""
 "Language: kk\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/networkcfg/main.py:105
+#: src/modules/initcpiocfg/main.py:227 src/modules/initcpiocfg/main.py:231
+#: src/modules/localecfg/main.py:135 src/modules/mount/main.py:144
+#: src/modules/rawfs/main.py:164 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356
+#: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145
+#: src/modules/rawfs/main.py:165 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/luksopenswaphookcfg/main.py:87
+msgid "No partitions are defined for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:90 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232
+#: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/luksopenswaphookcfg/main.py:91
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
 #: src/modules/grubcfg/main.py:28
 msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: 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
-#: src/modules/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"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: 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 ""
-
-#: 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
+#: 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/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/fstab/main.py:389
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
 msgstr ""
 
-#: 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}."
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 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"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
 #: src/modules/displaymanager/main.py:526
@@ -198,26 +139,6 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr ""
-
-#: 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 ""
-
-#: 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 ""
@@ -236,6 +157,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,8 +187,8 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
@@ -312,58 +238,24 @@ msgid ""
 "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:508
-msgid "Bootloader installation error"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/bootloader/main.py:509
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 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."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
 
 #: src/modules/dummypython/main.py:35
@@ -375,10 +267,121 @@ msgstr ""
 msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr ""
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+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:69
+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:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+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 ""
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:34
+msgid "Filling up filesystems."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:254
+msgid "rsync failed with error code {}."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:299
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:314
+msgid "Starting to unpack {}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:465
+msgid "Failed to unpack image \"{}\""
+msgstr ""
+
+#: src/modules/unpackfs/main.py:430
+msgid "No mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:431
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:436
+msgid "Bad mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:437
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:453 src/modules/unpackfs/main.py:457
+#: src/modules/unpackfs/main.py:463 src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:454
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:458
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:464
+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/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
diff --git a/lang/python/kn/LC_MESSAGES/python.po b/lang/python/kn/LC_MESSAGES/python.po
index 07ee65884..6a72c87fe 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-22 11:02+0200\n"
+"POT-Creation-Date: 2021-11-02 15:45+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"
@@ -17,131 +17,72 @@ msgstr ""
 "Language: kn\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/networkcfg/main.py:105
+#: src/modules/initcpiocfg/main.py:227 src/modules/initcpiocfg/main.py:231
+#: src/modules/localecfg/main.py:135 src/modules/mount/main.py:144
+#: src/modules/rawfs/main.py:164 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356
+#: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145
+#: src/modules/rawfs/main.py:165 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/luksopenswaphookcfg/main.py:87
+msgid "No partitions are defined for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:90 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232
+#: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/luksopenswaphookcfg/main.py:91
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
 #: src/modules/grubcfg/main.py:28
 msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: 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
-#: src/modules/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"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: 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 ""
-
-#: 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
+#: 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/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/fstab/main.py:389
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
 msgstr ""
 
-#: 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}."
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 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"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
 #: src/modules/displaymanager/main.py:526
@@ -198,26 +139,6 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr ""
-
-#: 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 ""
-
-#: 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 ""
@@ -236,6 +157,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,8 +187,8 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
@@ -312,58 +238,24 @@ msgid ""
 "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:508
-msgid "Bootloader installation error"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/bootloader/main.py:509
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 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."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
 
 #: src/modules/dummypython/main.py:35
@@ -375,10 +267,121 @@ msgstr ""
 msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr ""
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+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:69
+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:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+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 ""
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:34
+msgid "Filling up filesystems."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:254
+msgid "rsync failed with error code {}."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:299
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:314
+msgid "Starting to unpack {}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:465
+msgid "Failed to unpack image \"{}\""
+msgstr ""
+
+#: src/modules/unpackfs/main.py:430
+msgid "No mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:431
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:436
+msgid "Bad mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:437
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:453 src/modules/unpackfs/main.py:457
+#: src/modules/unpackfs/main.py:463 src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:454
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:458
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:464
+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/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
diff --git a/lang/python/ko/LC_MESSAGES/python.po b/lang/python/ko/LC_MESSAGES/python.po
index 70ce32f85..4e1aa1e1e 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-22 11:02+0200\n"
+"POT-Creation-Date: 2021-11-02 15:45+0100\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Jung Hee Lee , 2021\n"
 "Language-Team: Korean (https://www.transifex.com/calamares/teams/20061/ko/)\n"
@@ -22,134 +22,73 @@ msgstr ""
 "Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "initramfs 구성 중."
+
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/networkcfg/main.py:105
+#: src/modules/initcpiocfg/main.py:227 src/modules/initcpiocfg/main.py:231
+#: src/modules/localecfg/main.py:135 src/modules/mount/main.py:144
+#: src/modules/rawfs/main.py:164 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90
+msgid "Configuration Error"
+msgstr "구성 오류"
+
+#: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356
+#: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145
+#: src/modules/rawfs/main.py:165 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/luksopenswaphookcfg/main.py:87
+msgid "No partitions are defined for 
{!s}
 to use."
+msgstr "사용할 
{!s}
에 대해 정의된 파티션이 없음."
+
+#: src/modules/initramfscfg/main.py:90 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232
+#: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/luksopenswaphookcfg/main.py:91
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr "
{!s}
에서 사용할 루트 마운트 지점이 제공되지 않음."
+
 #: src/modules/grubcfg/main.py:28
 msgid "Configure GRUB."
 msgstr "GRUB 구성"
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "파티션 마운트 중."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "부트로더 설치."
 
-#: 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
-#: src/modules/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/bootloader/main.py:508
+msgid "Bootloader installation error"
+msgstr "부트로더 설치 오류"
 
-#: 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 "사용할 
{!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
+#: src/modules/bootloader/main.py:509
 msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr "chroot에서 systemctl {arg!s} 호출에서오류 코드 {num}를 반환 했습니다."
+"The bootloader could not be installed. The installation 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} 시스템 서비스를 활성화 할 수 없습니다."
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "fstab 쓰기."
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {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:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "systemd 대상 {name! s}를 비활성화 할 수 없습니다."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "dracut을 사용하여 initramfs 만들기."
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {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: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/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "종료 코드 {}"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -207,26 +146,6 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "디스플레이 관리자 구성이 완료되지 않았습니다."
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "mkinitcpio 구성 중."
-
-#: 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 "
{!s}
에서 사용할 루트 마운트 지점이 제공되지 않음."
-
-#: 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 "OpenRC 서비스 구성"
@@ -247,6 +166,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,9 +196,9 @@ msgid ""
 "exist."
 msgstr "{name!s} 서비스에 대한 경로는 {path!s}이고, 존재하지 않습니다."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "플리머스 테마 구성"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "네트워크 구성 저장 중."
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
 #: src/modules/packages/main.py:69
@@ -322,59 +246,25 @@ msgid ""
 msgstr ""
 "패키지 관리자가 설치된 시스템을 변경할 수 없습니다. 
{!s}
 명령에서  {!s} 오류 코드를 반환했습니다."
 
-#: 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:508
-msgid "Bootloader installation error"
-msgstr "부트로더 설치 오류"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "mkinitcpio 구성 중."
 
-#: 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/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "로컬 구성 중."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "하드웨어 클럭 설정 중."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+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/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 "dracut을 사용하여 initramfs 만들기."
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "대상에서 dracut을 실행하지 못함"
-
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "initramfs 구성 중."
-
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "OpenRC dmcrypt 서비스 구성 중."
-
-#: 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 "
{!s}
 구성 없음은 
{!s}
을(를) 사용할 수 있도록 제공됩니다."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "데이터 설치중."
 
 #: src/modules/dummypython/main.py:35
 msgid "Dummy python job."
@@ -385,10 +275,123 @@ msgstr "더미 파이썬 작업."
 msgid "Dummy python step {}"
 msgstr "더미 파이썬 단계 {}"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "로컬 구성 중."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "하드웨어 클럭 설정 중."
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "네트워크 구성 저장 중."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "파일 시스템 마운트를 해제합니다."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "OpenRC dmcrypt 서비스 구성 중."
+
+#: 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}를 반환 했습니다."
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+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:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr "systemd 대상 {name! s}를 비활성화 할 수 없습니다."
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "시스템 유닛 {name! s}를 마스크할 수 없습니다."
+
+#: src/modules/services-systemd/main.py:75
+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/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "대상에서 mkinitfs를 실행하지 못했습니다"
+
+#: src/modules/unpackfs/main.py:34
+msgid "Filling up filesystems."
+msgstr "파일 시스템을 채우는 중."
+
+#: src/modules/unpackfs/main.py:254
+msgid "rsync failed with error code {}."
+msgstr "rsync가 {} 오류 코드로 실패했습니다."
+
+#: src/modules/unpackfs/main.py:299
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "이미지 {}/{}, 파일 {}/{} 압축푸는 중"
+
+#: src/modules/unpackfs/main.py:314
+msgid "Starting to unpack {}"
+msgstr "{} 압축 풀기 시작 중"
+
+#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:465
+msgid "Failed to unpack image \"{}\""
+msgstr "\"{}\" 이미지의 압축을 풀지 못했습니다."
+
+#: src/modules/unpackfs/main.py:430
+msgid "No mount point for root partition"
+msgstr "루트 파티션에 대한 마운트 위치 없음"
+
+#: src/modules/unpackfs/main.py:431
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage에는 \"rootMountPoint \" 키가 포함되어 있지 않으며 아무 작업도 수행하지 않습니다."
+
+#: src/modules/unpackfs/main.py:436
+msgid "Bad mount point for root partition"
+msgstr "루트 파티션에 대한 잘못된 마운트 위치"
+
+#: src/modules/unpackfs/main.py:437
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint는 \"{}\"이고, 존재하지 않으며, 아무 작업도 수행하지 않습니다."
+
+#: src/modules/unpackfs/main.py:453 src/modules/unpackfs/main.py:457
+#: src/modules/unpackfs/main.py:463 src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "잘못된 unsquash 구성"
+
+#: src/modules/unpackfs/main.py:454
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "\"{}\" ({})에 대한 파일 시스템은 현재 커널에서 지원되지 않습니다."
+
+#: src/modules/unpackfs/main.py:458
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "\"{}\" 소스 파일시스템은 존재하지 않습니다."
+
+#: src/modules/unpackfs/main.py:464
+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/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr "암호화된 스왑 구성 중."
diff --git a/lang/python/ko_KR/LC_MESSAGES/python.po b/lang/python/ko_KR/LC_MESSAGES/python.po
index d2f6f4d9b..596b6214b 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-22 11:02+0200\n"
+"POT-Creation-Date: 2021-11-02 15:45+0100\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,131 +17,72 @@ msgstr ""
 "Language: ko_KR\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/networkcfg/main.py:105
+#: src/modules/initcpiocfg/main.py:227 src/modules/initcpiocfg/main.py:231
+#: src/modules/localecfg/main.py:135 src/modules/mount/main.py:144
+#: src/modules/rawfs/main.py:164 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356
+#: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145
+#: src/modules/rawfs/main.py:165 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/luksopenswaphookcfg/main.py:87
+msgid "No partitions are defined for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:90 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232
+#: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/luksopenswaphookcfg/main.py:91
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
 #: src/modules/grubcfg/main.py:28
 msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: 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
-#: src/modules/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"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: 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 ""
-
-#: 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
+#: 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/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/fstab/main.py:389
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
 msgstr ""
 
-#: 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}."
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 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"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
 #: src/modules/displaymanager/main.py:526
@@ -198,26 +139,6 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr ""
-
-#: 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 ""
-
-#: 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 ""
@@ -236,6 +157,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,8 +187,8 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
@@ -310,58 +236,24 @@ msgid ""
 "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:508
-msgid "Bootloader installation error"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/bootloader/main.py:509
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 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."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
 
 #: src/modules/dummypython/main.py:35
@@ -373,10 +265,121 @@ msgstr ""
 msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr ""
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+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:69
+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:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+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 ""
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:34
+msgid "Filling up filesystems."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:254
+msgid "rsync failed with error code {}."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:299
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:314
+msgid "Starting to unpack {}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:465
+msgid "Failed to unpack image \"{}\""
+msgstr ""
+
+#: src/modules/unpackfs/main.py:430
+msgid "No mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:431
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:436
+msgid "Bad mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:437
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:453 src/modules/unpackfs/main.py:457
+#: src/modules/unpackfs/main.py:463 src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:454
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:458
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:464
+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/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
diff --git a/lang/python/lo/LC_MESSAGES/python.po b/lang/python/lo/LC_MESSAGES/python.po
index d8c4a3a6d..606bcf8e3 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-22 11:02+0200\n"
+"POT-Creation-Date: 2021-11-02 15:45+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"
@@ -17,131 +17,72 @@ msgstr ""
 "Language: lo\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/networkcfg/main.py:105
+#: src/modules/initcpiocfg/main.py:227 src/modules/initcpiocfg/main.py:231
+#: src/modules/localecfg/main.py:135 src/modules/mount/main.py:144
+#: src/modules/rawfs/main.py:164 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356
+#: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145
+#: src/modules/rawfs/main.py:165 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/luksopenswaphookcfg/main.py:87
+msgid "No partitions are defined for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:90 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232
+#: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/luksopenswaphookcfg/main.py:91
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
 #: src/modules/grubcfg/main.py:28
 msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: 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
-#: src/modules/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"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: 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 ""
-
-#: 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
+#: 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/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/fstab/main.py:389
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
 msgstr ""
 
-#: 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}."
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 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"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
 #: src/modules/displaymanager/main.py:526
@@ -198,26 +139,6 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr ""
-
-#: 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 ""
-
-#: 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 ""
@@ -236,6 +157,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,8 +187,8 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
@@ -310,58 +236,24 @@ msgid ""
 "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:508
-msgid "Bootloader installation error"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/bootloader/main.py:509
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 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."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
 
 #: src/modules/dummypython/main.py:35
@@ -373,10 +265,121 @@ msgstr ""
 msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr ""
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+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:69
+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:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+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 ""
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:34
+msgid "Filling up filesystems."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:254
+msgid "rsync failed with error code {}."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:299
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:314
+msgid "Starting to unpack {}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:465
+msgid "Failed to unpack image \"{}\""
+msgstr ""
+
+#: src/modules/unpackfs/main.py:430
+msgid "No mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:431
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:436
+msgid "Bad mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:437
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:453 src/modules/unpackfs/main.py:457
+#: src/modules/unpackfs/main.py:463 src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:454
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:458
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:464
+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/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
diff --git a/lang/python/lt/LC_MESSAGES/python.po b/lang/python/lt/LC_MESSAGES/python.po
index b2e055902..54bd9b763 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-22 11:02+0200\n"
+"POT-Creation-Date: 2021-11-02 15:45+0100\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,79 @@ 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/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Konfigūruojama initramfs."
+
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/networkcfg/main.py:105
+#: src/modules/initcpiocfg/main.py:227 src/modules/initcpiocfg/main.py:231
+#: src/modules/localecfg/main.py:135 src/modules/mount/main.py:144
+#: src/modules/rawfs/main.py:164 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90
+msgid "Configuration Error"
+msgstr "Konfigūracijos klaida"
+
+#: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356
+#: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145
+#: src/modules/rawfs/main.py:165 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/luksopenswaphookcfg/main.py:87
+msgid "No partitions are defined for 
{!s}
 to use."
+msgstr "Nėra apibrėžta jokių skaidinių, skirtų 
{!s}
 naudojimui."
+
+#: src/modules/initramfscfg/main.py:90 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232
+#: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/luksopenswaphookcfg/main.py:91
+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/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/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Įdiegti operacinės sistemos paleidyklę."
 
-#: 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
-#: src/modules/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/bootloader/main.py:508
+msgid "Bootloader installation error"
+msgstr "Operacinės sistemos paleidyklės diegimo klaida"
 
-#: 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 "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
+#: 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} iškvieta, esanti chroot, grąžino klaidos kodą"
-" {num!s}."
+"Nepavyko įdiegti operacinės sistemos paleidyklės. Diegimo komanda "
+"
{!s}
 grąžino klaidos kodą {!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/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Rašoma fstab."
 
-#: 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}."
+#: 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}."
+"Nenurodyta jokia 
{!s}
 konfigūracija, kurią 
{!s}
 galėtų"
+" naudoti."
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Atjungti failų sistemas."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Sukuriama initramfs naudojant dracut."
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Užpildomos failų sistemos."
+#: 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: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/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "Išėjimo kodas buvo {}"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -211,28 +152,6 @@ 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/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 ""
-"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/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"
@@ -253,6 +172,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,9 +207,9 @@ 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/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Įrašoma tinklo konfigūracija."
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
 #: src/modules/packages/main.py:69
@@ -344,63 +268,25 @@ 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:508
-msgid "Bootloader installation error"
-msgstr "Operacinės sistemos paleidyklės diegimo klaida"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Konfigūruojama mkinitcpio."
 
-#: src/modules/bootloader/main.py:509
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-"Nepavyko įdiegti operacinės sistemos paleidyklės. Diegimo komanda "
-"
{!s}
 grąžino klaidos kodą {!s}."
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Konfigūruojamos lokalės."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Nustatomas aparatinės įrangos laikrodis."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Prijungiami skaidiniai."
 
-#: 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/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Išėjimo kodas buvo {}"
-
-#: 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/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Konfigūruojama initramfs."
-
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Konfigūruojama OpenRC dmcrypt tarnyba."
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Rašoma fstab."
-
-#: 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/dummypython/main.py:35
 msgid "Dummy python job."
@@ -411,10 +297,127 @@ msgstr "Fiktyvi python užduotis."
 msgid "Dummy python step {}"
 msgstr "Fiktyvus python žingsnis {}"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Konfigūruojamos lokalės."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Nustatomas aparatinės įrangos laikrodis."
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Įrašoma tinklo konfigūracija."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Atjungti failų sistemas."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Konfigūruojama OpenRC dmcrypt tarnyba."
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Konfigūruoti systemd tarnybas"
+
+#: 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:69
+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:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr "Nepavyksta įjungti systemd laikmačio {name!s}."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Nepavyksta išjungti systemd paskirties {name!s}."
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Nepavyksta maskuoti systemd įtaiso {name!s}."
+
+#: src/modules/services-systemd/main.py:75
+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/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Nepavyko paskirties vietoje paleisti mkinitfs"
+
+#: src/modules/unpackfs/main.py:34
+msgid "Filling up filesystems."
+msgstr "Užpildomos failų sistemos."
+
+#: src/modules/unpackfs/main.py:254
+msgid "rsync failed with error code {}."
+msgstr "rsync patyrė nesėkmę su klaidos kodu {}."
+
+#: src/modules/unpackfs/main.py:299
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Išpakuojamas atvaizdis {}/{}, failas {}/{}"
+
+#: src/modules/unpackfs/main.py:314
+msgid "Starting to unpack {}"
+msgstr "Pradedama išpakuoti {}"
+
+#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:465
+msgid "Failed to unpack image \"{}\""
+msgstr "Nepavyko išpakuoti atvaizdį „{}“"
+
+#: src/modules/unpackfs/main.py:430
+msgid "No mount point for root partition"
+msgstr "Nėra prijungimo taško šaknies skaidiniui"
+
+#: src/modules/unpackfs/main.py:431
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage viduje nėra „rootMountPoint“ rakto, nieko nedaroma"
+
+#: src/modules/unpackfs/main.py:436
+msgid "Bad mount point for root partition"
+msgstr "Blogas šaknies skaidinio prijungimo taškas"
+
+#: src/modules/unpackfs/main.py:437
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint yra „{}“, kurio nėra, nieko nedaroma"
+
+#: src/modules/unpackfs/main.py:453 src/modules/unpackfs/main.py:457
+#: src/modules/unpackfs/main.py:463 src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Bloga unsquash konfigūracija"
+
+#: src/modules/unpackfs/main.py:454
+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:458
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Šaltinio failų sistemos „{}“ nėra"
+
+#: src/modules/unpackfs/main.py:464
+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/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr "Konfigūruojamas šifruotas sukeitimų skaidinys."
diff --git a/lang/python/lv/LC_MESSAGES/python.po b/lang/python/lv/LC_MESSAGES/python.po
index 8e9813195..aa717538b 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-22 11:02+0200\n"
+"POT-Creation-Date: 2021-11-02 15:45+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"
@@ -17,131 +17,72 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/networkcfg/main.py:105
+#: src/modules/initcpiocfg/main.py:227 src/modules/initcpiocfg/main.py:231
+#: src/modules/localecfg/main.py:135 src/modules/mount/main.py:144
+#: src/modules/rawfs/main.py:164 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356
+#: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145
+#: src/modules/rawfs/main.py:165 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/luksopenswaphookcfg/main.py:87
+msgid "No partitions are defined for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:90 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232
+#: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/luksopenswaphookcfg/main.py:91
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
 #: src/modules/grubcfg/main.py:28
 msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: 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
-#: src/modules/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"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: 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 ""
-
-#: 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
+#: 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/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/fstab/main.py:389
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
 msgstr ""
 
-#: 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}."
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 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"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
 #: src/modules/displaymanager/main.py:526
@@ -198,26 +139,6 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr ""
-
-#: 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 ""
-
-#: 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 ""
@@ -236,6 +157,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,8 +187,8 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
@@ -314,58 +240,24 @@ msgid ""
 "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:508
-msgid "Bootloader installation error"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/bootloader/main.py:509
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 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."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
 
 #: src/modules/dummypython/main.py:35
@@ -377,10 +269,121 @@ msgstr ""
 msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr ""
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+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:69
+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:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+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 ""
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:34
+msgid "Filling up filesystems."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:254
+msgid "rsync failed with error code {}."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:299
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:314
+msgid "Starting to unpack {}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:465
+msgid "Failed to unpack image \"{}\""
+msgstr ""
+
+#: src/modules/unpackfs/main.py:430
+msgid "No mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:431
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:436
+msgid "Bad mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:437
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:453 src/modules/unpackfs/main.py:457
+#: src/modules/unpackfs/main.py:463 src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:454
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:458
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:464
+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/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
diff --git a/lang/python/mk/LC_MESSAGES/python.po b/lang/python/mk/LC_MESSAGES/python.po
index e3f7bceb9..3d2bef45a 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-22 11:02+0200\n"
+"POT-Creation-Date: 2021-11-02 15:45+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"
@@ -21,131 +21,72 @@ msgstr ""
 "Language: mk\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/networkcfg/main.py:105
+#: src/modules/initcpiocfg/main.py:227 src/modules/initcpiocfg/main.py:231
+#: src/modules/localecfg/main.py:135 src/modules/mount/main.py:144
+#: src/modules/rawfs/main.py:164 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356
+#: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145
+#: src/modules/rawfs/main.py:165 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/luksopenswaphookcfg/main.py:87
+msgid "No partitions are defined for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:90 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232
+#: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/luksopenswaphookcfg/main.py:91
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
 #: src/modules/grubcfg/main.py:28
 msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: 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
-#: src/modules/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"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: 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 ""
-
-#: 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
+#: 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/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/fstab/main.py:389
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
 msgstr ""
 
-#: 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}."
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 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"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
 #: src/modules/displaymanager/main.py:526
@@ -202,26 +143,6 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr ""
-
-#: 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 ""
-
-#: 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 ""
@@ -240,6 +161,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,8 +191,8 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
@@ -316,58 +242,24 @@ msgid ""
 "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:508
-msgid "Bootloader installation error"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/bootloader/main.py:509
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 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."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
 
 #: src/modules/dummypython/main.py:35
@@ -379,10 +271,121 @@ msgstr ""
 msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr ""
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+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:69
+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:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+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 ""
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:34
+msgid "Filling up filesystems."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:254
+msgid "rsync failed with error code {}."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:299
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:314
+msgid "Starting to unpack {}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:465
+msgid "Failed to unpack image \"{}\""
+msgstr ""
+
+#: src/modules/unpackfs/main.py:430
+msgid "No mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:431
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:436
+msgid "Bad mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:437
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:453 src/modules/unpackfs/main.py:457
+#: src/modules/unpackfs/main.py:463 src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:454
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:458
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:464
+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/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
diff --git a/lang/python/ml/LC_MESSAGES/python.po b/lang/python/ml/LC_MESSAGES/python.po
index d37b3ef32..00382cb34 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-22 11:02+0200\n"
+"POT-Creation-Date: 2021-11-02 15:45+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"
@@ -22,131 +22,72 @@ msgstr ""
 "Language: ml\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/networkcfg/main.py:105
+#: src/modules/initcpiocfg/main.py:227 src/modules/initcpiocfg/main.py:231
+#: src/modules/localecfg/main.py:135 src/modules/mount/main.py:144
+#: src/modules/rawfs/main.py:164 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90
+msgid "Configuration Error"
+msgstr "ക്രമീകരണത്തിൽ പിഴവ്"
+
+#: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356
+#: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145
+#: src/modules/rawfs/main.py:165 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/luksopenswaphookcfg/main.py:87
+msgid "No partitions are defined for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:90 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232
+#: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/luksopenswaphookcfg/main.py:91
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
 #: src/modules/grubcfg/main.py:28
 msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "ബൂട്ട്‌ലോടർ ഇൻസ്റ്റാൾ ചെയ്യൂ ."
+
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: 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
-#: src/modules/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: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 ""
-
-#: 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
+#: 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/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/fstab/main.py:389
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
 msgstr ""
 
-#: 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}."
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 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"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
 #: src/modules/displaymanager/main.py:526
@@ -203,26 +144,6 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr ""
-
-#: 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 ""
-
-#: 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 ""
@@ -241,6 +162,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,8 +192,8 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
@@ -317,58 +243,24 @@ msgid ""
 "command 
{!s}
 returned error code {!s}."
 msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "ബൂട്ട്‌ലോടർ ഇൻസ്റ്റാൾ ചെയ്യൂ ."
-
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/bootloader/main.py:509
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 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."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
 
 #: src/modules/dummypython/main.py:35
@@ -380,10 +272,121 @@ msgstr ""
 msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr ""
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+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:69
+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:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+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 ""
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:34
+msgid "Filling up filesystems."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:254
+msgid "rsync failed with error code {}."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:299
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:314
+msgid "Starting to unpack {}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:465
+msgid "Failed to unpack image \"{}\""
+msgstr ""
+
+#: src/modules/unpackfs/main.py:430
+msgid "No mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:431
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:436
+msgid "Bad mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:437
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:453 src/modules/unpackfs/main.py:457
+#: src/modules/unpackfs/main.py:463 src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:454
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:458
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:464
+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/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
diff --git a/lang/python/mr/LC_MESSAGES/python.po b/lang/python/mr/LC_MESSAGES/python.po
index f725ad2f3..83decf77c 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-22 11:02+0200\n"
+"POT-Creation-Date: 2021-11-02 15:45+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"
@@ -17,131 +17,72 @@ msgstr ""
 "Language: mr\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/networkcfg/main.py:105
+#: src/modules/initcpiocfg/main.py:227 src/modules/initcpiocfg/main.py:231
+#: src/modules/localecfg/main.py:135 src/modules/mount/main.py:144
+#: src/modules/rawfs/main.py:164 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356
+#: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145
+#: src/modules/rawfs/main.py:165 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/luksopenswaphookcfg/main.py:87
+msgid "No partitions are defined for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:90 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232
+#: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/luksopenswaphookcfg/main.py:91
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
 #: src/modules/grubcfg/main.py:28
 msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: 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
-#: src/modules/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"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: 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 ""
-
-#: 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
+#: 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/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/fstab/main.py:389
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
 msgstr ""
 
-#: 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}."
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 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"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
 #: src/modules/displaymanager/main.py:526
@@ -198,26 +139,6 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr ""
-
-#: 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 ""
-
-#: 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 ""
@@ -236,6 +157,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,8 +187,8 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
@@ -312,58 +238,24 @@ msgid ""
 "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:508
-msgid "Bootloader installation error"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/bootloader/main.py:509
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 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."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
 
 #: src/modules/dummypython/main.py:35
@@ -375,10 +267,121 @@ msgstr ""
 msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr ""
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+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:69
+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:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+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 ""
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:34
+msgid "Filling up filesystems."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:254
+msgid "rsync failed with error code {}."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:299
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:314
+msgid "Starting to unpack {}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:465
+msgid "Failed to unpack image \"{}\""
+msgstr ""
+
+#: src/modules/unpackfs/main.py:430
+msgid "No mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:431
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:436
+msgid "Bad mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:437
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:453 src/modules/unpackfs/main.py:457
+#: src/modules/unpackfs/main.py:463 src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:454
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:458
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:464
+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/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
diff --git a/lang/python/nb/LC_MESSAGES/python.po b/lang/python/nb/LC_MESSAGES/python.po
index 2d8599231..2269a2fae 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-22 11:02+0200\n"
+"POT-Creation-Date: 2021-11-02 15:45+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"
@@ -21,131 +21,72 @@ msgstr ""
 "Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/networkcfg/main.py:105
+#: src/modules/initcpiocfg/main.py:227 src/modules/initcpiocfg/main.py:231
+#: src/modules/localecfg/main.py:135 src/modules/mount/main.py:144
+#: src/modules/rawfs/main.py:164 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356
+#: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145
+#: src/modules/rawfs/main.py:165 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/luksopenswaphookcfg/main.py:87
+msgid "No partitions are defined for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:90 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232
+#: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/luksopenswaphookcfg/main.py:91
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
 #: src/modules/grubcfg/main.py:28
 msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: 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
-#: src/modules/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"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: 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 ""
-
-#: 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
+#: 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/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/fstab/main.py:389
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
 msgstr ""
 
-#: 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}."
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 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"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
 #: src/modules/displaymanager/main.py:526
@@ -202,26 +143,6 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr ""
-
-#: 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 ""
-
-#: 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 ""
@@ -240,6 +161,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,8 +191,8 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
@@ -316,58 +242,24 @@ msgid ""
 "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:508
-msgid "Bootloader installation error"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/bootloader/main.py:509
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 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."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
 
 #: src/modules/dummypython/main.py:35
@@ -379,10 +271,121 @@ msgstr ""
 msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr ""
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+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:69
+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:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+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 ""
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:34
+msgid "Filling up filesystems."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:254
+msgid "rsync failed with error code {}."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:299
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:314
+msgid "Starting to unpack {}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:465
+msgid "Failed to unpack image \"{}\""
+msgstr ""
+
+#: src/modules/unpackfs/main.py:430
+msgid "No mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:431
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:436
+msgid "Bad mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:437
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:453 src/modules/unpackfs/main.py:457
+#: src/modules/unpackfs/main.py:463 src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:454
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:458
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:464
+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/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
diff --git a/lang/python/ne/LC_MESSAGES/python.po b/lang/python/ne/LC_MESSAGES/python.po
index e7a906d1e..d51af9445 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-22 11:02+0200\n"
+"POT-Creation-Date: 2021-11-02 15:45+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"
@@ -17,131 +17,72 @@ msgstr ""
 "Language: ne\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/networkcfg/main.py:105
+#: src/modules/initcpiocfg/main.py:227 src/modules/initcpiocfg/main.py:231
+#: src/modules/localecfg/main.py:135 src/modules/mount/main.py:144
+#: src/modules/rawfs/main.py:164 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356
+#: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145
+#: src/modules/rawfs/main.py:165 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/luksopenswaphookcfg/main.py:87
+msgid "No partitions are defined for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:90 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232
+#: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/luksopenswaphookcfg/main.py:91
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
 #: src/modules/grubcfg/main.py:28
 msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: 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
-#: src/modules/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"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: 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 ""
-
-#: 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
+#: 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/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/fstab/main.py:389
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
 msgstr ""
 
-#: 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}."
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 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"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
 #: src/modules/displaymanager/main.py:526
@@ -198,26 +139,6 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr ""
-
-#: 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 ""
-
-#: 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 ""
@@ -236,6 +157,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,8 +187,8 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
@@ -312,58 +238,24 @@ msgid ""
 "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:508
-msgid "Bootloader installation error"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/bootloader/main.py:509
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 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."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
 
 #: src/modules/dummypython/main.py:35
@@ -375,10 +267,121 @@ msgstr ""
 msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr ""
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+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:69
+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:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+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 ""
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:34
+msgid "Filling up filesystems."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:254
+msgid "rsync failed with error code {}."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:299
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:314
+msgid "Starting to unpack {}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:465
+msgid "Failed to unpack image \"{}\""
+msgstr ""
+
+#: src/modules/unpackfs/main.py:430
+msgid "No mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:431
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:436
+msgid "Bad mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:437
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:453 src/modules/unpackfs/main.py:457
+#: src/modules/unpackfs/main.py:463 src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:454
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:458
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:464
+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/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
diff --git a/lang/python/ne_NP/LC_MESSAGES/python.po b/lang/python/ne_NP/LC_MESSAGES/python.po
index 51483e5ae..a2b72d82b 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-22 11:02+0200\n"
+"POT-Creation-Date: 2021-11-02 15:45+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"
@@ -17,131 +17,72 @@ msgstr ""
 "Language: ne_NP\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/networkcfg/main.py:105
+#: src/modules/initcpiocfg/main.py:227 src/modules/initcpiocfg/main.py:231
+#: src/modules/localecfg/main.py:135 src/modules/mount/main.py:144
+#: src/modules/rawfs/main.py:164 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356
+#: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145
+#: src/modules/rawfs/main.py:165 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/luksopenswaphookcfg/main.py:87
+msgid "No partitions are defined for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:90 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232
+#: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/luksopenswaphookcfg/main.py:91
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
 #: src/modules/grubcfg/main.py:28
 msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: 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
-#: src/modules/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"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: 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 ""
-
-#: 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
+#: 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/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/fstab/main.py:389
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
 msgstr ""
 
-#: 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}."
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 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"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
 #: src/modules/displaymanager/main.py:526
@@ -198,26 +139,6 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr ""
-
-#: 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 ""
-
-#: 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 ""
@@ -236,6 +157,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,8 +187,8 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
@@ -312,58 +238,24 @@ msgid ""
 "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:508
-msgid "Bootloader installation error"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/bootloader/main.py:509
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 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."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
 
 #: src/modules/dummypython/main.py:35
@@ -375,10 +267,121 @@ msgstr ""
 msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr ""
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+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:69
+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:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+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 ""
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:34
+msgid "Filling up filesystems."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:254
+msgid "rsync failed with error code {}."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:299
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:314
+msgid "Starting to unpack {}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:465
+msgid "Failed to unpack image \"{}\""
+msgstr ""
+
+#: src/modules/unpackfs/main.py:430
+msgid "No mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:431
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:436
+msgid "Bad mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:437
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:453 src/modules/unpackfs/main.py:457
+#: src/modules/unpackfs/main.py:463 src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:454
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:458
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:464
+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/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
diff --git a/lang/python/nl/LC_MESSAGES/python.po b/lang/python/nl/LC_MESSAGES/python.po
index a10e60fcd..c9b251903 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-22 11:02+0200\n"
+"POT-Creation-Date: 2021-11-02 15:45+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"
@@ -22,143 +22,74 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Instellen van initramfs."
+
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/networkcfg/main.py:105
+#: src/modules/initcpiocfg/main.py:227 src/modules/initcpiocfg/main.py:231
+#: src/modules/localecfg/main.py:135 src/modules/mount/main.py:144
+#: src/modules/rawfs/main.py:164 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90
+msgid "Configuration Error"
+msgstr "Configuratiefout"
+
+#: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356
+#: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145
+#: src/modules/rawfs/main.py:165 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/luksopenswaphookcfg/main.py:87
+msgid "No partitions are defined for 
{!s}
 to use."
+msgstr "Geen partities gedefinieerd voor 
{!s}
 om te gebruiken."
+
+#: src/modules/initramfscfg/main.py:90 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232
+#: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/luksopenswaphookcfg/main.py:91
+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/grubcfg/main.py:28
 msgid "Configure GRUB."
 msgstr "GRUB instellen."
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Partities mounten."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Installeer bootloader"
 
-#: 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
-#: src/modules/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/bootloader/main.py:508
+msgid "Bootloader installation error"
+msgstr ""
 
-#: 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 "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
+#: 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} 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/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "fstab schrijven."
+
+#: src/modules/fstab/main.py:389
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
 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/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "initramfs aanmaken met dracut."
 
-#: 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/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Uitvoeren van dracut op het doel is mislukt"
 
-#: 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/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/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "De afsluitcode was {}"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -216,27 +147,6 @@ 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/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 ""
-"Geen hoofd mount punt is gegeven voor 
{!s}
 om te gebruiken. "
-
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
-msgstr "Instellen van versleutelde swap."
-
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Data aan het installeren."
-
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
 msgstr "Configureer OpenRC services"
@@ -257,6 +167,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,9 +201,9 @@ 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/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Netwerk-configuratie opslaan."
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
 #: src/modules/packages/main.py:69
@@ -337,59 +252,25 @@ msgid ""
 "command 
{!s}
 returned error code {!s}."
 msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Installeer bootloader"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Plymouth thema instellen"
 
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
-msgstr ""
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Instellen van mkinitcpio"
 
-#: src/modules/bootloader/main.py:509
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Taal en locatie instellen."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Instellen van hardwareklok"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Partities mounten."
 
-#: 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/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "De afsluitcode was {}"
-
-#: 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/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Instellen van initramfs."
-
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Configureren van OpenRC dmcrypt service."
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "fstab schrijven."
-
-#: 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 "Data aan het installeren."
 
 #: src/modules/dummypython/main.py:35
 msgid "Dummy python job."
@@ -400,10 +281,130 @@ msgstr "Voorbeeld Python-taak"
 msgid "Dummy python step {}"
 msgstr "Voorbeeld Python-stap {}"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Taal en locatie instellen."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Instellen van hardwareklok"
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Netwerk-configuratie opslaan."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Unmount bestandssystemen."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Configureren van OpenRC dmcrypt service."
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Configureer 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} aanroeping in chroot resulteerde in foutcode "
+"{num!s}."
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+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:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr "De systemd service {name!s} kon niet worden uitgeschakeld."
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "De systemd unit {name!s} kon niet worden gemaskerd."
+
+#: src/modules/services-systemd/main.py:75
+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/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:34
+msgid "Filling up filesystems."
+msgstr "Bestandssystemen opvullen."
+
+#: src/modules/unpackfs/main.py:254
+msgid "rsync failed with error code {}."
+msgstr "rsync mislukte met foutcode {}."
+
+#: src/modules/unpackfs/main.py:299
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Bestandssysteem uitpakken {}/{}, bestand {}/{}"
+
+#: src/modules/unpackfs/main.py:314
+msgid "Starting to unpack {}"
+msgstr "Beginnen met uitpakken van {}"
+
+#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:465
+msgid "Failed to unpack image \"{}\""
+msgstr "Uitpakken van bestandssysteem \"{}\" mislukt"
+
+#: src/modules/unpackfs/main.py:430
+msgid "No mount point for root partition"
+msgstr "Geen mount-punt voor de root-partitie"
+
+#: src/modules/unpackfs/main.py:431
+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:436
+msgid "Bad mount point for root partition"
+msgstr "Onjuist mount-punt voor de root-partitie"
+
+#: src/modules/unpackfs/main.py:437
+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:453 src/modules/unpackfs/main.py:457
+#: src/modules/unpackfs/main.py:463 src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Foutieve unsquash configuratie"
+
+#: src/modules/unpackfs/main.py:454
+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:458
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Het bronbestandssysteem \"{}\" bestaat niet"
+
+#: src/modules/unpackfs/main.py:464
+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 "De bestemming \"{}\" in het doelsysteem is niet een map"
+
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr "Instellen van versleutelde swap."
diff --git a/lang/python/pl/LC_MESSAGES/python.po b/lang/python/pl/LC_MESSAGES/python.po
index 4232cd2b4..ea9756e2b 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-22 11:02+0200\n"
+"POT-Creation-Date: 2021-11-02 15:45+0100\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,74 @@ 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/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Konfigurowanie initramfs."
+
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/networkcfg/main.py:105
+#: src/modules/initcpiocfg/main.py:227 src/modules/initcpiocfg/main.py:231
+#: src/modules/localecfg/main.py:135 src/modules/mount/main.py:144
+#: src/modules/rawfs/main.py:164 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90
+msgid "Configuration Error"
+msgstr "Błąd konfiguracji"
+
+#: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356
+#: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145
+#: src/modules/rawfs/main.py:165 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/luksopenswaphookcfg/main.py:87
+msgid "No partitions are defined for 
{!s}
 to use."
+msgstr "Nie ma zdefiniowanych partycji dla 
{!s}
 do użytku."
+
+#: src/modules/initramfscfg/main.py:90 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232
+#: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/luksopenswaphookcfg/main.py:91
+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/grubcfg/main.py:28
 msgid "Configure GRUB."
 msgstr "Konfiguracja GRUB."
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Montowanie partycji."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Instalacja programu rozruchowego."
 
-#: 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
-#: src/modules/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/bootloader/main.py:508
+msgid "Bootloader installation error"
+msgstr ""
 
-#: 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 "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
+#: 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 ""
-"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/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Zapisywanie fstab."
 
-#: 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}."
+#: src/modules/fstab/main.py:389
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
 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/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Tworzenie initramfs z dracut."
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Zapełnianie systemu plików."
+#: 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: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/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "Kod wyjściowy to {}"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -218,27 +149,6 @@ 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/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 ""
-"Nie znaleziono głównego punktu montowania dla 
{!s}
 do użycia."
-
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
-msgstr "Konfigurowanie zaszyfrowanej przestrzeni wymiany."
-
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Instalowanie danych."
-
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
 msgstr "Konfiguracja usług OpenRC"
@@ -261,6 +171,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,9 +204,9 @@ 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/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Zapisywanie konfiguracji sieci."
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
 #: src/modules/packages/main.py:69
@@ -344,59 +259,25 @@ msgid ""
 "command 
{!s}
 returned error code {!s}."
 msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Instalacja programu rozruchowego."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Konfiguracja motywu Plymouth"
 
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
-msgstr ""
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Konfigurowanie mkinitcpio."
 
-#: src/modules/bootloader/main.py:509
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Konfigurowanie ustawień lokalnych."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Ustawianie zegara systemowego."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Montowanie partycji."
 
-#: 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/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Kod wyjściowy to {}"
-
-#: 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/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Konfigurowanie initramfs."
-
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Konfigurowanie usługi OpenRC dmcrypt."
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Zapisywanie fstab."
-
-#: 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 "Instalowanie danych."
 
 #: src/modules/dummypython/main.py:35
 msgid "Dummy python job."
@@ -407,10 +288,130 @@ msgstr "Zadanie fikcyjne Python."
 msgid "Dummy python step {}"
 msgstr "Krok fikcyjny Python {}"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Konfigurowanie ustawień lokalnych."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Ustawianie zegara systemowego."
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Zapisywanie konfiguracji sieci."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Odmontuj systemy plików."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Konfigurowanie usługi OpenRC dmcrypt."
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Konfiguracja usług systemd"
+
+#: 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:69
+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:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Nie można wyłączyć celu w systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Nie można zamaskować jednostki systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:75
+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/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:34
+msgid "Filling up filesystems."
+msgstr "Zapełnianie systemu plików."
+
+#: src/modules/unpackfs/main.py:254
+msgid "rsync failed with error code {}."
+msgstr "rsync zakończyło działanie kodem błędu {}."
+
+#: src/modules/unpackfs/main.py:299
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Odpakowywanie obrazu {}/{}, pliku {}/{}"
+
+#: src/modules/unpackfs/main.py:314
+msgid "Starting to unpack {}"
+msgstr "Rozpoczynanie odpakowywania {}"
+
+#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:465
+msgid "Failed to unpack image \"{}\""
+msgstr "Błąd rozpakowywania obrazu \"{}\""
+
+#: src/modules/unpackfs/main.py:430
+msgid "No mount point for root partition"
+msgstr "Brak punktu montowania partycji root"
+
+#: src/modules/unpackfs/main.py:431
+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:436
+msgid "Bad mount point for root partition"
+msgstr "Błędny punkt montowania partycji root"
+
+#: src/modules/unpackfs/main.py:437
+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:453 src/modules/unpackfs/main.py:457
+#: src/modules/unpackfs/main.py:463 src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Błędna konfiguracja unsquash"
+
+#: src/modules/unpackfs/main.py:454
+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:458
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Źródłowy system plików \"{}\" nie istnieje"
+
+#: src/modules/unpackfs/main.py:464
+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 "Miejsce docelowe \"{}\" w docelowym systemie nie jest katalogiem"
+
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr "Konfigurowanie zaszyfrowanej przestrzeni wymiany."
diff --git a/lang/python/pt_BR/LC_MESSAGES/python.po b/lang/python/pt_BR/LC_MESSAGES/python.po
index d711c6e8a..d3cf730a0 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-22 11:02+0200\n"
+"POT-Creation-Date: 2021-11-02 15:45+0100\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,78 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Configurando initramfs."
+
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/networkcfg/main.py:105
+#: src/modules/initcpiocfg/main.py:227 src/modules/initcpiocfg/main.py:231
+#: src/modules/localecfg/main.py:135 src/modules/mount/main.py:144
+#: src/modules/rawfs/main.py:164 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90
+msgid "Configuration Error"
+msgstr "Erro de Configuração."
+
+#: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356
+#: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145
+#: src/modules/rawfs/main.py:165 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/luksopenswaphookcfg/main.py:87
+msgid "No partitions are defined for 
{!s}
 to use."
+msgstr "Sem partições definidas para uso por 
{!s}
."
+
+#: src/modules/initramfscfg/main.py:90 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232
+#: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/luksopenswaphookcfg/main.py:91
+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/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/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Instalar carregador de inicialização."
 
-#: 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
-#: src/modules/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/bootloader/main.py:508
+msgid "Bootloader installation error"
+msgstr "Erro de instalação do carregador de inicialização"
 
-#: 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 "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
+#: 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 ""
-"A chamada systemctl {arg!s} no chroot retornou o código de erro"
-" {num!s}."
+"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/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/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Escrevendo fstab."
 
-#: 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}."
+#: src/modules/fstab/main.py:389
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
 msgstr ""
-"Comandos desconhecidos do systemd {command!s} e "
-"{suffix!s} para a unidade {name!s}."
+"Nenhuma configuração 
{!s}
 é dada para que 
{!s}
 possa "
+"utilizar."
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Desmontar os sistemas de arquivos."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Criando initramfs com dracut."
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Preenchendo sistemas de arquivos."
+#: 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: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/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/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -212,27 +152,6 @@ 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/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 ""
-"Nenhum ponto de montagem para o root fornecido para uso por 
{!s}
."
-
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
-msgstr "Configurando swap encriptada."
-
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Instalando os dados."
-
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
 msgstr "Configurar serviços do OpenRC"
@@ -255,6 +174,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,9 +210,9 @@ 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/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Salvando configuração de rede."
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
 #: src/modules/packages/main.py:69
@@ -343,63 +267,25 @@ 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 carregador de inicialização."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Configurar tema do Plymouth"
 
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
-msgstr "Erro de instalação do carregador de inicialização"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Configurando mkinitcpio."
 
-#: 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/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Configurando locais."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Configurando relógio de hardware."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Montando partições."
 
-#: 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/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/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/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Configurando initramfs."
-
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Configurando serviço dmcrypt do OpenRC."
-
-#: 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 ""
-"Nenhuma configuração 
{!s}
 é dada para que 
{!s}
 possa "
-"utilizar."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Instalando os dados."
 
 #: src/modules/dummypython/main.py:35
 msgid "Dummy python job."
@@ -410,10 +296,125 @@ msgstr "Tarefa modelo python."
 msgid "Dummy python step {}"
 msgstr "Etapa modelo python {}"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Configurando locais."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Configurando relógio de hardware."
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Salvando configuração de rede."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Desmontar os sistemas de arquivos."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Configurando serviço dmcrypt do OpenRC."
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Configurar serviços do systemd"
+
+#: 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:69
+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:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+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:73
+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:75
+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/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Falha ao executar mkinitfs no alvo"
+
+#: src/modules/unpackfs/main.py:34
+msgid "Filling up filesystems."
+msgstr "Preenchendo sistemas de arquivos."
+
+#: src/modules/unpackfs/main.py:254
+msgid "rsync failed with error code {}."
+msgstr "O rsync falhou com o código de erro {}."
+
+#: src/modules/unpackfs/main.py:299
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Descompactando imagem {}/{}, arquivo {}/{}"
+
+#: src/modules/unpackfs/main.py:314
+msgid "Starting to unpack {}"
+msgstr "Começando a descompactar {}"
+
+#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:465
+msgid "Failed to unpack image \"{}\""
+msgstr "Ocorreu uma falha ao descompactar a imagem \"{}\""
+
+#: src/modules/unpackfs/main.py:430
+msgid "No mount point for root partition"
+msgstr "Nenhum ponto de montagem para a partição root"
+
+#: src/modules/unpackfs/main.py:431
+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:436
+msgid "Bad mount point for root partition"
+msgstr "Ponto de montagem incorreto para a partição root"
+
+#: src/modules/unpackfs/main.py:437
+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:453 src/modules/unpackfs/main.py:457
+#: src/modules/unpackfs/main.py:463 src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Configuração incorreta do unsquash"
+
+#: src/modules/unpackfs/main.py:454
+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:458
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "O sistema de arquivos de origem \"{}\" não existe"
+
+#: src/modules/unpackfs/main.py:464
+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 "A destinação \"{}\" no sistema de destino não é um diretório"
+
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr "Configurando swap encriptada."
diff --git a/lang/python/pt_PT/LC_MESSAGES/python.po b/lang/python/pt_PT/LC_MESSAGES/python.po
index afa94f31e..bbca55b84 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-22 11:02+0200\n"
+"POT-Creation-Date: 2021-11-02 15:45+0100\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,77 @@ msgstr ""
 "Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "A configurar o initramfs."
+
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/networkcfg/main.py:105
+#: src/modules/initcpiocfg/main.py:227 src/modules/initcpiocfg/main.py:231
+#: src/modules/localecfg/main.py:135 src/modules/mount/main.py:144
+#: src/modules/rawfs/main.py:164 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90
+msgid "Configuration Error"
+msgstr "Erro de configuração"
+
+#: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356
+#: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145
+#: src/modules/rawfs/main.py:165 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/luksopenswaphookcfg/main.py:87
+msgid "No partitions are defined for 
{!s}
 to use."
+msgstr "Nenhuma partição está definida para 
{!s}
 usar."
+
+#: src/modules/initramfscfg/main.py:90 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232
+#: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/luksopenswaphookcfg/main.py:91
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr "Nenhum ponto de montagem root é fornecido para 
{!s}
 usar."
+
 #: 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/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Instalar o carregador de arranque."
 
-#: 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
-#: src/modules/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/bootloader/main.py:508
+msgid "Bootloader installation error"
+msgstr "Erro de instalação do carregador de arranque"
 
-#: 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 "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
+#: 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} chamar pelo chroot retornou com código de "
-"erro {num!s}."
+"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/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/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "A escrever o fstab."
 
-#: 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}."
+#: src/modules/fstab/main.py:389
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
 msgstr ""
-"Comandos do systemd desconhecidos {command!s} e "
-"{suffix!s} por unidade {name!s}."
+"Não é dada nenhuma configuração 
{!s}
 para 
{!s}
 "
+"utilizar."
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Desmontar sistemas de ficheiros."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Criando o initramfs com o dracut."
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "A preencher os sistemas de ficheiros."
+#: 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: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/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/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -215,26 +152,6 @@ 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/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 "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/rawfs/main.py:26
-msgid "Installing data."
-msgstr "A instalar dados."
-
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
 msgstr "Configurar serviços OpenRC"
@@ -257,6 +174,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,9 +209,9 @@ 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/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "A guardar a configuração de rede."
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
 #: src/modules/packages/main.py:69
@@ -344,63 +266,25 @@ 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."
-msgstr "Instalar o carregador de arranque."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Configurar tema do Plymouth"
 
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
-msgstr "Erro de instalação do carregador de arranque"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "A configurar o mkintcpio."
 
-#: 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/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "A configurar a localização."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "A definir o relógio do hardware."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "A montar partições."
 
-#: 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/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/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/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "A configurar o initramfs."
-
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "A configurar o serviço OpenRC dmcrypt."
-
-#: 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 ""
-"Não é dada nenhuma configuração 
{!s}
 para 
{!s}
 "
-"utilizar."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "A instalar dados."
 
 #: src/modules/dummypython/main.py:35
 msgid "Dummy python job."
@@ -411,10 +295,127 @@ msgstr "Tarefa Dummy python."
 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/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "A definir o relógio do hardware."
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "A guardar a configuração de rede."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Desmontar sistemas de ficheiros."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "A configurar o serviço OpenRC dmcrypt."
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Configurar serviços systemd"
+
+#: 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:69
+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:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+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:73
+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:75
+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/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:34
+msgid "Filling up filesystems."
+msgstr "A preencher os sistemas de ficheiros."
+
+#: src/modules/unpackfs/main.py:254
+msgid "rsync failed with error code {}."
+msgstr "rsync falhou com código de erro {}."
+
+#: src/modules/unpackfs/main.py:299
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "A descompactar imagem {}/{}, ficheiro {}/{}"
+
+#: src/modules/unpackfs/main.py:314
+msgid "Starting to unpack {}"
+msgstr "A começar a descompactação {}"
+
+#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:465
+msgid "Failed to unpack image \"{}\""
+msgstr "Falha ao descompactar imagem \"{}\""
+
+#: src/modules/unpackfs/main.py:430
+msgid "No mount point for root partition"
+msgstr "Nenhum ponto de montagem para a partição root"
+
+#: src/modules/unpackfs/main.py:431
+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:436
+msgid "Bad mount point for root partition"
+msgstr "Ponto de montagem mau para partição root"
+
+#: src/modules/unpackfs/main.py:437
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint é \"{}\", que não existe, nada a fazer"
+
+#: src/modules/unpackfs/main.py:453 src/modules/unpackfs/main.py:457
+#: src/modules/unpackfs/main.py:463 src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Má configuração unsquash"
+
+#: src/modules/unpackfs/main.py:454
+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:458
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "O sistema de ficheiros fonte \"{}\" não existe"
+
+#: src/modules/unpackfs/main.py:464
+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 "O destino \"{}\" no sistema de destino não é um diretório"
+
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr "Configurando a swap criptografada."
diff --git a/lang/python/ro/LC_MESSAGES/python.po b/lang/python/ro/LC_MESSAGES/python.po
index f28a466a0..ab6e35e7f 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-22 11:02+0200\n"
+"POT-Creation-Date: 2021-11-02 15:45+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"
@@ -22,131 +22,72 @@ 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/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/networkcfg/main.py:105
+#: src/modules/initcpiocfg/main.py:227 src/modules/initcpiocfg/main.py:231
+#: src/modules/localecfg/main.py:135 src/modules/mount/main.py:144
+#: src/modules/rawfs/main.py:164 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356
+#: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145
+#: src/modules/rawfs/main.py:165 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/luksopenswaphookcfg/main.py:87
+msgid "No partitions are defined for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:90 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232
+#: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/luksopenswaphookcfg/main.py:91
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
 #: src/modules/grubcfg/main.py:28
 msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: 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
-#: src/modules/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"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: 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 ""
-
-#: 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
+#: 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/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/fstab/main.py:389
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
 msgstr ""
 
-#: 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}."
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 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"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
 #: src/modules/displaymanager/main.py:526
@@ -203,26 +144,6 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr ""
-
-#: 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 ""
-
-#: 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 ""
@@ -241,6 +162,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,8 +192,8 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
@@ -319,58 +245,24 @@ msgid ""
 "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:508
-msgid "Bootloader installation error"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/bootloader/main.py:509
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 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."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
 
 #: src/modules/dummypython/main.py:35
@@ -382,10 +274,121 @@ msgstr "Job python fictiv."
 msgid "Dummy python step {}"
 msgstr "Dummy python step {}"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Demonteaza sistemul de fisiere"
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+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:69
+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:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+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 ""
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:34
+msgid "Filling up filesystems."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:254
+msgid "rsync failed with error code {}."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:299
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:314
+msgid "Starting to unpack {}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:465
+msgid "Failed to unpack image \"{}\""
+msgstr ""
+
+#: src/modules/unpackfs/main.py:430
+msgid "No mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:431
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:436
+msgid "Bad mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:437
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:453 src/modules/unpackfs/main.py:457
+#: src/modules/unpackfs/main.py:463 src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:454
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:458
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:464
+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/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
diff --git a/lang/python/ru/LC_MESSAGES/python.po b/lang/python/ru/LC_MESSAGES/python.po
index a5e624a74..fb7f6c275 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-22 11:02+0200\n"
+"POT-Creation-Date: 2021-11-02 15:45+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"
@@ -22,133 +22,73 @@ 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/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Настройка initramfs."
+
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/networkcfg/main.py:105
+#: src/modules/initcpiocfg/main.py:227 src/modules/initcpiocfg/main.py:231
+#: src/modules/localecfg/main.py:135 src/modules/mount/main.py:144
+#: src/modules/rawfs/main.py:164 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90
+msgid "Configuration Error"
+msgstr "Ошибка конфигурации"
+
+#: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356
+#: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145
+#: src/modules/rawfs/main.py:165 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/luksopenswaphookcfg/main.py:87
+msgid "No partitions are defined for 
{!s}
 to use."
+msgstr "Не определены разделы для использования 
{!S}
."
+
+#: src/modules/initramfscfg/main.py:90 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232
+#: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/luksopenswaphookcfg/main.py:91
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
 #: src/modules/grubcfg/main.py:28
 msgid "Configure GRUB."
 msgstr "Настройте GRUB."
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Монтирование разделов."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Установить загрузчик."
 
-#: 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
-#: src/modules/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/bootloader/main.py:508
+msgid "Bootloader installation error"
+msgstr ""
 
-#: 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 "Не определены разделы для использования 
{!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
+#: src/modules/bootloader/main.py:509
 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}."
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: 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 ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr ""
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Создание initramfs с помощью dracut."
 
-#: 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 "Не удалось запустить dracut на цели"
 
-#: 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/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "Код выхода {}"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -204,26 +144,6 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr ""
-
-#: 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 ""
-
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
-msgstr "Настройка зашифрованного swap."
-
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Установка данных."
-
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
 msgstr "Настройка служб OpenRC"
@@ -242,6 +162,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,9 +192,9 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Настроить тему Plymouth"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Сохранение настроек сети."
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
 #: src/modules/packages/main.py:69
@@ -322,59 +247,25 @@ msgid ""
 "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:508
-msgid "Bootloader installation error"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 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/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Настройка языка."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Установка аппаратных часов."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+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 "Создание initramfs с помощью dracut."
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Не удалось запустить dracut на цели"
-
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Настройка initramfs."
-
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Настройка службы OpenRC dmcrypt."
-
-#: 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 ""
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Установка данных."
 
 #: src/modules/dummypython/main.py:35
 msgid "Dummy python job."
@@ -385,10 +276,122 @@ msgstr ""
 msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Настройка языка."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Установка аппаратных часов."
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Сохранение настроек сети."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Размонтирование файловой системы."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Настройка службы OpenRC dmcrypt."
+
+#: 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:69
+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:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+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 ""
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:34
+msgid "Filling up filesystems."
+msgstr "Наполнение файловой системы."
+
+#: src/modules/unpackfs/main.py:254
+msgid "rsync failed with error code {}."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:299
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:314
+msgid "Starting to unpack {}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:465
+msgid "Failed to unpack image \"{}\""
+msgstr ""
+
+#: src/modules/unpackfs/main.py:430
+msgid "No mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:431
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:436
+msgid "Bad mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:437
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:453 src/modules/unpackfs/main.py:457
+#: src/modules/unpackfs/main.py:463 src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:454
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:458
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:464
+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/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr "Настройка зашифрованного swap."
diff --git a/lang/python/si/LC_MESSAGES/python.po b/lang/python/si/LC_MESSAGES/python.po
index dffc4706a..545e074ca 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-22 11:02+0200\n"
+"POT-Creation-Date: 2021-11-02 15:45+0100\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: හෙළබස, 2021\n"
 "Language-Team: Sinhala (https://www.transifex.com/calamares/teams/20061/si/)\n"
@@ -21,131 +21,72 @@ msgstr ""
 "Language: si\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/networkcfg/main.py:105
+#: src/modules/initcpiocfg/main.py:227 src/modules/initcpiocfg/main.py:231
+#: src/modules/localecfg/main.py:135 src/modules/mount/main.py:144
+#: src/modules/rawfs/main.py:164 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356
+#: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145
+#: src/modules/rawfs/main.py:165 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/luksopenswaphookcfg/main.py:87
+msgid "No partitions are defined for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:90 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232
+#: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/luksopenswaphookcfg/main.py:91
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
 #: src/modules/grubcfg/main.py:28
 msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: 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
-#: src/modules/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"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: 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 ""
-
-#: 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
+#: 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/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/fstab/main.py:389
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
 msgstr ""
 
-#: 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}."
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 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"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
 #: src/modules/displaymanager/main.py:526
@@ -202,26 +143,6 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr ""
-
-#: 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 ""
-
-#: 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 ""
@@ -240,6 +161,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,9 +191,9 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "ජාල වින්‍යාසය සුරැකෙමින්."
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
 #: src/modules/packages/main.py:69
@@ -316,59 +242,25 @@ msgid ""
 "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:508
-msgid "Bootloader installation error"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/bootloader/main.py:509
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 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/mount/main.py:30
+msgid "Mounting partitions."
 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/rawfs/main.py:26
+msgid "Installing data."
+msgstr "දත්ත ස්ථාපනය වෙමින්."
 
 #: src/modules/dummypython/main.py:35
 msgid "Dummy python job."
@@ -379,10 +271,121 @@ msgstr ""
 msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "දෘඩාංග ඔරලෝසුව සැකසෙමින්."
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 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/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:69
+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:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+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 ""
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:34
+msgid "Filling up filesystems."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:254
+msgid "rsync failed with error code {}."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:299
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:314
+msgid "Starting to unpack {}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:465
+msgid "Failed to unpack image \"{}\""
+msgstr ""
+
+#: src/modules/unpackfs/main.py:430
+msgid "No mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:431
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:436
+msgid "Bad mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:437
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:453 src/modules/unpackfs/main.py:457
+#: src/modules/unpackfs/main.py:463 src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:454
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:458
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:464
+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/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr ""
diff --git a/lang/python/sk/LC_MESSAGES/python.po b/lang/python/sk/LC_MESSAGES/python.po
index a5e6a729b..fac1b1274 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-22 11:02+0200\n"
+"POT-Creation-Date: 2021-11-02 15:45+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"
@@ -21,136 +21,73 @@ 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/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Konfigurácia initramfs."
+
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/networkcfg/main.py:105
+#: src/modules/initcpiocfg/main.py:227 src/modules/initcpiocfg/main.py:231
+#: src/modules/localecfg/main.py:135 src/modules/mount/main.py:144
+#: src/modules/rawfs/main.py:164 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90
+msgid "Configuration Error"
+msgstr "Chyba konfigurácie"
+
+#: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356
+#: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145
+#: src/modules/rawfs/main.py:165 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/luksopenswaphookcfg/main.py:87
+msgid "No partitions are defined for 
{!s}
 to use."
+msgstr "Nie sú určené žiadne oddiely na použitie pre 
{!s}
."
+
+#: src/modules/initramfscfg/main.py:90 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232
+#: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/luksopenswaphookcfg/main.py:91
+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/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/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Inštalácia zavádzača."
 
-#: 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
-#: src/modules/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/bootloader/main.py:508
+msgid "Bootloader installation error"
+msgstr ""
 
-#: 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 "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
+#: src/modules/bootloader/main.py:509
 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"
+"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/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/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Vytváranie initramfs pomocou nástroja dracut."
 
-#: 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/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: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/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "Kód skončenia bol {}"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -206,26 +143,6 @@ 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/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 "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/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"
@@ -244,6 +161,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,9 +191,9 @@ 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/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Ukladanie sieťovej konfigurácie."
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
 #: src/modules/packages/main.py:69
@@ -324,59 +246,25 @@ msgid ""
 "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:508
-msgid "Bootloader installation error"
-msgstr ""
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Konfigurácia mkinitcpio."
 
-#: src/modules/bootloader/main.py:509
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Konfigurácia miestnych nastavení."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Nastavovanie hardvérových hodín."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Pripájanie oddielov."
 
-#: 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 "Kód skončenia bol {}"
-
-#: 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/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Konfigurácia initramfs."
-
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr ""
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Zapisovanie fstab."
-
-#: 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/dummypython/main.py:35
 msgid "Dummy python job."
@@ -387,10 +275,125 @@ msgstr "Fiktívna úloha jazyka python."
 msgid "Dummy python step {}"
 msgstr "Fiktívny krok {} jazyka python"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Konfigurácia miestnych nastavení."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Nastavovanie hardvérových hodín."
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Ukladanie sieťovej konfigurácie."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Odpojenie súborových systémov."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Konfigurácia služieb systemd"
+
+#: 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:69
+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:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Nedá sa zakázať cieľ systému systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Nedá sa zamaskovať jednotka systému systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:75
+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:27
+msgid "Creating initramfs with mkinitfs."
+msgstr ""
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:34
+msgid "Filling up filesystems."
+msgstr "Napĺňanie súborových systémov."
+
+#: src/modules/unpackfs/main.py:254
+msgid "rsync failed with error code {}."
+msgstr "Príkaz rsync zlyhal s chybovým kódom {}."
+
+#: src/modules/unpackfs/main.py:299
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Rozbaľuje sa obraz {}/{}, súbor {}/{}"
+
+#: src/modules/unpackfs/main.py:314
+msgid "Starting to unpack {}"
+msgstr "Spúšťa sa rozbaľovanie {}"
+
+#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:465
+msgid "Failed to unpack image \"{}\""
+msgstr "Zlyhalo rozbalenie obrazu „{}“"
+
+#: src/modules/unpackfs/main.py:430
+msgid "No mount point for root partition"
+msgstr "Žiadny bod pripojenia pre koreňový oddiel"
+
+#: src/modules/unpackfs/main.py:431
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:436
+msgid "Bad mount point for root partition"
+msgstr "Zlý bod pripojenia pre koreňový oddiel"
+
+#: src/modules/unpackfs/main.py:437
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:453 src/modules/unpackfs/main.py:457
+#: src/modules/unpackfs/main.py:463 src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Nesprávna konfigurácia nástroja unsquash"
+
+#: src/modules/unpackfs/main.py:454
+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:458
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Zdrojový súborový systém \"{}\" neexistuje"
+
+#: src/modules/unpackfs/main.py:464
+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/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr "Konfigurácia zašifrovaného odkladacieho priestoru."
diff --git a/lang/python/sl/LC_MESSAGES/python.po b/lang/python/sl/LC_MESSAGES/python.po
index f9c78ddc4..05c4fee08 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-22 11:02+0200\n"
+"POT-Creation-Date: 2021-11-02 15:45+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"
@@ -17,131 +17,72 @@ 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/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/networkcfg/main.py:105
+#: src/modules/initcpiocfg/main.py:227 src/modules/initcpiocfg/main.py:231
+#: src/modules/localecfg/main.py:135 src/modules/mount/main.py:144
+#: src/modules/rawfs/main.py:164 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356
+#: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145
+#: src/modules/rawfs/main.py:165 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/luksopenswaphookcfg/main.py:87
+msgid "No partitions are defined for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:90 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232
+#: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/luksopenswaphookcfg/main.py:91
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
 #: src/modules/grubcfg/main.py:28
 msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: 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
-#: src/modules/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"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: 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 ""
-
-#: 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
+#: 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/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/fstab/main.py:389
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
 msgstr ""
 
-#: 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}."
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 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"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
 #: src/modules/displaymanager/main.py:526
@@ -198,26 +139,6 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr ""
-
-#: 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 ""
-
-#: 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 ""
@@ -236,6 +157,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,8 +187,8 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
@@ -316,58 +242,24 @@ msgid ""
 "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:508
-msgid "Bootloader installation error"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/bootloader/main.py:509
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 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."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
 
 #: src/modules/dummypython/main.py:35
@@ -379,10 +271,121 @@ msgstr ""
 msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr ""
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+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:69
+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:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+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 ""
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:34
+msgid "Filling up filesystems."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:254
+msgid "rsync failed with error code {}."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:299
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:314
+msgid "Starting to unpack {}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:465
+msgid "Failed to unpack image \"{}\""
+msgstr ""
+
+#: src/modules/unpackfs/main.py:430
+msgid "No mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:431
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:436
+msgid "Bad mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:437
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:453 src/modules/unpackfs/main.py:457
+#: src/modules/unpackfs/main.py:463 src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:454
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:458
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:464
+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/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
diff --git a/lang/python/sq/LC_MESSAGES/python.po b/lang/python/sq/LC_MESSAGES/python.po
index ec14c307f..175a7f97d 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-22 11:02+0200\n"
+"POT-Creation-Date: 2021-11-02 15:45+0100\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,77 @@ msgstr ""
 "Language: sq\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Po formësohet initramfs."
+
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/networkcfg/main.py:105
+#: src/modules/initcpiocfg/main.py:227 src/modules/initcpiocfg/main.py:231
+#: src/modules/localecfg/main.py:135 src/modules/mount/main.py:144
+#: src/modules/rawfs/main.py:164 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90
+msgid "Configuration Error"
+msgstr "Gabim Formësimi"
+
+#: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356
+#: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145
+#: src/modules/rawfs/main.py:165 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/luksopenswaphookcfg/main.py:87
+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/initramfscfg/main.py:90 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232
+#: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/luksopenswaphookcfg/main.py:91
+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/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/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Instalo ngarkues nisjesh."
 
-#: 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
-#: src/modules/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/bootloader/main.py:508
+msgid "Bootloader installation error"
+msgstr "Gabim instalimi Ngarkuesi Nisësi"
 
-#: 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 "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
+#: 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 ""
-"Thirrja systemctl {arg!s} në chroot u përgjigj me kod gabimi "
-"{num!s}."
+"Ngarkuesi i nisësit s’u instalua dot. Urdhri i instalimit 
{!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/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Po shkruhet fstab."
 
-#: 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}."
+#: 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}."
+"S’është dhënë formësim 
{!s}
 për t’u përdorur nga 
{!s}
."
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Çmontoni sisteme kartelash."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Po krijohet initramfs me dracut."
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Po mbushen sisteme kartelash."
+#: 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: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/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "Kodi i daljes qe {}"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -211,27 +149,6 @@ 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/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 ""
-"S’është dhënë pikë montimi rrënjë për 
{!s}
 për t’u përdorur."
-
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
-msgstr "Po formësohet pjesë swap e fshehtëzuar."
-
-#: 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"
@@ -252,6 +169,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,9 +205,9 @@ 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/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Po ruhet formësimi i rrjetit."
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
 #: src/modules/packages/main.py:69
@@ -340,62 +262,25 @@ 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."
-msgstr "Instalo ngarkues nisjesh."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Formësoni temën Plimuth"
 
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
-msgstr "Gabim instalimi Ngarkuesi Nisësi"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Po formësohet mkinitcpio."
 
-#: src/modules/bootloader/main.py:509
-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/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Po formësohen vendoret."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Po caktohet ora hardware."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Po montohen pjesë."
 
-#: 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/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Kodi i daljes qe {}"
-
-#: 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/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Po formësohet initramfs."
-
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Po formësohet shërbim OpenRC dmcrypt."
-
-#: 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’është dhënë formësim 
{!s}
 për t’u përdorur nga 
{!s}
."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Po instalohen të dhëna."
 
 #: src/modules/dummypython/main.py:35
 msgid "Dummy python job."
@@ -406,10 +291,128 @@ msgstr "Akt python dummy."
 msgid "Dummy python step {}"
 msgstr "Hap python {} dummy"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Po formësohen vendoret."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Po caktohet ora hardware."
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Po ruhet formësimi i rrjetit."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Çmontoni sisteme kartelash."
+
+#: 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:26
+msgid "Configure systemd services"
+msgstr "Formësoni shërbime systemd"
+
+#: 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:69
+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:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr "S’aktivizohet dot kohëmatës systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr "S’çaktivizohet dot objektivi systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "S’maskohet dot njësia systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:75
+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/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:34
+msgid "Filling up filesystems."
+msgstr "Po mbushen sisteme kartelash."
+
+#: src/modules/unpackfs/main.py:254
+msgid "rsync failed with error code {}."
+msgstr "rsync dështoi me kod gabimi {}."
+
+#: src/modules/unpackfs/main.py:299
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Po shpaketohet paketa {}/{}, kartela {}/{}"
+
+#: src/modules/unpackfs/main.py:314
+msgid "Starting to unpack {}"
+msgstr "Po fillohet të shpaketohet {}"
+
+#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:465
+msgid "Failed to unpack image \"{}\""
+msgstr "Dështoi shpaketimi i figurës \"{}\""
+
+#: src/modules/unpackfs/main.py:430
+msgid "No mount point for root partition"
+msgstr "S’ka pikë montimi për ndarjen rrënjë"
+
+#: src/modules/unpackfs/main.py:431
+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:436
+msgid "Bad mount point for root partition"
+msgstr "Pikë e gabuar montimi për ndarjen rrënjë"
+
+#: src/modules/unpackfs/main.py:437
+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:453 src/modules/unpackfs/main.py:457
+#: src/modules/unpackfs/main.py:463 src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Formësim i keq i unsquash-it"
+
+#: src/modules/unpackfs/main.py:454
+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:458
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Sistemi i kartelave \"{}\" ({}) s’ekziston"
+
+#: src/modules/unpackfs/main.py:464
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed."
+msgstr ""
+"S’u arrit të gjendet unsquashfs, sigurohuni se 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/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr "Po formësohet pjesë swap e fshehtëzuar."
diff --git a/lang/python/sr/LC_MESSAGES/python.po b/lang/python/sr/LC_MESSAGES/python.po
index d5f6fa2e5..4b6f239f8 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-22 11:02+0200\n"
+"POT-Creation-Date: 2021-11-02 15:45+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"
@@ -21,131 +21,72 @@ 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/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/networkcfg/main.py:105
+#: src/modules/initcpiocfg/main.py:227 src/modules/initcpiocfg/main.py:231
+#: src/modules/localecfg/main.py:135 src/modules/mount/main.py:144
+#: src/modules/rawfs/main.py:164 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90
+msgid "Configuration Error"
+msgstr "Грешка поставе"
+
+#: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356
+#: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145
+#: src/modules/rawfs/main.py:165 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/luksopenswaphookcfg/main.py:87
+msgid "No partitions are defined for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:90 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232
+#: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/luksopenswaphookcfg/main.py:91
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
 #: 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: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
-#: src/modules/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: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."
+#: 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/bootloader/main.py:508
+msgid "Bootloader installation error"
+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
+#: 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/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 ""
 
-#: 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}."
-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"
-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"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
 #: src/modules/displaymanager/main.py:526
@@ -202,26 +143,6 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr ""
-
-#: 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 ""
-
-#: 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 ""
@@ -240,6 +161,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,9 +191,9 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Упис поставе мреже."
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
 #: src/modules/packages/main.py:69
@@ -318,59 +244,25 @@ msgid ""
 "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:508
-msgid "Bootloader installation error"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 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/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Подешавање локалитета."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr ""
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+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 "Уписивање fstab."
-
-#: 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/dummypython/main.py:35
 msgid "Dummy python job."
@@ -381,10 +273,121 @@ msgstr ""
 msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Подешавање локалитета."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Упис поставе мреже."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Демонтирање фајл-система."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+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 ""
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+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:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+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 ""
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:34
+msgid "Filling up filesystems."
+msgstr "Попуњавање фајл-система."
+
+#: src/modules/unpackfs/main.py:254
+msgid "rsync failed with error code {}."
+msgstr "rsync неуспешан са кодом грешке {}."
+
+#: src/modules/unpackfs/main.py:299
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:314
+msgid "Starting to unpack {}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:465
+msgid "Failed to unpack image \"{}\""
+msgstr "Неуспело распакивање одраза \"{}\""
+
+#: src/modules/unpackfs/main.py:430
+msgid "No mount point for root partition"
+msgstr "Нема тачке мотирања за root партицију"
+
+#: src/modules/unpackfs/main.py:431
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:436
+msgid "Bad mount point for root partition"
+msgstr "Лоша тачка монтирања за корену партицију"
+
+#: src/modules/unpackfs/main.py:437
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:453 src/modules/unpackfs/main.py:457
+#: src/modules/unpackfs/main.py:463 src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:454
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:458
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:464
+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/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr ""
diff --git a/lang/python/sr@latin/LC_MESSAGES/python.po b/lang/python/sr@latin/LC_MESSAGES/python.po
index 74c990217..41814da6a 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-22 11:02+0200\n"
+"POT-Creation-Date: 2021-11-02 15:45+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"
@@ -17,131 +17,72 @@ 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/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/networkcfg/main.py:105
+#: src/modules/initcpiocfg/main.py:227 src/modules/initcpiocfg/main.py:231
+#: src/modules/localecfg/main.py:135 src/modules/mount/main.py:144
+#: src/modules/rawfs/main.py:164 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356
+#: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145
+#: src/modules/rawfs/main.py:165 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/luksopenswaphookcfg/main.py:87
+msgid "No partitions are defined for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:90 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232
+#: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/luksopenswaphookcfg/main.py:91
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
 #: src/modules/grubcfg/main.py:28
 msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: 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
-#: src/modules/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"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: 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 ""
-
-#: 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
+#: 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/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/fstab/main.py:389
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
 msgstr ""
 
-#: 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}."
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 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"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
 #: src/modules/displaymanager/main.py:526
@@ -198,26 +139,6 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr ""
-
-#: 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 ""
-
-#: 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 ""
@@ -236,6 +157,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,8 +187,8 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
@@ -314,58 +240,24 @@ msgid ""
 "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:508
-msgid "Bootloader installation error"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/bootloader/main.py:509
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 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."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
 
 #: src/modules/dummypython/main.py:35
@@ -377,10 +269,121 @@ msgstr ""
 msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr ""
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+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:69
+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:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+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 ""
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:34
+msgid "Filling up filesystems."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:254
+msgid "rsync failed with error code {}."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:299
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:314
+msgid "Starting to unpack {}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:465
+msgid "Failed to unpack image \"{}\""
+msgstr ""
+
+#: src/modules/unpackfs/main.py:430
+msgid "No mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:431
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:436
+msgid "Bad mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:437
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:453 src/modules/unpackfs/main.py:457
+#: src/modules/unpackfs/main.py:463 src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:454
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:458
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:464
+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/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
diff --git a/lang/python/sv/LC_MESSAGES/python.po b/lang/python/sv/LC_MESSAGES/python.po
index 44631b146..e91510fb2 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-22 11:02+0200\n"
+"POT-Creation-Date: 2021-11-02 15:45+0100\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,78 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Konfigurerar initramfs."
+
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/networkcfg/main.py:105
+#: src/modules/initcpiocfg/main.py:227 src/modules/initcpiocfg/main.py:231
+#: src/modules/localecfg/main.py:135 src/modules/mount/main.py:144
+#: src/modules/rawfs/main.py:164 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90
+msgid "Configuration Error"
+msgstr "Konfigurationsfel"
+
+#: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356
+#: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145
+#: src/modules/rawfs/main.py:165 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/luksopenswaphookcfg/main.py:87
+msgid "No partitions are defined for 
{!s}
 to use."
+msgstr "Inga partitioner är definerade för 
{!s}
 att använda."
+
+#: src/modules/initramfscfg/main.py:90 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232
+#: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/luksopenswaphookcfg/main.py:91
+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/grubcfg/main.py:28
 msgid "Configure GRUB."
 msgstr "Konfigurera GRUB."
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Monterar partitioner."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Installera starthanterare."
 
-#: 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
-#: src/modules/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/bootloader/main.py:508
+msgid "Bootloader installation error"
+msgstr "Starthanterare installationsfel"
 
-#: 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 "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
+#: 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 ""
-"Anrop till systemctl {arg!s}i chroot returnerade felkod "
-"{num!s}."
+"Starthanterare kunde inte installeras. Installationskommandot "
+"
{!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/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Skriver fstab."
 
-#: 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}."
+#: 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}."
+"Ingen 
{!s}
 konfiguration är angiven för 
{!s}
 att "
+"använda. "
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Avmontera filsystem."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Skapar initramfs med dracut."
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Packar upp filsystem."
+#: 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: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/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "Felkoden var {}"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -212,27 +152,6 @@ 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/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 ""
-"Ingen root monteringspunkt är angiven för 
{!s}
 att använda."
-
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
-msgstr "Konfigurerar krypterad swap."
-
-#: 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"
@@ -253,6 +172,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,9 +207,9 @@ 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/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Sparar nätverkskonfiguration."
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
 #: src/modules/packages/main.py:69
@@ -340,63 +264,25 @@ msgstr ""
 "Pakethanteraren kunde inte göra ändringar till det installerade systemet. "
 "kommandot 
{!s}
 returnerade felkod {!s}."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Installera starthanterare."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Konfigurera Plymouth tema"
 
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
-msgstr "Starthanterare installationsfel"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Konfigurerar mkinitcpio."
 
-#: src/modules/bootloader/main.py:509
-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/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Konfigurerar språkinställningar"
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Ställer hårdvaruklockan."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Monterar partitioner."
 
-#: 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/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Felkoden var {}"
-
-#: 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/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Konfigurerar initramfs."
-
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Konfigurerar OpenRC dmcrypt tjänst."
-
-#: 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 ""
-"Ingen 
{!s}
 konfiguration är angiven för 
{!s}
 att "
-"använda. "
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Installerar data."
 
 #: src/modules/dummypython/main.py:35
 msgid "Dummy python job."
@@ -407,10 +293,125 @@ msgstr "Exempel python jobb"
 msgid "Dummy python step {}"
 msgstr "Exempel python steg {}"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Konfigurerar språkinställningar"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Ställer hårdvaruklockan."
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Sparar nätverkskonfiguration."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Avmontera filsystem."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Konfigurerar OpenRC dmcrypt tjänst."
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Konfigurera systemd tjänster"
+
+#: 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:69
+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:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Kunde inte inaktivera systemd målsystem {name!s}."
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Kan inte maskera systemd unit {name!s}"
+
+#: src/modules/services-systemd/main.py:75
+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/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:34
+msgid "Filling up filesystems."
+msgstr "Packar upp filsystem."
+
+#: src/modules/unpackfs/main.py:254
+msgid "rsync failed with error code {}."
+msgstr "rsync misslyckades med felkod {}."
+
+#: src/modules/unpackfs/main.py:299
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Packar upp avbild {}/{}, fil {}/{}"
+
+#: src/modules/unpackfs/main.py:314
+msgid "Starting to unpack {}"
+msgstr "Börjar att packa upp {}"
+
+#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:465
+msgid "Failed to unpack image \"{}\""
+msgstr "Misslyckades att packa upp avbild \"{}\""
+
+#: src/modules/unpackfs/main.py:430
+msgid "No mount point for root partition"
+msgstr "Ingen monteringspunkt för root partition"
+
+#: src/modules/unpackfs/main.py:431
+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:436
+msgid "Bad mount point for root partition"
+msgstr "Dålig monteringspunkt för root partition"
+
+#: src/modules/unpackfs/main.py:437
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint är \"{}\", vilket inte finns, så gör inget"
+
+#: src/modules/unpackfs/main.py:453 src/modules/unpackfs/main.py:457
+#: src/modules/unpackfs/main.py:463 src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Dålig unsquash konfiguration"
+
+#: src/modules/unpackfs/main.py:454
+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:458
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Källfilsystemet \"{}\" existerar inte"
+
+#: src/modules/unpackfs/main.py:464
+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 "Destinationen \"{}\" på målsystemet är inte en katalog"
+
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr "Konfigurerar krypterad swap."
diff --git a/lang/python/te/LC_MESSAGES/python.po b/lang/python/te/LC_MESSAGES/python.po
index 59b5a7968..1cf635faf 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-22 11:02+0200\n"
+"POT-Creation-Date: 2021-11-02 15:45+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"
@@ -17,131 +17,72 @@ msgstr ""
 "Language: te\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/networkcfg/main.py:105
+#: src/modules/initcpiocfg/main.py:227 src/modules/initcpiocfg/main.py:231
+#: src/modules/localecfg/main.py:135 src/modules/mount/main.py:144
+#: src/modules/rawfs/main.py:164 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356
+#: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145
+#: src/modules/rawfs/main.py:165 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/luksopenswaphookcfg/main.py:87
+msgid "No partitions are defined for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:90 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232
+#: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/luksopenswaphookcfg/main.py:91
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
 #: src/modules/grubcfg/main.py:28
 msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: 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
-#: src/modules/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"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: 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 ""
-
-#: 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
+#: 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/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/fstab/main.py:389
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
 msgstr ""
 
-#: 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}."
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 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"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
 #: src/modules/displaymanager/main.py:526
@@ -198,26 +139,6 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr ""
-
-#: 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 ""
-
-#: 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 ""
@@ -236,6 +157,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,8 +187,8 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
@@ -312,58 +238,24 @@ msgid ""
 "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:508
-msgid "Bootloader installation error"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/bootloader/main.py:509
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 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."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
 
 #: src/modules/dummypython/main.py:35
@@ -375,10 +267,121 @@ msgstr ""
 msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr ""
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+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:69
+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:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+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 ""
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:34
+msgid "Filling up filesystems."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:254
+msgid "rsync failed with error code {}."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:299
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:314
+msgid "Starting to unpack {}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:465
+msgid "Failed to unpack image \"{}\""
+msgstr ""
+
+#: src/modules/unpackfs/main.py:430
+msgid "No mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:431
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:436
+msgid "Bad mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:437
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:453 src/modules/unpackfs/main.py:457
+#: src/modules/unpackfs/main.py:463 src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:454
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:458
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:464
+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/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
diff --git a/lang/python/te_IN/LC_MESSAGES/python.po b/lang/python/te_IN/LC_MESSAGES/python.po
index d4b2a6249..ba3eb4f5f 100644
--- a/lang/python/te_IN/LC_MESSAGES/python.po
+++ b/lang/python/te_IN/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-22 11:02+0200\n"
+"POT-Creation-Date: 2021-11-02 15:45+0100\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Telugu (India) (https://www.transifex.com/calamares/teams/20061/te_IN/)\n"
 "MIME-Version: 1.0\n"
@@ -17,131 +17,72 @@ msgstr ""
 "Language: te_IN\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/networkcfg/main.py:105
+#: src/modules/initcpiocfg/main.py:227 src/modules/initcpiocfg/main.py:231
+#: src/modules/localecfg/main.py:135 src/modules/mount/main.py:144
+#: src/modules/rawfs/main.py:164 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356
+#: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145
+#: src/modules/rawfs/main.py:165 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/luksopenswaphookcfg/main.py:87
+msgid "No partitions are defined for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:90 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232
+#: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/luksopenswaphookcfg/main.py:91
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
 #: src/modules/grubcfg/main.py:28
 msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: 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
-#: src/modules/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"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: 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 ""
-
-#: 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
+#: 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/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/fstab/main.py:389
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
 msgstr ""
 
-#: 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}."
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 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"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
 #: src/modules/displaymanager/main.py:526
@@ -198,26 +139,6 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr ""
-
-#: 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 ""
-
-#: 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 ""
@@ -236,6 +157,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,8 +187,8 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
@@ -312,58 +238,24 @@ msgid ""
 "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:508
-msgid "Bootloader installation error"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/bootloader/main.py:509
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 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."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
 
 #: src/modules/dummypython/main.py:35
@@ -375,10 +267,121 @@ msgstr ""
 msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr ""
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+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:69
+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:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+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 ""
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:34
+msgid "Filling up filesystems."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:254
+msgid "rsync failed with error code {}."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:299
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:314
+msgid "Starting to unpack {}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:465
+msgid "Failed to unpack image \"{}\""
+msgstr ""
+
+#: src/modules/unpackfs/main.py:430
+msgid "No mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:431
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:436
+msgid "Bad mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:437
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:453 src/modules/unpackfs/main.py:457
+#: src/modules/unpackfs/main.py:463 src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:454
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:458
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:464
+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/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
diff --git a/lang/python/tg/LC_MESSAGES/python.po b/lang/python/tg/LC_MESSAGES/python.po
index 291410c1c..135c568db 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-22 11:02+0200\n"
+"POT-Creation-Date: 2021-11-02 15:45+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"
@@ -21,140 +21,73 @@ msgstr ""
 "Language: tg\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Танзимкунии initramfs."
+
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/networkcfg/main.py:105
+#: src/modules/initcpiocfg/main.py:227 src/modules/initcpiocfg/main.py:231
+#: src/modules/localecfg/main.py:135 src/modules/mount/main.py:144
+#: src/modules/rawfs/main.py:164 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90
+msgid "Configuration Error"
+msgstr "Хатои танзимкунӣ"
+
+#: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356
+#: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145
+#: src/modules/rawfs/main.py:165 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/luksopenswaphookcfg/main.py:87
+msgid "No partitions are defined for 
{!s}
 to use."
+msgstr "Ягон қисми диск барои истифодаи 
{!s}
 муайян карда нашуд."
+
+#: src/modules/initramfscfg/main.py:90 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232
+#: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/luksopenswaphookcfg/main.py:91
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr "Нуқтаи васли реша (root) барои истифодаи 
{!s}
 дода нашуд."
+
 #: src/modules/grubcfg/main.py:28
 msgid "Configure GRUB."
 msgstr "Танзимоти GRUB."
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Васлкунии қисмҳои диск."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Насбкунии боркунандаи роҳандозӣ."
 
-#: 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
-#: src/modules/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/bootloader/main.py:508
+msgid "Bootloader installation error"
+msgstr ""
 
-#: 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 "Ягон қисми диск барои истифодаи 
{!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
+#: 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 рамзи хатои {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/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Сабткунии fstab."
 
-#: 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}."
+#: 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/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Эҷодкунии initramfs бо dracut."
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Пурборкунӣ бо низомҳои файлӣ."
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "dracut дар низоми интихобшуда иҷро нашуд"
 
-#: 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/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "Рамзи барориш: {}"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -212,26 +145,6 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "Раванди танзимкунии мудири намоиш ба анҷом нарасид"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Танзимкунии mkinitcpio."
-
-#: 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 "Нуқтаи васли реша (root) барои истифодаи 
{!s}
 дода нашуд."
-
-#: 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 "Танзимоти хидматҳои OpenRC"
@@ -252,6 +165,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,9 +201,9 @@ msgstr ""
 "Масир барои хидмати {name!s} аз {path!s} иборат аст, аммо он "
 "вуҷуд надорад."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Танзимоти мавзӯи Plymouth"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Нигоҳдории танзимоти шабака."
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
 #: src/modules/packages/main.py:69
@@ -334,59 +252,25 @@ msgid ""
 "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:508
-msgid "Bootloader installation error"
-msgstr ""
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Танзимкунии mkinitcpio."
 
-#: src/modules/bootloader/main.py:509
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Танзимкунии маҳаллигардониҳо."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Танзимкунии соати сахтафзор."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+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/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 "Эҷодкунии initramfs бо dracut."
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "dracut дар низоми интихобшуда иҷро нашуд"
-
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Танзимкунии initramfs."
-
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Танзимкунии хидмати OpenRC dmcrypt."
-
-#: 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 ""
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Насбкунии иттилоот."
 
 #: src/modules/dummypython/main.py:35
 msgid "Dummy python job."
@@ -397,10 +281,127 @@ msgstr "Вазифаи амсилаи python."
 msgid "Dummy python step {}"
 msgstr "Қадами амсилаи python {}"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Танзимкунии маҳаллигардониҳо."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Танзимкунии соати сахтафзор."
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Нигоҳдории танзимоти шабака."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Ҷудо кардани низомҳои файлӣ."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Танзимкунии хидмати OpenRC dmcrypt."
+
+#: 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:69
+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:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Интихоби systemd-и {name!s} ғайрифаъол карда намешавад."
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Воҳиди systemd-и {name!s} пинҳон карда намешавад."
+
+#: src/modules/services-systemd/main.py:75
+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/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "mkinitfs дар низоми интихобшуда иҷро нашуд"
+
+#: src/modules/unpackfs/main.py:34
+msgid "Filling up filesystems."
+msgstr "Пурборкунӣ бо низомҳои файлӣ."
+
+#: src/modules/unpackfs/main.py:254
+msgid "rsync failed with error code {}."
+msgstr "rsync бо рамзи хатои {} қатъ шуд."
+
+#: src/modules/unpackfs/main.py:299
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Баровардани тимсол: {}/{}, файл: {}/{}"
+
+#: src/modules/unpackfs/main.py:314
+msgid "Starting to unpack {}"
+msgstr "Оғози барориши {}"
+
+#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:465
+msgid "Failed to unpack image \"{}\""
+msgstr "Тимсоли \"{}\" бароварда нашуд"
+
+#: src/modules/unpackfs/main.py:430
+msgid "No mount point for root partition"
+msgstr "Ягон нуқтаи васл барои қисми диски реша (root) нест"
+
+#: src/modules/unpackfs/main.py:431
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+"globalstorage калиди \"rootMountPoint\"-ро дар бар намегирад, ҳeҷ кop "
+"намeкyнад"
+
+#: src/modules/unpackfs/main.py:436
+msgid "Bad mount point for root partition"
+msgstr "Нуқтаи васли нодуруст барои қисми диски реша (root)"
+
+#: src/modules/unpackfs/main.py:437
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint аз \"{}\" иборат аст, ки вуҷуд надорад, ҳeҷ кop намeкyнад"
+
+#: src/modules/unpackfs/main.py:453 src/modules/unpackfs/main.py:457
+#: src/modules/unpackfs/main.py:463 src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Танзимоти unsquash нодуруст аст"
+
+#: src/modules/unpackfs/main.py:454
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "Низоми файлӣ барои \"{}\" ({}) бо ҳастаи ҷории шумо дастгирӣ намешавад"
+
+#: src/modules/unpackfs/main.py:458
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Низоми файлии манбаи \"{}\" вуҷуд надорад"
+
+#: src/modules/unpackfs/main.py:464
+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/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr "Танзимкунии мубодилаи рамзгузоришуда."
diff --git a/lang/python/th/LC_MESSAGES/python.po b/lang/python/th/LC_MESSAGES/python.po
index c2ea492d9..67c5a69a6 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-22 11:02+0200\n"
+"POT-Creation-Date: 2021-11-02 15:45+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"
@@ -17,131 +17,72 @@ msgstr ""
 "Language: th\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/networkcfg/main.py:105
+#: src/modules/initcpiocfg/main.py:227 src/modules/initcpiocfg/main.py:231
+#: src/modules/localecfg/main.py:135 src/modules/mount/main.py:144
+#: src/modules/rawfs/main.py:164 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356
+#: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145
+#: src/modules/rawfs/main.py:165 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/luksopenswaphookcfg/main.py:87
+msgid "No partitions are defined for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:90 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232
+#: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/luksopenswaphookcfg/main.py:91
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
 #: src/modules/grubcfg/main.py:28
 msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: 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
-#: src/modules/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"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: 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 ""
-
-#: 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
+#: 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/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/fstab/main.py:389
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
 msgstr ""
 
-#: 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}."
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 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"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
 #: src/modules/displaymanager/main.py:526
@@ -198,26 +139,6 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr ""
-
-#: 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 ""
-
-#: 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 ""
@@ -236,6 +157,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,8 +187,8 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
@@ -310,58 +236,24 @@ msgid ""
 "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:508
-msgid "Bootloader installation error"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/bootloader/main.py:509
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 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."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
 
 #: src/modules/dummypython/main.py:35
@@ -373,10 +265,121 @@ msgstr ""
 msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr ""
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+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:69
+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:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+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 ""
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:34
+msgid "Filling up filesystems."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:254
+msgid "rsync failed with error code {}."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:299
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:314
+msgid "Starting to unpack {}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:465
+msgid "Failed to unpack image \"{}\""
+msgstr ""
+
+#: src/modules/unpackfs/main.py:430
+msgid "No mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:431
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:436
+msgid "Bad mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:437
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:453 src/modules/unpackfs/main.py:457
+#: src/modules/unpackfs/main.py:463 src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:454
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:458
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:464
+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/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
diff --git a/lang/python/tr_TR/LC_MESSAGES/python.po b/lang/python/tr_TR/LC_MESSAGES/python.po
index 0c57b9801..90d0345e6 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-22 11:02+0200\n"
+"POT-Creation-Date: 2021-11-02 15:45+0100\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Demiray Muhterem , 2021\n"
 "Language-Team: Turkish (Turkey) (https://www.transifex.com/calamares/teams/20061/tr_TR/)\n"
@@ -22,138 +22,77 @@ msgstr ""
 "Language: tr_TR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Initramfs yapılandırılıyor."
+
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/networkcfg/main.py:105
+#: src/modules/initcpiocfg/main.py:227 src/modules/initcpiocfg/main.py:231
+#: src/modules/localecfg/main.py:135 src/modules/mount/main.py:144
+#: src/modules/rawfs/main.py:164 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90
+msgid "Configuration Error"
+msgstr "Yapılandırma Hatası"
+
+#: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356
+#: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145
+#: src/modules/rawfs/main.py:165 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/luksopenswaphookcfg/main.py:87
+msgid "No partitions are defined for 
{!s}
 to use."
+msgstr "
{!s}
 kullanması için hiçbir bölüm tanımlanmadı."
+
+#: src/modules/initramfscfg/main.py:90 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232
+#: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/luksopenswaphookcfg/main.py:91
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr "
{!s}
 kullanması için kök bağlama noktası verilmedi."
+
 #: 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/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Önyükleyici kuruluyor"
 
-#: 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
-#: src/modules/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/bootloader/main.py:508
+msgid "Bootloader installation error"
+msgstr "Önyükleyici yükleme hatası"
 
-#: 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 "
{!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
+#: 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ısında hata kodu döndürüldü "
-"{num!s}."
+"Önyükleyici yüklenemedi. Kurulum komutu 
{!s}
, {!s} hata kodunu "
+"döndürdü."
 
-#: 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/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Fstab dosyasına yazılıyor."
 
-#: 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}."
+#: src/modules/fstab/main.py:389
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
 msgstr ""
-"Bilinmeyen sistem komutları {command!s} ve "
-"{suffix!s}  {name!s} birimi için."
+"
{!s}
'nin kullanması için 
{!s}
 yapılandırması "
+"verilmemiştir."
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Dosya sistemlerini ayırın."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Dracut ile initramfs oluşturuluyor."
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Dosya sistemlerini dolduruyorum."
+#: 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: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/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "Çıkış kodu {} idi"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -211,26 +150,6 @@ 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/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 "
{!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/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Veri yükleniyor."
-
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
 msgstr " OpenRC servislerini yapılandır"
@@ -251,6 +170,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,9 +202,9 @@ 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/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Ağ yapılandırması kaydediliyor."
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
 #: src/modules/packages/main.py:69
@@ -335,63 +259,25 @@ msgstr ""
 "Paket yöneticisi kurulu sistemde değişiklik yapamadı. 
{!s}
 komutu"
 " {!s} hata kodunu döndürdü."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Önyükleyici kuruluyor"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Plymouth temasını yapılandır"
 
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
-msgstr "Önyükleyici yükleme hatası"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Mkinitcpio yapılandırılıyor."
 
-#: src/modules/bootloader/main.py:509
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-"Önyükleyici yüklenemedi. Kurulum komutu 
{!s}
, {!s} hata kodunu "
-"döndürdü."
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Sistem yerelleri yapılandırılıyor."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Donanım saati ayarlanıyor."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Disk bölümlemeleri bağlanı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/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Çıkış kodu {} idi"
-
-#: 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/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Initramfs yapılandırılıyor."
-
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "OpenRC dmcrypt hizmeti yapılandırılıyor."
-
-#: 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 ""
-"
{!s}
'nin kullanması için 
{!s}
 yapılandırması "
-"verilmemiştir."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Veri yükleniyor."
 
 #: src/modules/dummypython/main.py:35
 msgid "Dummy python job."
@@ -402,10 +288,126 @@ msgstr "Dummy python job."
 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/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Donanım saati ayarlanıyor."
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Ağ yapılandırması kaydediliyor."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Dosya sistemlerini ayırın."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "OpenRC dmcrypt hizmeti yapılandırılıyor."
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Systemd hizmetlerini 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/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+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:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Systemd hedefi devre dışı bırakılamıyor {name!s}."
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Systemd birimi maskeleyemiyor {name!s}."
+
+#: src/modules/services-systemd/main.py:75
+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/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Hedefte mkinitfs çalıştırılamadı"
+
+#: src/modules/unpackfs/main.py:34
+msgid "Filling up filesystems."
+msgstr "Dosya sistemlerini dolduruyorum."
+
+#: src/modules/unpackfs/main.py:254
+msgid "rsync failed with error code {}."
+msgstr "rsync {} hata koduyla başarısız oldu."
+
+#: src/modules/unpackfs/main.py:299
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Açılan kurulum medyası {}/{}, dışa aktarılan dosya sayısı {}/{}"
+
+#: src/modules/unpackfs/main.py:314
+msgid "Starting to unpack {}"
+msgstr "Dışa aktarım başlatılıyor {}"
+
+#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:465
+msgid "Failed to unpack image \"{}\""
+msgstr "\"{}\" kurulum medyası aktarılamadı"
+
+#: src/modules/unpackfs/main.py:430
+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:431
+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:436
+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:437
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint \"{}\", mevcut değil, hiçbirşey yapılmadı"
+
+#: src/modules/unpackfs/main.py:453 src/modules/unpackfs/main.py:457
+#: src/modules/unpackfs/main.py:463 src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Unsquash yapılandırma sorunlu"
+
+#: src/modules/unpackfs/main.py:454
+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:458
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "\"{}\" Kaynak dosya sistemi mevcut değil"
+
+#: src/modules/unpackfs/main.py:464
+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 "Hedef sistemdeki \"{}\" hedefi bir dizin değil"
+
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr "Şifreli takas alanı yapılandırılıyor."
diff --git a/lang/python/uk/LC_MESSAGES/python.po b/lang/python/uk/LC_MESSAGES/python.po
index cd0737d05..4dc3a5e7e 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-22 11:02+0200\n"
+"POT-Creation-Date: 2021-11-02 15:45+0100\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,77 @@ 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/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Налаштовуємо initramfs."
+
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/networkcfg/main.py:105
+#: src/modules/initcpiocfg/main.py:227 src/modules/initcpiocfg/main.py:231
+#: src/modules/localecfg/main.py:135 src/modules/mount/main.py:144
+#: src/modules/rawfs/main.py:164 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90
+msgid "Configuration Error"
+msgstr "Помилка налаштовування"
+
+#: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356
+#: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145
+#: src/modules/rawfs/main.py:165 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/luksopenswaphookcfg/main.py:87
+msgid "No partitions are defined for 
{!s}
 to use."
+msgstr "Не визначено розділів для використання 
{!s}
."
+
+#: src/modules/initramfscfg/main.py:90 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232
+#: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/luksopenswaphookcfg/main.py:91
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+"Не вказано кореневої точки монтування для використання у 
{!s}
."
+
 #: src/modules/grubcfg/main.py:28
 msgid "Configure GRUB."
 msgstr "Налаштовування GRUB."
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Монтування розділів."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Встановити завантажувач."
 
-#: 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
-#: src/modules/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/bootloader/main.py:508
+msgid "Bootloader installation error"
+msgstr "Помилка встановлення завантажувача"
 
-#: 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 "Не визначено розділів для використання 
{!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
+#: 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 було повернуто "
-"повідомлення з кодом помилки {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 "Не вдалося ввімкнути службу systemd {name!s}."
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Записуємо fstab."
 
-#: 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}."
+#: src/modules/fstab/main.py:389
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
 msgstr ""
-"Невідомі команди systemd {command!s} та {suffix!s}"
-" для пристрою {name!s}."
+"Не надано налаштувань 
{!s}
 для використання у 
{!s}
."
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Демонтувати файлові системи."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Створюємо initramfs за допомогою dracut."
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Заповнення файлових систем."
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Не вдалося виконати dracut над призначенням"
 
-#: 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/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "Код виходу — {}"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -217,27 +151,6 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "Налаштування засобу керування дисплеєм є неповними"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Налаштовуємо mkinitcpio."
-
-#: 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 ""
-"Не вказано кореневої точки монтування для використання у 
{!s}
."
-
-#: 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 "Налаштувати служби OpenRC"
@@ -258,6 +171,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,9 +207,9 @@ msgstr ""
 "Шляхом до служби {name!s} вказано {path!s}. Такого шляху не "
 "існує."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Налаштувати тему Plymouth"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Зберігаємо налаштування мережі."
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
 #: src/modules/packages/main.py:69
@@ -350,62 +268,25 @@ 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:508
-msgid "Bootloader installation error"
-msgstr "Помилка встановлення завантажувача"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Налаштовуємо mkinitcpio."
 
-#: 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/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Налаштовуємо локалі."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Встановлюємо значення для апаратного годинника."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+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/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 "Створюємо initramfs за допомогою dracut."
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Не вдалося виконати dracut над призначенням"
-
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Налаштовуємо initramfs."
-
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Налаштовуємо службу dmcrypt OpenRC."
-
-#: 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 ""
-"Не надано налаштувань 
{!s}
 для використання у 
{!s}
."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Встановлюємо дані."
 
 #: src/modules/dummypython/main.py:35
 msgid "Dummy python job."
@@ -416,10 +297,132 @@ msgstr "Фіктивне завдання python."
 msgid "Dummy python step {}"
 msgstr "Фіктивний крок python {}"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Налаштовуємо локалі."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Встановлюємо значення для апаратного годинника."
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Зберігаємо налаштування мережі."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Демонтувати файлові системи."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Налаштовуємо службу dmcrypt OpenRC."
+
+#: 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:69
+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:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr "Не вдалося ввімкнути таймер systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Не вдалося вимкнути завдання systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Не вдалося замаскувати вузол systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:75
+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/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Не вдалося виконати mkinitfs над призначенням"
+
+#: src/modules/unpackfs/main.py:34
+msgid "Filling up filesystems."
+msgstr "Заповнення файлових систем."
+
+#: src/modules/unpackfs/main.py:254
+msgid "rsync failed with error code {}."
+msgstr "Спроба виконати rsync зазнала невдачі з кодом помилки {}."
+
+#: src/modules/unpackfs/main.py:299
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Розпаковуємо образ {} з {}, файл {} з {}"
+
+#: src/modules/unpackfs/main.py:314
+msgid "Starting to unpack {}"
+msgstr "Починаємо розпаковувати {}"
+
+#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:465
+msgid "Failed to unpack image \"{}\""
+msgstr "Не вдалося розпакувати образ «{}»"
+
+#: src/modules/unpackfs/main.py:430
+msgid "No mount point for root partition"
+msgstr "Немає точки монтування для кореневого розділу"
+
+#: src/modules/unpackfs/main.py:431
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+"У globalstorage не міститься ключа «rootMountPoint». Не виконуватимемо "
+"ніяких дій."
+
+#: src/modules/unpackfs/main.py:436
+msgid "Bad mount point for root partition"
+msgstr "Помилкова точна монтування для кореневого розділу"
+
+#: src/modules/unpackfs/main.py:437
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+"Для rootMountPoint вказано значення «{}». Такого шляху не існує. Не "
+"виконуватимемо ніяких дій."
+
+#: src/modules/unpackfs/main.py:453 src/modules/unpackfs/main.py:457
+#: src/modules/unpackfs/main.py:463 src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Помилкові налаштування unsquash"
+
+#: src/modules/unpackfs/main.py:454
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+"У поточному ядрі системи не передбачено підтримки файлової системи «{}» ({})"
+
+#: src/modules/unpackfs/main.py:458
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Вихідної файлової системи «{}» не існує"
+
+#: src/modules/unpackfs/main.py:464
+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/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr "Налаштовуємо зашифрований розділ резервної пам'яті."
diff --git a/lang/python/ur/LC_MESSAGES/python.po b/lang/python/ur/LC_MESSAGES/python.po
index 216e83227..d8cd90263 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-22 11:02+0200\n"
+"POT-Creation-Date: 2021-11-02 15:45+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"
@@ -17,131 +17,72 @@ msgstr ""
 "Language: ur\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/networkcfg/main.py:105
+#: src/modules/initcpiocfg/main.py:227 src/modules/initcpiocfg/main.py:231
+#: src/modules/localecfg/main.py:135 src/modules/mount/main.py:144
+#: src/modules/rawfs/main.py:164 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356
+#: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145
+#: src/modules/rawfs/main.py:165 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/luksopenswaphookcfg/main.py:87
+msgid "No partitions are defined for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:90 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232
+#: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/luksopenswaphookcfg/main.py:91
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
 #: src/modules/grubcfg/main.py:28
 msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: 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
-#: src/modules/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"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: 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 ""
-
-#: 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
+#: 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/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/fstab/main.py:389
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
 msgstr ""
 
-#: 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}."
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 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"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
 #: src/modules/displaymanager/main.py:526
@@ -198,26 +139,6 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr ""
-
-#: 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 ""
-
-#: 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 ""
@@ -236,6 +157,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,8 +187,8 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
@@ -312,58 +238,24 @@ msgid ""
 "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:508
-msgid "Bootloader installation error"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/bootloader/main.py:509
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 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."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
 
 #: src/modules/dummypython/main.py:35
@@ -375,10 +267,121 @@ msgstr ""
 msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr ""
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+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:69
+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:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+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 ""
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:34
+msgid "Filling up filesystems."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:254
+msgid "rsync failed with error code {}."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:299
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:314
+msgid "Starting to unpack {}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:465
+msgid "Failed to unpack image \"{}\""
+msgstr ""
+
+#: src/modules/unpackfs/main.py:430
+msgid "No mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:431
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:436
+msgid "Bad mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:437
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:453 src/modules/unpackfs/main.py:457
+#: src/modules/unpackfs/main.py:463 src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:454
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:458
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:464
+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/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
diff --git a/lang/python/vi/LC_MESSAGES/python.po b/lang/python/vi/LC_MESSAGES/python.po
index 3ff228613..83928edd6 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-22 11:02+0200\n"
+"POT-Creation-Date: 2021-11-02 15:45+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"
@@ -21,135 +21,73 @@ msgstr ""
 "Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Đang cấu hình initramfs."
+
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/networkcfg/main.py:105
+#: src/modules/initcpiocfg/main.py:227 src/modules/initcpiocfg/main.py:231
+#: src/modules/localecfg/main.py:135 src/modules/mount/main.py:144
+#: src/modules/rawfs/main.py:164 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90
+msgid "Configuration Error"
+msgstr "Lỗi cấu hình"
+
+#: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356
+#: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145
+#: src/modules/rawfs/main.py:165 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/luksopenswaphookcfg/main.py:87
+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/initramfscfg/main.py:90 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232
+#: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/luksopenswaphookcfg/main.py:91
+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/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/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Đang cài đặt bộ khởi động."
 
-#: 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
-#: src/modules/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: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 "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}."
+#: 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/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Đang viết vào fstab."
 
-#: 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/fstab/main.py:389
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
 
-#: 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/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/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "Mã lỗi trả về là {}"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -208,26 +146,6 @@ 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/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 "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/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Đang cài đặt dữ liệu."
-
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
 msgstr "Cấu hình dịch vụ OpenRC"
@@ -248,6 +166,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,9 +202,9 @@ 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/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Đang lưu cấu hình mạng."
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
 #: src/modules/packages/main.py:69
@@ -328,59 +251,25 @@ msgid ""
 "command 
{!s}
 returned error code {!s}."
 msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Đang cài đặt bộ khởi động."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Cấu hình giao diện Plymouth"
 
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
-msgstr ""
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Đang cấu hình mkinitcpio."
 
-#: src/modules/bootloader/main.py:509
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Đang cấu hình ngôn ngữ."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Đang thiết lập đồng hồ máy tính."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Đang gắn kết các phân vùng."
 
-#: 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/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Mã lỗi trả về là {}"
-
-#: 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/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Đang cấu hình initramfs."
-
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Đang cấu hình dịch vụ OpenRC dmcrypt."
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Đang viết vào fstab."
-
-#: 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 "Đang cài đặt dữ liệu."
 
 #: src/modules/dummypython/main.py:35
 msgid "Dummy python job."
@@ -391,10 +280,124 @@ msgstr "Ví dụ công việc python."
 msgid "Dummy python step {}"
 msgstr "Ví dụ python bước {}"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Đang cấu hình ngôn ngữ."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Đang thiết lập đồng hồ máy tính."
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Đang lưu cấu hình mạng."
+#: 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/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Đang cấu hình dịch vụ OpenRC dmcrypt."
+
+#: 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: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/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+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:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+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:73
+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:75
+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/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:34
+msgid "Filling up filesystems."
+msgstr "Đang làm đầy các hệ thống tập tin."
+
+#: src/modules/unpackfs/main.py:254
+msgid "rsync failed with error code {}."
+msgstr "rsync thất bại với lỗi {}."
+
+#: src/modules/unpackfs/main.py:299
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Đang bung hình ảnh {}/{}, tập tin {}/{}"
+
+#: src/modules/unpackfs/main.py:314
+msgid "Starting to unpack {}"
+msgstr "Bắt đầu bung nội dung {}"
+
+#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:465
+msgid "Failed to unpack image \"{}\""
+msgstr "Bung hình ảnh thất bại \"{}\""
+
+#: src/modules/unpackfs/main.py:430
+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:431
+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:436
+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:437
+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:453 src/modules/unpackfs/main.py:457
+#: src/modules/unpackfs/main.py:463 src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Sai cấu hình bung nén"
+
+#: src/modules/unpackfs/main.py:454
+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:458
+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:464
+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 "Hệ thống đích \"{}\" không phải là một thư mục"
+
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr "Đang cấu hình hoán đổi mã hoá"
diff --git a/lang/python/zh/LC_MESSAGES/python.po b/lang/python/zh/LC_MESSAGES/python.po
index 4f577d612..336a946b3 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-22 11:02+0200\n"
+"POT-Creation-Date: 2021-11-02 15:45+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"
@@ -17,131 +17,72 @@ msgstr ""
 "Language: zh\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/networkcfg/main.py:105
+#: src/modules/initcpiocfg/main.py:227 src/modules/initcpiocfg/main.py:231
+#: src/modules/localecfg/main.py:135 src/modules/mount/main.py:144
+#: src/modules/rawfs/main.py:164 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356
+#: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145
+#: src/modules/rawfs/main.py:165 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/luksopenswaphookcfg/main.py:87
+msgid "No partitions are defined for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:90 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232
+#: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/luksopenswaphookcfg/main.py:91
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
 #: src/modules/grubcfg/main.py:28
 msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: 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
-#: src/modules/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"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: 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 ""
-
-#: 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
+#: 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/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/fstab/main.py:389
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
 msgstr ""
 
-#: 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}."
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 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"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
 #: src/modules/displaymanager/main.py:526
@@ -198,26 +139,6 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr ""
-
-#: 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 ""
-
-#: 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 ""
@@ -236,6 +157,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,8 +187,8 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
@@ -310,58 +236,24 @@ msgid ""
 "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:508
-msgid "Bootloader installation error"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/bootloader/main.py:509
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 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."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
 
 #: src/modules/dummypython/main.py:35
@@ -373,10 +265,121 @@ msgstr ""
 msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr ""
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+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:69
+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:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+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 ""
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:34
+msgid "Filling up filesystems."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:254
+msgid "rsync failed with error code {}."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:299
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:314
+msgid "Starting to unpack {}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:465
+msgid "Failed to unpack image \"{}\""
+msgstr ""
+
+#: src/modules/unpackfs/main.py:430
+msgid "No mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:431
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:436
+msgid "Bad mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:437
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:453 src/modules/unpackfs/main.py:457
+#: src/modules/unpackfs/main.py:463 src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:454
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:458
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:464
+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/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
diff --git a/lang/python/zh_CN/LC_MESSAGES/python.po b/lang/python/zh_CN/LC_MESSAGES/python.po
index 7bef5b81b..706b02d24 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-22 11:02+0200\n"
+"POT-Creation-Date: 2021-11-02 15:45+0100\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,73 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "正在配置初始内存文件系统。"
+
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/networkcfg/main.py:105
+#: src/modules/initcpiocfg/main.py:227 src/modules/initcpiocfg/main.py:231
+#: src/modules/localecfg/main.py:135 src/modules/mount/main.py:144
+#: src/modules/rawfs/main.py:164 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90
+msgid "Configuration Error"
+msgstr "配置错误"
+
+#: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356
+#: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145
+#: src/modules/rawfs/main.py:165 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/luksopenswaphookcfg/main.py:87
+msgid "No partitions are defined for 
{!s}
 to use."
+msgstr "没有分配分区给 
{!s}
。"
+
+#: src/modules/initramfscfg/main.py:90 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232
+#: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/luksopenswaphookcfg/main.py:91
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr " 未设置 
{!s}
 要使用的根挂载点。"
+
 #: src/modules/grubcfg/main.py:28
 msgid "Configure GRUB."
 msgstr "配置 GRUB."
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "挂载分区。"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "安装启动加载器。"
 
-#: 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
-#: src/modules/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/bootloader/main.py:508
+msgid "Bootloader installation error"
+msgstr "启动加载器安装出错"
 
-#: 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 "没有分配分区给 
{!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
+#: src/modules/bootloader/main.py:509
 msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr "chroot 中的 systemctl {arg!s} 命令返回错误 {num!s}."
+"The bootloader could not be installed. The installation 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/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "正在写入 fstab。"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {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:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "无法禁用 systemd 目标 {name!s}."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "用 dracut 创建 initramfs."
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {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: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/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "退出码是 {}"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -208,26 +147,6 @@ msgstr "globalstorage 和 displaymanager.conf 配置文件中都没有配置显
 msgid "Display manager configuration was incomplete"
 msgstr "显示管理器配置不完全"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "配置 mkinitcpio."
-
-#: 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 " 未设置 
{!s}
 要使用的根挂载点。"
-
-#: 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 "配置 OpenRC 服务。"
@@ -246,6 +165,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,9 +195,9 @@ msgid ""
 "exist."
 msgstr "服务 {name!s} 的路径 {path!s} 不存在。"
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "配置 Plymouth 主题"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "正在保存网络配置。"
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
 #: src/modules/packages/main.py:69
@@ -320,59 +244,25 @@ msgid ""
 "command 
{!s}
 returned error code {!s}."
 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:508
-msgid "Bootloader installation error"
-msgstr "启动加载器安装出错"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "配置 mkinitcpio."
 
-#: 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/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "正在进行本地化配置。"
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "设置硬件时钟。"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+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/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 "用 dracut 创建 initramfs."
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "无法在目标中运行 dracut "
-
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "正在配置初始内存文件系统。"
-
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "配置 OpenRC dmcrypt 服务。"
-
-#: 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 "无 
{!s}
 配置可供 
{!s}
 使用。"
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "安装数据."
 
 #: src/modules/dummypython/main.py:35
 msgid "Dummy python job."
@@ -383,10 +273,123 @@ msgstr "占位 Python 任务。"
 msgid "Dummy python step {}"
 msgstr "占位 Python 步骤 {}"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "正在进行本地化配置。"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "设置硬件时钟。"
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "正在保存网络配置。"
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "卸载文件系统。"
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "配置 OpenRC dmcrypt 服务。"
+
+#: 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:69
+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:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr "无法禁用 systemd 目标 {name!s}."
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "无法屏蔽 systemd 单元 {name!s}."
+
+#: src/modules/services-systemd/main.py:75
+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/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "无法在目标中运行 mkinitfs"
+
+#: src/modules/unpackfs/main.py:34
+msgid "Filling up filesystems."
+msgstr "写入文件系统。"
+
+#: src/modules/unpackfs/main.py:254
+msgid "rsync failed with error code {}."
+msgstr "rsync 报错，错误码 {}."
+
+#: src/modules/unpackfs/main.py:299
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "解压镜像 {}/{}，文件{}/{}"
+
+#: src/modules/unpackfs/main.py:314
+msgid "Starting to unpack {}"
+msgstr "开始解压 {}"
+
+#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:465
+msgid "Failed to unpack image \"{}\""
+msgstr "解压镜像失败 \"{}\""
+
+#: src/modules/unpackfs/main.py:430
+msgid "No mount point for root partition"
+msgstr "无 root 分区挂载点"
+
+#: src/modules/unpackfs/main.py:431
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage 未包含 \"rootMountPoint\"，跳过"
+
+#: src/modules/unpackfs/main.py:436
+msgid "Bad mount point for root partition"
+msgstr "错误的 root 分区挂载点"
+
+#: src/modules/unpackfs/main.py:437
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint 是 \"{}\"，不存在此位置，跳过"
+
+#: src/modules/unpackfs/main.py:453 src/modules/unpackfs/main.py:457
+#: src/modules/unpackfs/main.py:463 src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "错误的 unsquash 配置"
+
+#: src/modules/unpackfs/main.py:454
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "你当前的内核不支持文件系统 \"{}\" ({})"
+
+#: src/modules/unpackfs/main.py:458
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "源文件系统 \"{}\" 不存在"
+
+#: src/modules/unpackfs/main.py:464
+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/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr "配置加密交换分区。"
diff --git a/lang/python/zh_HK/LC_MESSAGES/python.po b/lang/python/zh_HK/LC_MESSAGES/python.po
index 62114f75a..e13578433 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-22 11:02+0200\n"
+"POT-Creation-Date: 2021-11-02 15:45+0100\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,131 +17,72 @@ msgstr ""
 "Language: zh_HK\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/networkcfg/main.py:105
+#: src/modules/initcpiocfg/main.py:227 src/modules/initcpiocfg/main.py:231
+#: src/modules/localecfg/main.py:135 src/modules/mount/main.py:144
+#: src/modules/rawfs/main.py:164 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356
+#: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145
+#: src/modules/rawfs/main.py:165 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/luksopenswaphookcfg/main.py:87
+msgid "No partitions are defined for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:90 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232
+#: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/luksopenswaphookcfg/main.py:91
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
 #: src/modules/grubcfg/main.py:28
 msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: 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
-#: src/modules/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"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: 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 ""
-
-#: 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
+#: 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/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/fstab/main.py:389
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
 msgstr ""
 
-#: 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}."
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 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"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
 #: src/modules/displaymanager/main.py:526
@@ -198,26 +139,6 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr ""
-
-#: 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 ""
-
-#: 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 ""
@@ -236,6 +157,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,8 +187,8 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
@@ -310,58 +236,24 @@ msgid ""
 "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:508
-msgid "Bootloader installation error"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/bootloader/main.py:509
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 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."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
 
 #: src/modules/dummypython/main.py:35
@@ -373,10 +265,121 @@ msgstr ""
 msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr ""
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+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:69
+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:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+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 ""
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:34
+msgid "Filling up filesystems."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:254
+msgid "rsync failed with error code {}."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:299
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:314
+msgid "Starting to unpack {}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:465
+msgid "Failed to unpack image \"{}\""
+msgstr ""
+
+#: src/modules/unpackfs/main.py:430
+msgid "No mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:431
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:436
+msgid "Bad mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:437
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:453 src/modules/unpackfs/main.py:457
+#: src/modules/unpackfs/main.py:463 src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:454
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:458
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:464
+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/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
diff --git a/lang/python/zh_TW/LC_MESSAGES/python.po b/lang/python/zh_TW/LC_MESSAGES/python.po
index b242ade31..b3d8b9208 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-22 11:02+0200\n"
+"POT-Creation-Date: 2021-11-02 15:45+0100\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,73 @@ msgstr ""
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "正在設定 initramfs。"
+
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/networkcfg/main.py:105
+#: src/modules/initcpiocfg/main.py:227 src/modules/initcpiocfg/main.py:231
+#: src/modules/localecfg/main.py:135 src/modules/mount/main.py:144
+#: src/modules/rawfs/main.py:164 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90
+msgid "Configuration Error"
+msgstr "設定錯誤"
+
+#: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356
+#: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145
+#: src/modules/rawfs/main.py:165 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/luksopenswaphookcfg/main.py:87
+msgid "No partitions are defined for 
{!s}
 to use."
+msgstr "沒有分割區被定義為 
{!s}
 以供使用。"
+
+#: src/modules/initramfscfg/main.py:90 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232
+#: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/luksopenswaphookcfg/main.py:91
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr "沒有給定的根掛載點 
{!s}
 以供使用。"
+
 #: src/modules/grubcfg/main.py:28
 msgid "Configure GRUB."
 msgstr "設定 GRUB。"
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "正在掛載分割區。"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "安裝開機載入程式。"
 
-#: 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
-#: src/modules/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/bootloader/main.py:508
+msgid "Bootloader installation error"
+msgstr "開機載入程式安裝錯誤"
 
-#: 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 "沒有分割區被定義為 
{!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
+#: src/modules/bootloader/main.py:509
 msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr "在 chroot 中呼叫的 systemctl {arg!s} 回傳了錯誤代碼 {num!s}。"
+"The bootloader could not be installed. The installation 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/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "正在寫入 fstab。"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {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:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "無法停用 systemd 目標 {name!s}。"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "正在使用 dracut 建立 initramfs。"
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "無法 mask 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: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/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "結束碼為 {}"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -205,26 +144,6 @@ msgstr "顯示管理器清單為空或在 globalstorage 與 displaymanager.conf
 msgid "Display manager configuration was incomplete"
 msgstr "顯示管理器設定不完整"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "正在設定 mkinitcpio。"
-
-#: 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 "沒有給定的根掛載點 
{!s}
 以供使用。"
-
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
-msgstr "正在設定已加密的 swap。"
-
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "正在安裝資料。"
-
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
 msgstr "設定 OpenRC 服務"
@@ -243,6 +162,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,9 +192,9 @@ msgid ""
 "exist."
 msgstr "服務 {name!s} 的路徑為 {path!s}，不存在。"
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "設定 Plymouth 主題"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "正在儲存網路設定。"
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
 #: src/modules/packages/main.py:69
@@ -317,59 +241,25 @@ msgid ""
 "command 
{!s}
 returned error code {!s}."
 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:508
-msgid "Bootloader installation error"
-msgstr "開機載入程式安裝錯誤"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "正在設定 mkinitcpio。"
 
-#: 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/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "正在設定語系。"
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "正在設定硬體時鐘。"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+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/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 "正在使用 dracut 建立 initramfs。"
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "在目標上執行 dracut 失敗"
-
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "正在設定 initramfs。"
-
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "正在設定 OpenRC dmcrypt 服務。"
-
-#: 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 "無 
{!s}
 設定可供 
{!s}
 使用。"
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "正在安裝資料。"
 
 #: src/modules/dummypython/main.py:35
 msgid "Dummy python job."
@@ -380,10 +270,123 @@ msgstr "假的 python 工作。"
 msgid "Dummy python step {}"
 msgstr "假的 python step {}"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "正在設定語系。"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "正在設定硬體時鐘。"
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "正在儲存網路設定。"
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "解除掛載檔案系統。"
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "正在設定 OpenRC dmcrypt 服務。"
+
+#: 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:69
+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:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr "無法啟用 systemd timer {name!s}。"
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr "無法停用 systemd 目標 {name!s}。"
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "無法 mask systemd 單位 {name!s}。"
+
+#: src/modules/services-systemd/main.py:75
+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/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "在目標上執行 mkinitfs 失敗"
+
+#: src/modules/unpackfs/main.py:34
+msgid "Filling up filesystems."
+msgstr "填滿檔案系統。"
+
+#: src/modules/unpackfs/main.py:254
+msgid "rsync failed with error code {}."
+msgstr "rsync 失敗，錯誤碼 {} 。"
+
+#: src/modules/unpackfs/main.py:299
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "正在解壓縮 {}/{}，檔案 {}/{}"
+
+#: src/modules/unpackfs/main.py:314
+msgid "Starting to unpack {}"
+msgstr "開始解壓縮 {}"
+
+#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:465
+msgid "Failed to unpack image \"{}\""
+msgstr "無法解開映像檔 \"{}\""
+
+#: src/modules/unpackfs/main.py:430
+msgid "No mount point for root partition"
+msgstr "沒有 root 分割區的掛載點"
+
+#: src/modules/unpackfs/main.py:431
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage 不包含 \"rootMountPoint\" 鍵，不做任何事"
+
+#: src/modules/unpackfs/main.py:436
+msgid "Bad mount point for root partition"
+msgstr "root 分割區掛載點錯誤"
+
+#: src/modules/unpackfs/main.py:437
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint 為 \"{}\"，其不存在，不做任何事"
+
+#: src/modules/unpackfs/main.py:453 src/modules/unpackfs/main.py:457
+#: src/modules/unpackfs/main.py:463 src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "錯誤的 unsquash 設定"
+
+#: src/modules/unpackfs/main.py:454
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "\"{}\" ({}) 的檔案系統不獲您目前的內核所支援"
+
+#: src/modules/unpackfs/main.py:458
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "來源檔案系統 \"{}\" 不存在"
+
+#: src/modules/unpackfs/main.py:464
+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/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr "正在設定已加密的 swap。"