From 5f55f14f9dca7b15d9f11f13c39ad6a3f457045c Mon Sep 17 00:00:00 2001 From: Calamares CI Date: Tue, 14 Jun 2022 13:32:17 +0200 Subject: [PATCH] i18n: [python] Automatic merge of Transifex translations --- lang/python.pot | 191 +++--- lang/python/ar/LC_MESSAGES/python.po | 492 +++++++-------- lang/python/as/LC_MESSAGES/python.po | 490 +++++++-------- lang/python/ast/LC_MESSAGES/python.po | 480 +++++++-------- lang/python/az/LC_MESSAGES/python.po | 536 ++++++++-------- lang/python/az_AZ/LC_MESSAGES/python.po | 536 ++++++++-------- lang/python/be/LC_MESSAGES/python.po | 502 +++++++-------- lang/python/bg/LC_MESSAGES/python.po | 480 +++++++-------- lang/python/bn/LC_MESSAGES/python.po | 478 +++++++-------- lang/python/ca/LC_MESSAGES/python.po | 542 ++++++++--------- lang/python/ca@valencia/LC_MESSAGES/python.po | 510 ++++++++-------- lang/python/cs_CZ/LC_MESSAGES/python.po | 548 ++++++++--------- lang/python/da/LC_MESSAGES/python.po | 504 +++++++-------- lang/python/de/LC_MESSAGES/python.po | 544 ++++++++--------- lang/python/el/LC_MESSAGES/python.po | 476 +++++++-------- lang/python/en_GB/LC_MESSAGES/python.po | 478 +++++++-------- lang/python/eo/LC_MESSAGES/python.po | 472 +++++++-------- lang/python/es/LC_MESSAGES/python.po | 566 ++++++++--------- lang/python/es_MX/LC_MESSAGES/python.po | 498 +++++++-------- lang/python/es_PR/LC_MESSAGES/python.po | 472 +++++++-------- lang/python/et/LC_MESSAGES/python.po | 472 +++++++-------- lang/python/eu/LC_MESSAGES/python.po | 472 +++++++-------- lang/python/fa/LC_MESSAGES/python.po | 526 ++++++++-------- lang/python/fi_FI/LC_MESSAGES/python.po | 526 ++++++++-------- lang/python/fr/LC_MESSAGES/python.po | 572 +++++++++--------- lang/python/fur/LC_MESSAGES/python.po | 508 ++++++++-------- lang/python/gl/LC_MESSAGES/python.po | 472 +++++++-------- lang/python/gu/LC_MESSAGES/python.po | 468 +++++++------- lang/python/he/LC_MESSAGES/python.po | 536 ++++++++-------- lang/python/hi/LC_MESSAGES/python.po | 524 ++++++++-------- lang/python/hr/LC_MESSAGES/python.po | 540 ++++++++--------- lang/python/hu/LC_MESSAGES/python.po | 500 +++++++-------- lang/python/id/LC_MESSAGES/python.po | 468 +++++++------- lang/python/ie/LC_MESSAGES/python.po | 486 +++++++-------- lang/python/is/LC_MESSAGES/python.po | 472 +++++++-------- lang/python/it_IT/LC_MESSAGES/python.po | 522 ++++++++-------- lang/python/ja-Hira/LC_MESSAGES/python.po | 464 +++++++------- lang/python/ja/LC_MESSAGES/python.po | 506 ++++++++-------- lang/python/kk/LC_MESSAGES/python.po | 468 +++++++------- lang/python/kn/LC_MESSAGES/python.po | 468 +++++++------- lang/python/ko/LC_MESSAGES/python.po | 498 +++++++-------- lang/python/lo/LC_MESSAGES/python.po | 464 +++++++------- lang/python/lt/LC_MESSAGES/python.po | 550 ++++++++--------- lang/python/lv/LC_MESSAGES/python.po | 472 +++++++-------- lang/python/mk/LC_MESSAGES/python.po | 468 +++++++------- lang/python/ml/LC_MESSAGES/python.po | 468 +++++++------- lang/python/mr/LC_MESSAGES/python.po | 468 +++++++------- lang/python/nb/LC_MESSAGES/python.po | 468 +++++++------- lang/python/ne_NP/LC_MESSAGES/python.po | 468 +++++++------- lang/python/nl/LC_MESSAGES/python.po | 508 ++++++++-------- lang/python/oc/LC_MESSAGES/python.po | 468 +++++++------- lang/python/pl/LC_MESSAGES/python.po | 514 ++++++++-------- lang/python/pt_BR/LC_MESSAGES/python.po | 546 ++++++++--------- lang/python/pt_PT/LC_MESSAGES/python.po | 544 ++++++++--------- lang/python/ro/LC_MESSAGES/python.po | 478 +++++++-------- lang/python/ru/LC_MESSAGES/python.po | 490 +++++++-------- lang/python/si/LC_MESSAGES/python.po | 524 ++++++++-------- lang/python/sk/LC_MESSAGES/python.po | 494 +++++++-------- lang/python/sl/LC_MESSAGES/python.po | 476 +++++++-------- lang/python/sq/LC_MESSAGES/python.po | 538 ++++++++-------- lang/python/sr/LC_MESSAGES/python.po | 482 +++++++-------- lang/python/sr@latin/LC_MESSAGES/python.po | 472 +++++++-------- lang/python/sv/LC_MESSAGES/python.po | 540 ++++++++--------- lang/python/ta_IN/LC_MESSAGES/python.po | 468 +++++++------- lang/python/te/LC_MESSAGES/python.po | 468 +++++++------- lang/python/tg/LC_MESSAGES/python.po | 508 ++++++++-------- lang/python/th/LC_MESSAGES/python.po | 464 +++++++------- lang/python/tr_TR/LC_MESSAGES/python.po | 528 ++++++++-------- lang/python/uk/LC_MESSAGES/python.po | 548 ++++++++--------- lang/python/ur/LC_MESSAGES/python.po | 468 +++++++------- lang/python/vi/LC_MESSAGES/python.po | 506 ++++++++-------- lang/python/zh/LC_MESSAGES/python.po | 464 +++++++------- lang/python/zh_CN/LC_MESSAGES/python.po | 492 +++++++-------- lang/python/zh_HK/LC_MESSAGES/python.po | 464 +++++++------- lang/python/zh_TW/LC_MESSAGES/python.po | 492 +++++++-------- 75 files changed, 18535 insertions(+), 18498 deletions(-) diff --git a/lang/python.pot b/lang/python.pot index 2d16bb38d..7321113a2 100644 --- a/lang/python.pot +++ b/lang/python.pot @@ -2,7 +2,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# #, fuzzy msgid "" msgstr "" @@ -12,35 +12,35 @@ msgstr "" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: \n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" #: src/modules/grubcfg/main.py:28 msgid "Configure GRUB." -msgstr "" +msgstr "Configure GRUB." #: src/modules/mount/main.py:42 msgid "Mounting partitions." -msgstr "" +msgstr "Mounting partitions." #: src/modules/mount/main.py:88 src/modules/mount/main.py:124 msgid "Internal error mounting zfs datasets" -msgstr "" +msgstr "Internal error mounting zfs datasets" #: src/modules/mount/main.py:100 msgid "Failed to import zpool" -msgstr "" +msgstr "Failed to import zpool" #: src/modules/mount/main.py:116 msgid "Failed to unlock zpool" -msgstr "" +msgstr "Failed to unlock zpool" #: src/modules/mount/main.py:133 src/modules/mount/main.py:138 msgid "Failed to set zfs mountpoint" -msgstr "" +msgstr "Failed to set zfs mountpoint" #: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235 #: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164 @@ -50,355 +50,378 @@ msgstr "" #: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428 #: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105 msgid "Configuration Error" -msgstr "" +msgstr "Configuration Error" #: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236 #: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86 #: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:395 msgid "No partitions are defined for 
{!s}
to use." -msgstr "" +msgstr "No partitions are defined for 
{!s}
to use." #: src/modules/mount/main.py:253 msgid "zfs mounting error" -msgstr "" +msgstr "zfs mounting error" #: src/modules/services-systemd/main.py:26 msgid "Configure systemd services" -msgstr "" +msgstr "Configure systemd services" #: src/modules/services-systemd/main.py:59 #: src/modules/services-openrc/main.py:93 msgid "Cannot modify service" -msgstr "" +msgstr "Cannot modify service" #: src/modules/services-systemd/main.py:60 msgid "" "systemctl {arg!s} call in chroot returned error code {num!s}." msgstr "" +"systemctl {arg!s} call in chroot returned error code {num!s}." #: src/modules/services-systemd/main.py:63 #: src/modules/services-systemd/main.py:69 msgid "Cannot enable systemd service {name!s}." -msgstr "" +msgstr "Cannot enable systemd service {name!s}." #: src/modules/services-systemd/main.py:65 msgid "Cannot enable systemd target {name!s}." -msgstr "" +msgstr "Cannot enable systemd target {name!s}." #: src/modules/services-systemd/main.py:67 msgid "Cannot enable systemd timer {name!s}." -msgstr "" +msgstr "Cannot enable systemd timer {name!s}." #: src/modules/services-systemd/main.py:71 msgid "Cannot disable systemd target {name!s}." -msgstr "" +msgstr "Cannot disable systemd target {name!s}." #: src/modules/services-systemd/main.py:73 msgid "Cannot mask systemd unit {name!s}." -msgstr "" +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}." +"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/unpackfs/main.py:34 msgid "Filling up filesystems." -msgstr "" +msgstr "Filling up filesystems." #: src/modules/unpackfs/main.py:254 msgid "rsync failed with error code {}." -msgstr "" +msgstr "rsync failed with error code {}." #: src/modules/unpackfs/main.py:299 msgid "Unpacking image {}/{}, file {}/{}" -msgstr "" +msgstr "Unpacking image {}/{}, file {}/{}" #: src/modules/unpackfs/main.py:314 msgid "Starting to unpack {}" -msgstr "" +msgstr "Starting to unpack {}" #: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:467 msgid "Failed to unpack image \"{}\"" -msgstr "" +msgstr "Failed to unpack image \"{}\"" #: src/modules/unpackfs/main.py:430 msgid "No mount point for root partition" -msgstr "" +msgstr "No mount point for root partition" #: src/modules/unpackfs/main.py:431 msgid "globalstorage does not contain a \"rootMountPoint\" key." -msgstr "" +msgstr "globalstorage does not contain a \"rootMountPoint\" key." #: src/modules/unpackfs/main.py:434 msgid "Bad mount point for root partition" -msgstr "" +msgstr "Bad mount point for root partition" #: src/modules/unpackfs/main.py:435 msgid "rootMountPoint is \"{}\", which does not exist." -msgstr "" +msgstr "rootMountPoint is \"{}\", which does not exist." #: src/modules/unpackfs/main.py:439 src/modules/unpackfs/main.py:455 #: src/modules/unpackfs/main.py:459 src/modules/unpackfs/main.py:465 #: src/modules/unpackfs/main.py:480 msgid "Bad unpackfs configuration" -msgstr "" +msgstr "Bad unpackfs configuration" #: src/modules/unpackfs/main.py:440 msgid "There is no configuration information." -msgstr "" +msgstr "There is no configuration information." #: src/modules/unpackfs/main.py:456 msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel" -msgstr "" +msgstr "The filesystem for \"{}\" ({}) is not supported by your current kernel" #: src/modules/unpackfs/main.py:460 msgid "The source filesystem \"{}\" does not exist" -msgstr "" +msgstr "The source filesystem \"{}\" does not exist" #: src/modules/unpackfs/main.py:466 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:481 msgid "The destination \"{}\" in the target system is not a directory" -msgstr "" +msgstr "The destination \"{}\" in the target system is not a directory" #: src/modules/displaymanager/main.py:524 msgid "Cannot write KDM configuration file" -msgstr "" +msgstr "Cannot write KDM configuration file" #: src/modules/displaymanager/main.py:525 msgid "KDM config file {!s} does not exist" -msgstr "" +msgstr "KDM config file {!s} does not exist" #: src/modules/displaymanager/main.py:586 msgid "Cannot write LXDM configuration file" -msgstr "" +msgstr "Cannot write LXDM configuration file" #: src/modules/displaymanager/main.py:587 msgid "LXDM config file {!s} does not exist" -msgstr "" +msgstr "LXDM config file {!s} does not exist" #: src/modules/displaymanager/main.py:670 msgid "Cannot write LightDM configuration file" -msgstr "" +msgstr "Cannot write LightDM configuration file" #: src/modules/displaymanager/main.py:671 msgid "LightDM config file {!s} does not exist" -msgstr "" +msgstr "LightDM config file {!s} does not exist" #: src/modules/displaymanager/main.py:745 msgid "Cannot configure LightDM" -msgstr "" +msgstr "Cannot configure LightDM" #: src/modules/displaymanager/main.py:746 msgid "No LightDM greeter installed." -msgstr "" +msgstr "No LightDM greeter installed." #: src/modules/displaymanager/main.py:777 msgid "Cannot write SLIM configuration file" -msgstr "" +msgstr "Cannot write SLIM configuration file" #: src/modules/displaymanager/main.py:778 msgid "SLIM config file {!s} does not exist" -msgstr "" +msgstr "SLIM config file {!s} does not exist" #: src/modules/displaymanager/main.py:992 msgid "No display managers selected for the displaymanager module." -msgstr "" +msgstr "No display managers selected for the displaymanager module." #: src/modules/displaymanager/main.py:993 msgid "" "The displaymanagers list is empty or undefined in both globalstorage and " "displaymanager.conf." msgstr "" +"The displaymanagers list is empty or undefined in both globalstorage and " +"displaymanager.conf." #: src/modules/displaymanager/main.py:1075 msgid "Display manager configuration was incomplete" -msgstr "" +msgstr "Display manager configuration was incomplete" #: src/modules/initcpiocfg/main.py:28 msgid "Configuring mkinitcpio." -msgstr "" +msgstr "Configuring mkinitcpio." #: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90 #: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:401 #: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106 msgid "No root mount point is given for 
{!s}
to use." -msgstr "" +msgstr "No root mount point is given for 
{!s}
to use." #: src/modules/rawfs/main.py:26 msgid "Installing data." -msgstr "" +msgstr "Installing data." #: src/modules/services-openrc/main.py:29 msgid "Configure OpenRC services" -msgstr "" +msgstr "Configure OpenRC services" #: src/modules/services-openrc/main.py:57 msgid "Cannot add service {name!s} to run-level {level!s}." -msgstr "" +msgstr "Cannot add service {name!s} to run-level {level!s}." #: src/modules/services-openrc/main.py:59 msgid "Cannot remove service {name!s} from run-level {level!s}." -msgstr "" +msgstr "Cannot remove service {name!s} from run-level {level!s}." #: src/modules/services-openrc/main.py:61 msgid "" "Unknown service-action {arg!s} for service {name!s} in run-" "level {level!s}." msgstr "" +"Unknown service-action {arg!s} for service {name!s} in run-" +"level {level!s}." #: src/modules/services-openrc/main.py:94 msgid "" "rc-update {arg!s} call in chroot returned error code {num!s}." msgstr "" +"rc-update {arg!s} call in chroot returned error code {num!s}." #: src/modules/services-openrc/main.py:101 msgid "Target runlevel does not exist" -msgstr "" +msgstr "Target runlevel does not exist" #: src/modules/services-openrc/main.py:102 msgid "" "The path for runlevel {level!s} is {path!s}, which does not " "exist." msgstr "" +"The path for runlevel {level!s} is {path!s}, which does not " +"exist." #: src/modules/services-openrc/main.py:110 msgid "Target service does not exist" -msgstr "" +msgstr "Target service does not exist" #: src/modules/services-openrc/main.py:111 msgid "" -"The path for service {name!s} is {path!s}, which does not exist." +"The path for service {name!s} is {path!s}, which does not " +"exist." msgstr "" +"The path for service {name!s} is {path!s}, which does not " +"exist." #: src/modules/plymouthcfg/main.py:27 msgid "Configure Plymouth theme" -msgstr "" +msgstr "Configure Plymouth theme" #: src/modules/packages/main.py:54 src/modules/packages/main.py:65 #: src/modules/packages/main.py:75 msgid "Install packages." -msgstr "" +msgstr "Install packages." #: src/modules/packages/main.py:63 #, python-format msgid "Processing packages (%(count)d / %(total)d)" -msgstr "" +msgstr "Processing packages (%(count)d / %(total)d)" #: src/modules/packages/main.py:68 #, python-format msgid "Installing one package." msgid_plural "Installing %(num)d packages." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Installing one package." +msgstr[1] "Installing %(num)d packages." #: src/modules/packages/main.py:71 #, python-format msgid "Removing one package." msgid_plural "Removing %(num)d packages." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Removing one package." +msgstr[1] "Removing %(num)d packages." #: src/modules/packages/main.py:725 src/modules/packages/main.py:737 #: src/modules/packages/main.py:765 msgid "Package Manager error" -msgstr "" +msgstr "Package Manager error" #: src/modules/packages/main.py:726 msgid "" "The package manager could not prepare updates. The command 
{!s}
" "returned error code {!s}." msgstr "" +"The package manager could not prepare updates. The command 
{!s}
" +"returned error code {!s}." #: src/modules/packages/main.py:738 msgid "" -"The package manager could not update the system. The command 
{!s}
" -"returned error code {!s}." +"The package manager could not update the system. The command 
{!s}
" +" returned error code {!s}." msgstr "" +"The package manager could not update the system. The command 
{!s}
" +" returned error code {!s}." #: src/modules/packages/main.py:766 msgid "" "The package manager could not make changes to the installed system. The " "command 
{!s}
returned error code {!s}." msgstr "" +"The package manager could not make changes to the installed system. The " +"command 
{!s}
returned error code {!s}." #: src/modules/bootloader/main.py:43 msgid "Install bootloader." -msgstr "" +msgstr "Install bootloader." #: src/modules/bootloader/main.py:614 msgid "Failed to install grub, no partitions defined in global storage" -msgstr "" +msgstr "Failed to install grub, no partitions defined in global storage" #: src/modules/bootloader/main.py:782 msgid "Bootloader installation error" -msgstr "" +msgstr "Bootloader installation error" #: src/modules/bootloader/main.py:783 msgid "" -"The bootloader could not be installed. The installation command 
{!s} returned error code {!s}."
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
 msgstr ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
 
 #: src/modules/hwclock/main.py:26
 msgid "Setting hardware clock."
-msgstr ""
+msgstr "Setting hardware clock."
 
 #: src/modules/mkinitfs/main.py:27
 msgid "Creating initramfs with mkinitfs."
-msgstr ""
+msgstr "Creating initramfs with mkinitfs."
 
 #: src/modules/mkinitfs/main.py:49
 msgid "Failed to run mkinitfs on the target"
-msgstr ""
+msgstr "Failed to run mkinitfs on the target"
 
 #: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
 msgid "The exit code was {}"
-msgstr ""
+msgstr "The exit code was {}"
 
 #: src/modules/dracut/main.py:27
 msgid "Creating initramfs with dracut."
-msgstr ""
+msgstr "Creating initramfs with dracut."
 
 #: src/modules/dracut/main.py:49
 msgid "Failed to run dracut on the target"
-msgstr ""
+msgstr "Failed to run dracut on the target"
 
 #: src/modules/initramfscfg/main.py:32
 msgid "Configuring initramfs."
-msgstr ""
+msgstr "Configuring initramfs."
 
 #: src/modules/openrcdmcryptcfg/main.py:26
 msgid "Configuring OpenRC dmcrypt service."
-msgstr ""
+msgstr "Configuring OpenRC dmcrypt service."
 
 #: src/modules/fstab/main.py:28
 msgid "Writing fstab."
-msgstr ""
+msgstr "Writing fstab."
 
 #: src/modules/fstab/main.py:429
 msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
+msgstr "No 
{!s}
 configuration is given for 
{!s}
 to use."
 
 #: src/modules/dummypython/main.py:35
 msgid "Dummy python job."
-msgstr ""
+msgstr "Dummy python job."
 
 #: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
 #: src/modules/dummypython/main.py:94
 msgid "Dummy python step {}"
-msgstr ""
+msgstr "Dummy python step {}"
 
 #: src/modules/localecfg/main.py:31
 msgid "Configuring locales."
-msgstr ""
+msgstr "Configuring locales."
 
 #: src/modules/networkcfg/main.py:29
 msgid "Saving network configuration."
-msgstr ""
+msgstr "Saving network configuration."
diff --git a/lang/python/ar/LC_MESSAGES/python.po b/lang/python/ar/LC_MESSAGES/python.po
index 81b71f3a7..552481820 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: 2022-05-27 11:18+0200\n"
+"POT-Creation-Date: 2022-05-29 16:17+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: aboodilankaboot, 2019\n"
 "Language-Team: Arabic (https://www.transifex.com/calamares/teams/20061/ar/)\n"
@@ -22,105 +22,89 @@ 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/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "تثبيت الحزم"
-
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "جاري تحميل الحزم (%(count)d/%(total)d)"
-
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "جاري تركيب الأقسام"
+
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
 msgstr ""
 
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
 msgstr ""
 
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "جاري حفظ الإعدادات"
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr ""
 
-#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
-#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
-#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
 msgid "Configuration Error"
 msgstr "خطأ في الضبط"
 
-#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
-#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
-msgid "No root mount point is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr ""
-
-#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
-#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
+#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
+#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:395
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "تعديل خدمات systemd"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "لا يمكن تعديل الخدمة"
+
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-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/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/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/unpackfs/main.py:34
@@ -187,169 +171,6 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "تعديل خدمات systemd"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "لا يمكن تعديل الخدمة"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py: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/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "عملية بايثون دميه"
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "عملية  دميه خطوه بايثون {}"
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "تثبيت محمل الإقلاع"
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr ""
-
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr "جاري تركيب الأقسام"
-
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr ""
-
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr ""
-
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr ""
-
-#: src/modules/fstab/main.py:429
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr "الـ runlevel الهدف غير موجود"
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr "الخدمة الهدف غير موجودة"
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr ""
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr ""
-
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr ""
-
 #: src/modules/displaymanager/main.py:524
 msgid "Cannot write KDM configuration file"
 msgstr "فشلت كتابة ملف ضبط KDM."
@@ -404,14 +225,193 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "إعداد مدير العرض لم يكتمل"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:401
+#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr "الـ runlevel الهدف غير موجود"
+
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr "الخدمة الهدف غير موجودة"
+
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr ""
+
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "تثبيت الحزم"
+
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "جاري تحميل الحزم (%(count)d/%(total)d)"
+
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "تثبيت محمل الإقلاع"
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
 msgstr ""
 
 #: src/modules/hwclock/main.py:26
 msgid "Setting hardware clock."
 msgstr "جاري إعداد ساعة الهاردوير"
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: 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:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "عملية بايثون دميه"
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "عملية  دميه خطوه بايثون {}"
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "جاري حفظ الإعدادات"
diff --git a/lang/python/as/LC_MESSAGES/python.po b/lang/python/as/LC_MESSAGES/python.po
index ae079b699..e66d7b52d 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: 2022-05-27 11:18+0200\n"
+"POT-Creation-Date: 2022-05-29 16:17+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Deep Jyoti Choudhury , 2020\n"
 "Language-Team: Assamese (https://www.transifex.com/calamares/teams/20061/as/)\n"
@@ -21,98 +21,92 @@ msgstr ""
 "Language: as\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "পেকেজ ইন্স্তল কৰক।"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "GRUB কনফিগাৰ কৰক।"
 
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "(%(count)d / %(total)d) পেকেজবোৰ সংশোধন কৰি আছে"
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "বিভাজন মাউন্ট্ কৰা।"
 
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Installing one package."
-msgstr[1] "%(num)d পেকেজবোৰ ইনস্তল হৈ আছে।"
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Removing one package."
-msgstr[1] "%(num)d পেকেজবোৰ আতৰোৱা হৈ আছে।"
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
 msgstr ""
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
 msgstr ""
 
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
 msgstr ""
 
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "নেটৱৰ্ক কন্ফিগাৰ জমা কৰি আছে।"
-
-#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
-#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
-#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
 msgid "Configuration Error"
 msgstr "কনফিগাৰেচন ত্ৰুটি"
 
-#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
-#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
-msgid "No root mount point is given for 
{!s}
 to use."
-msgstr "ব্যৱহাৰৰ বাবে 
{!s}
ৰ কোনো মাউন্ট্ পাইন্ট্ দিয়া হোৱা নাই।"
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "mkinitcpio কনফিগাৰ কৰি আছে।"
-
-#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
-#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
+#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
+#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:395
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr "
{!s}
ৰ ব্যৱহাৰৰ বাবে কোনো বিভাজনৰ বৰ্ণনা দিয়া হোৱা নাই।"
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "systemd সেৱা সমুহ কনফিগাৰ কৰক"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "সেৱা সমুহৰ সংশোধন কৰিব নোৱাৰি"
+
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr "chrootত systemctl {arg!s}ৰ call ক্ৰুটি কোড {num!s}।"
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py: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/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "এক্সিড্ কোড্ আছিল {}"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr "systemd গন্তব্য স্থান {name!s} নিষ্ক্ৰিয় কৰিব নোৱাৰি।"
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "OpenRC dmcrypt সেৱা কন্ফিগাৰ কৰি আছে।"
+#: src/modules/services-systemd/main.py: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/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -178,174 +172,6 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr "লক্ষ্যৰ চিছটেম গন্তব্য স্থান \"{}\" এটা ডিৰেক্টৰী নহয়"
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "systemd সেৱা সমুহ কনফিগাৰ কৰক"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "সেৱা সমুহৰ সংশোধন কৰিব নোৱাৰি"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr "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/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "ডামী Pythonৰ কায্য"
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "ডামী Pythonৰ পদক্ষেপ {}"
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "বুতলোডাৰ ইন্স্তল কৰক।"
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr "স্থানীয়বোৰ কন্ফিগাৰ কৰি আছে।"
-
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr "বিভাজন মাউন্ট্ কৰা।"
-
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr ""
-
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr ""
-
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Plymouth theme কন্ফিগাৰ কৰি আছে।​"
-
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr "fstab লিখি আছে।"
-
-#: src/modules/fstab/main.py:429
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr "OpenRC সেৱা সমুহ কনফিগাৰ কৰক"
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr "ৰাণ-লেভেল {level!s}ত সেৱা {name!s} যোগ কৰিব নোৱাৰি।"
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr "ৰাণ-লেভেল {level!s}ৰ পৰা সেৱা {name!s} আতৰাব নোৱাৰি।"
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-"ৰান-লেভেল {level!s}ত সেৱা {name!s}ৰ বাবে অজ্ঞাত সেৱা কাৰ্য্য "
-"{arg!s} ।"
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr "chrootত rc-update {arg!s} call ক্ৰুটি কোড {num!s}।"
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr "গন্তব্য ৰাণলেভেল উপস্থিত নাই।"
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-"{level!s} ৰাণলেভেলৰ বাবে পথ হ'ল {path!s} যিটো উপস্থিত নাই।"
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr "গন্তব্য সেৱা উপস্থিত নাই।"
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr "{name!s}ৰ বাবে পথ হ'ল {path!s} যিটো উপস্থিত নাই।"
-
-#: src/modules/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/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "GRUB কনফিগাৰ কৰক।"
-
 #: src/modules/displaymanager/main.py:524
 msgid "Cannot write KDM configuration file"
 msgstr "KDM কনফিগাৰেচন ফাইলত লিখিব নোৱাৰি"
@@ -400,14 +226,188 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "ডিস্প্লে প্ৰবন্ধক কন্ফিগাৰেচন অসমাপ্ত"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "initramfs কন্ফিগাৰ কৰি আছে।"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "mkinitcpio কনফিগাৰ কৰি আছে।"
+
+#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:401
+#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr "ব্যৱহাৰৰ বাবে 
{!s}
ৰ কোনো মাউন্ট্ পাইন্ট্ দিয়া হোৱা নাই।"
+
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "ডাটা ইন্স্তল কৰি আছে।"
+
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr "OpenRC সেৱা সমুহ কনফিগাৰ কৰক"
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr "ৰাণ-লেভেল {level!s}ত সেৱা {name!s} যোগ কৰিব নোৱাৰি।"
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr "ৰাণ-লেভেল {level!s}ৰ পৰা সেৱা {name!s} আতৰাব নোৱাৰি।"
+
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+"ৰান-লেভেল {level!s}ত সেৱা {name!s}ৰ বাবে অজ্ঞাত সেৱা কাৰ্য্য "
+"{arg!s} ।"
+
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr "chrootত rc-update {arg!s} call ক্ৰুটি কোড {num!s}।"
+
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr "গন্তব্য ৰাণলেভেল উপস্থিত নাই।"
+
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+"{level!s} ৰাণলেভেলৰ বাবে পথ হ'ল {path!s} যিটো উপস্থিত নাই।"
+
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr "গন্তব্য সেৱা উপস্থিত নাই।"
+
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr "{name!s}ৰ বাবে পথ হ'ল {path!s} যিটো উপস্থিত নাই।"
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Plymouth theme কন্ফিগাৰ কৰি আছে।​"
+
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "পেকেজ ইন্স্তল কৰক।"
+
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "(%(count)d / %(total)d) পেকেজবোৰ সংশোধন কৰি আছে"
+
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Installing one package."
+msgstr[1] "%(num)d পেকেজবোৰ ইনস্তল হৈ আছে।"
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Removing one package."
+msgstr[1] "%(num)d পেকেজবোৰ আতৰোৱা হৈ আছে।"
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "বুতলোডাৰ ইন্স্তল কৰক।"
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
 
 #: src/modules/hwclock/main.py:26
 msgid "Setting hardware clock."
 msgstr "হাৰ্ডৱেৰৰ ঘড়ী চেত্ কৰি আছে।"
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-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:28
+msgid "Writing fstab."
+msgstr "fstab লিখি আছে।"
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "ডামী Pythonৰ কায্য"
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "ডামী Pythonৰ পদক্ষেপ {}"
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr "স্থানীয়বোৰ কন্ফিগাৰ কৰি আছে।"
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "নেটৱৰ্ক কন্ফিগাৰ জমা কৰি আছে।"
diff --git a/lang/python/ast/LC_MESSAGES/python.po b/lang/python/ast/LC_MESSAGES/python.po
index 6e07d8ffe..44961d909 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: 2022-05-27 11:18+0200\n"
+"POT-Creation-Date: 2022-05-29 16:17+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: enolp , 2020\n"
 "Language-Team: Asturian (https://www.transifex.com/calamares/teams/20061/ast/)\n"
@@ -21,98 +21,90 @@ msgstr ""
 "Language: ast\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "Instalación de paquetes."
-
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Procesando paquetes (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Instalando un paquete."
-msgstr[1] "Instalando %(num)d paquetes."
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Desaniciando un paquete."
-msgstr[1] "Desaniciando %(num)d paquetes."
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
 msgstr ""
 
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
-#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
-#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr ""
+
+#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
 msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
-#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
-msgid "No root mount point is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Configurando mkinitcpio."
-
-#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
-#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
+#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
+#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:395
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "El códigu de salida foi {}"
+#: 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/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Configurando'l serviciu dmcrypt d'OpenRC."
+#: 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/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -178,170 +170,6 @@ msgstr ""
 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/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr ""
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Nun pue modificase'l serviciu"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py: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/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Trabayu maniquín en Python."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Pasu maniquín {} en Python"
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Instalando'l xestor d'arrinque."
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr "Configurando locales."
-
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr ""
-
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr ""
-
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr ""
-
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr ""
-
-#: src/modules/fstab/main.py:429
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr "Nun pue amestase'l serviciu {name!s} al nivel d'execución {level!s}."
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr ""
-"Nun pue desaniciase'l serviciu {name!s} del nivel d'execución {level!s}."
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr "El nivel d'execución de destín nun esiste"
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr "El serviciu de destín nun esiste"
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/dracut/main.py: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/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr ""
-
 #: src/modules/displaymanager/main.py:524
 msgid "Cannot write KDM configuration file"
 msgstr "Nun pue escribise'l ficheru de configuración de KDM"
@@ -396,14 +224,186 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "La configuración del xestor de pantalles nun se completó"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Configurando mkinitcpio."
+
+#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:401
+#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Instalando datos."
+
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr "Nun pue amestase'l serviciu {name!s} al nivel d'execución {level!s}."
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr ""
+"Nun pue desaniciase'l serviciu {name!s} del nivel d'execución {level!s}."
+
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr "El nivel d'execución de destín nun esiste"
+
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr "El serviciu de destín nun esiste"
+
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr ""
+
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "Instalación de paquetes."
+
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Procesando paquetes (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Instalando un paquete."
+msgstr[1] "Instalando %(num)d paquetes."
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Desaniciando un paquete."
+msgstr[1] "Desaniciando %(num)d paquetes."
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Instalando'l xestor d'arrinque."
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
 msgstr ""
 
 #: src/modules/hwclock/main.py:26
 msgid "Setting hardware clock."
 msgstr "Configurando'l reló de hardware."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Instalando datos."
+#: 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:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Trabayu maniquín en Python."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Pasu maniquín {} en Python"
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr "Configurando locales."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr ""
diff --git a/lang/python/az/LC_MESSAGES/python.po b/lang/python/az/LC_MESSAGES/python.po
index 6bf1d5ea2..cc41fb5a6 100644
--- a/lang/python/az/LC_MESSAGES/python.po
+++ b/lang/python/az/LC_MESSAGES/python.po
@@ -4,16 +4,16 @@
 # FIRST AUTHOR , YEAR.
 # 
 # Translators:
-# Kheyyam Gojayev , 2022
+# Xəyyam Qocayev , 2022
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-27 11:18+0200\n"
+"POT-Creation-Date: 2022-05-29 16:17+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
-"Last-Translator: Kheyyam Gojayev , 2022\n"
+"Last-Translator: Xəyyam Qocayev , 2022\n"
 "Language-Team: Azerbaijani (https://www.transifex.com/calamares/teams/20061/az/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,105 +21,94 @@ msgstr ""
 "Language: az\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "Paketləri quraşdırmaq."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "GRUB tənzimləmələri"
 
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "(%(count)d / %(total)d) paketləri işlənir"
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "Disk bölmələri qoşulur."
 
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Bir paket quraşdırılır."
-msgstr[1] "%(num)d paket quraşdırılır."
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr "Zfs verilənlər dəstinin qoşulmasında daxil xəta"
 
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Bir paket silinir"
-msgstr[1] "%(num)d paket silinir."
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr "Zpool idxalı baş tutmadı"
 
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr "Paket meneceri xətası"
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr "Zpool kiliddən çıxarıla bilmədi"
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-"Bu paket meneceri yenilənmələri hazırlaya bilmədi. 
{!s}
 əmri xəta"
-" kodu {!s} ilə cavab verdi."
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr "Zfs qoşulma nöqtəsi təyin olunmadı"
 
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-"Paket meneceri sistemi yeniləyə bimədi. 
{!s}
 əmri xəta kodu {!s} "
-"ilə cavab verdi."
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-"Paket meneceri dəyişiklikləri sistemə tətbiq edə bilmədi. 
{!s}
 "
-"əmri xəta kodu {!s} ilə cavab verdi."
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Şəbəkə ayarları saxlanılır."
-
-#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
-#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
-#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
 msgid "Configuration Error"
 msgstr "Tənzimləmə xətası"
 
-#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
-#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
-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/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "mkinitcpio tənzimlənir."
-
-#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
-#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
+#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
+#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:395
 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/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "mkinitfs ilə initramfs yaradılır"
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr "zfs qoşulmasında xəta"
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Hədəfdə mkinitfs başlatmaq baş tutmadı"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Systemd xidmətini tənzimləmək"
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Çıxış kodu {} idi"
+#: 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/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "OpenRC dmcrypt xidməti tənzimlənir."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"systemctl {arg!s} chroot çağırışına xəta kodu ilə cavab verdi "
+"{num!s}."
+
+#: src/modules/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 "{name!s} systemd taymeri aktiv edilə bilmir."
+
+#: 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/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -188,182 +177,6 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr "Hədəf sistemində təyin edilən \"{}\", qovluq deyil"
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Systemd xidmətini tənzimləmək"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Xidmətdə dəyişiklik etmək mümkün olmadı"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"systemctl {arg!s} chroot çağırışına xəta kodu ilə cavab verdi "
-"{num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py: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 "{name!s} systemd taymeri aktiv edilə bilmir."
-
-#: 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/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Dummy python işi."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "{} Dummy python addımı"
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Önyükləyici qurulur."
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr "Grub quraşdırılmadı, ümumi yaddaş üçün bölmələr təyin olunmayıb"
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr "Önyükləyicinin quraşdırılmasında xəta"
-
-#: src/modules/bootloader/main.py:783
-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:31
-msgid "Configuring locales."
-msgstr "Lokallaşma tənzimlənir."
-
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr "Disk bölmələri qoşulur."
-
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr "Zfs verilənlər dəstinin qoşulmasında daxil xəta"
-
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr "Zpool idxalı baş tutmadı"
-
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr "Zpool kiliddən çıxarıla bilmədi"
-
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr "Zfs qoşulma nöqtəsi təyin olunmadı"
-
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr "zfs qoşulmasında xəta"
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Plymouth mövzusu tənzimlənməsi"
-
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr "fstab yazılır."
-
-#: src/modules/fstab/main.py:429
-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/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr "OpenRC xidmətlərini tənzimləmək"
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr "{name!s} xidməti {level!s} işləmə səviyyəsinə əlavə edilə bilmir."
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr "{name!s} xidməti {level!s} iş səviyyəsindən silinə bilmir."
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-"{level!s} işləmə səviyyəsindəki {name!s} xidməti üçün naməlum "
-"{arg!s} xidmət fəaliyyəti."
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"rc-update {arg!s} chroot-da çağırışına {num!s} xəta kodu ilə "
-"cavab verildi."
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr "Hədəf işləmə səviyyəsi mövcud deyil"
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-"{level!s} işləmə səviyyəsi üçün {path!s} yolu mövcud deyil."
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr "Hədəf xidməti mövcud deyil"
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr "{name!s} üçün {path!s} yolu mövcud deyil."
-
-#: src/modules/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/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "GRUB tənzimləmələri"
-
 #: src/modules/displaymanager/main.py:524
 msgid "Cannot write KDM configuration file"
 msgstr "KDM tənzimləmə faylı yazıla bilmir"
@@ -420,14 +233,201 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "Ekran meneceri tənzimləmələri başa çatmadı"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "initramfs tənzimlənir."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "mkinitcpio tənzimlənir."
+
+#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:401
+#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
+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/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Quraşdırılma tarixi."
+
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr "OpenRC xidmətlərini tənzimləmək"
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr "{name!s} xidməti {level!s} işləmə səviyyəsinə əlavə edilə bilmir."
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr "{name!s} xidməti {level!s} iş səviyyəsindən silinə bilmir."
+
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+"{level!s} işləmə səviyyəsindəki {name!s} xidməti üçün naməlum "
+"{arg!s} xidmət fəaliyyəti."
+
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"rc-update {arg!s} chroot-da çağırışına {num!s} xəta kodu ilə "
+"cavab verildi."
+
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr "Hədəf işləmə səviyyəsi mövcud deyil"
+
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+"{level!s} işləmə səviyyəsi üçün {path!s} yolu mövcud deyil."
+
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr "Hədəf xidməti mövcud deyil"
+
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr "{name!s} üçün {path!s} yolu mövcud deyil."
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Plymouth mövzusu tənzimlənməsi"
+
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "Paketləri quraşdırmaq."
+
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "(%(count)d / %(total)d) paketləri işlənir"
+
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Bir paket quraşdırılır."
+msgstr[1] "%(num)d paket quraşdırılır."
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Bir paket silinir"
+msgstr[1] "%(num)d paket silinir."
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr "Paket meneceri xətası"
+
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+"Bu paket meneceri yenilənmələri hazırlaya bilmədi. 
{!s}
 əmri xəta"
+" kodu {!s} ilə cavab verdi."
+
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+"Paket meneceri sistemi yeniləyə bimədi. 
{!s}
 əmri xəta kodu {!s} "
+"ilə cavab verdi."
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+"Paket meneceri dəyişiklikləri sistemə tətbiq edə bilmədi. 
{!s}
 "
+"əmri xəta kodu {!s} ilə cavab verdi."
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Önyükləyici qurulur."
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr "Grub quraşdırılmadı, ümumi yaddaş üçün bölmələr təyin olunmayıb"
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr "Önyükləyicinin quraşdırılmasında xəta"
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
+"Önyükləyici quraşdırıla bilmədi. Quraşdırma əmri 
{!s}
, xəta kodu "
+"{!s} ilə cavab verdi."
 
 #: src/modules/hwclock/main.py:26
 msgid "Setting hardware clock."
 msgstr "Aparat saatını ayarlamaq."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Quraşdırılma tarixi."
+#: 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:28
+msgid "Writing fstab."
+msgstr "fstab yazılır."
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
+"İstifadə etmək üçün, 
{!s}
 tənzimləməsi, 
{!s}
 üçün "
+"göstərilməyib."
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Dummy python işi."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "{} Dummy python addımı"
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr "Lokallaşma tənzimlənir."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Şəbəkə ayarları saxlanılır."
diff --git a/lang/python/az_AZ/LC_MESSAGES/python.po b/lang/python/az_AZ/LC_MESSAGES/python.po
index 63f150d45..1b344df5f 100644
--- a/lang/python/az_AZ/LC_MESSAGES/python.po
+++ b/lang/python/az_AZ/LC_MESSAGES/python.po
@@ -4,16 +4,16 @@
 # FIRST AUTHOR , YEAR.
 # 
 # Translators:
-# Kheyyam Gojayev , 2022
+# Xəyyam Qocayev , 2022
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-27 11:18+0200\n"
+"POT-Creation-Date: 2022-05-29 16:17+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
-"Last-Translator: Kheyyam Gojayev , 2022\n"
+"Last-Translator: Xəyyam Qocayev , 2022\n"
 "Language-Team: Azerbaijani (Azerbaijan) (https://www.transifex.com/calamares/teams/20061/az_AZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,105 +21,94 @@ msgstr ""
 "Language: az_AZ\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "Paketləri quraşdırmaq."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "GRUB tənzimləmələri"
 
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "(%(count)d / %(total)d) paketləri işlənir"
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "Disk bölmələri qoşulur."
 
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Bir paket quraşdırılır."
-msgstr[1] "%(num)d paket quraşdırılır."
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr "Zfs verilənlər dəstinin qoşulmasında daxil xəta"
 
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Bir paket silinir"
-msgstr[1] "%(num)d paket silinir."
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr "Zpool idxalı baş tutmadı"
 
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr "Paket meneceri xətası"
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr "Zpool kiliddən çıxarıla bilmədi"
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-"Bu paket meneceri yenilənmələri hazırlaya bilmədi. 
{!s}
 əmri xəta"
-" kodu {!s} ilə cavab verdi."
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr "Zfs qoşulma nöqtəsi təyin olunmadı"
 
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-"Paket meneceri sistemi yeniləyə bimədi. 
{!s}
 əmri xəta kodu {!s} "
-"ilə cavab verdi."
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-"Paket meneceri dəyişiklikləri sistemə tətbiq edə bilmədi. 
{!s}
 "
-"əmri xəta kodu {!s} ilə cavab verdi."
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Şəbəkə ayarları saxlanılır."
-
-#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
-#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
-#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
 msgid "Configuration Error"
 msgstr "Tənzimləmə xətası"
 
-#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
-#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
-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/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "mkinitcpio tənzimlənir."
-
-#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
-#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
+#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
+#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:395
 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/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "mkinitfs ilə initramfs yaradılır"
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr "zfs qoşulmasında xəta"
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Hədəfdə mkinitfs başlatmaq baş tutmadı"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Systemd xidmətini tənzimləmək"
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Çıxış kodu {} idi"
+#: 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/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "OpenRC dmcrypt xidməti tənzimlənir."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"systemctl {arg!s} chroot çağırışına xəta kodu ilə cavab verdi "
+"{num!s}."
+
+#: src/modules/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 "{name!s} systemd taymeri aktiv edilə bilmir."
+
+#: 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/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -188,182 +177,6 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr "Hədəf sistemində təyin edilən \"{}\", qovluq deyil"
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Systemd xidmətini tənzimləmək"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Xidmətdə dəyişiklik etmək mümkün olmadı"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"systemctl {arg!s} chroot çağırışına xəta kodu ilə cavab verdi "
-"{num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py: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 "{name!s} systemd taymeri aktiv edilə bilmir."
-
-#: 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/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Dummy python işi."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "{} Dummy python addımı"
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Önyükləyici qurulur."
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr "Grub quraşdırılmadı, ümumi yaddaş üçün bölmələr təyin olunmayıb"
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr "Önyükləyicinin quraşdırılmasında xəta"
-
-#: src/modules/bootloader/main.py:783
-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:31
-msgid "Configuring locales."
-msgstr "Lokallaşma tənzimlənir."
-
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr "Disk bölmələri qoşulur."
-
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr "Zfs verilənlər dəstinin qoşulmasında daxil xəta"
-
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr "Zpool idxalı baş tutmadı"
-
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr "Zpool kiliddən çıxarıla bilmədi"
-
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr "Zfs qoşulma nöqtəsi təyin olunmadı"
-
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr "zfs qoşulmasında xəta"
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Plymouth mövzusu tənzimlənməsi"
-
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr "fstab yazılır."
-
-#: src/modules/fstab/main.py:429
-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/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr "OpenRC xidmətlərini tənzimləmək"
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr "{name!s} xidməti {level!s} işləmə səviyyəsinə əlavə edilə bilmir."
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr "{name!s} xidməti {level!s} iş səviyyəsindən silinə bilmir."
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-"{level!s} işləmə səviyyəsindəki {name!s} xidməti üçün naməlum "
-"{arg!s} xidmət fəaliyyəti."
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"rc-update {arg!s} chroot-da çağırışına {num!s} xəta kodu ilə "
-"cavab verildi."
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr "Hədəf işləmə səviyyəsi mövcud deyil"
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-"{level!s} işləmə səviyyəsi üçün {path!s} yolu mövcud deyil."
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr "Hədəf xidməti mövcud deyil"
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr "{name!s} üçün {path!s} yolu mövcud deyil."
-
-#: src/modules/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/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "GRUB tənzimləmələri"
-
 #: src/modules/displaymanager/main.py:524
 msgid "Cannot write KDM configuration file"
 msgstr "KDM tənzimləmə faylı yazıla bilmir"
@@ -420,14 +233,201 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "Ekran meneceri tənzimləmələri başa çatmadı"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "initramfs tənzimlənir."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "mkinitcpio tənzimlənir."
+
+#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:401
+#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
+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/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Quraşdırılma tarixi."
+
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr "OpenRC xidmətlərini tənzimləmək"
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr "{name!s} xidməti {level!s} işləmə səviyyəsinə əlavə edilə bilmir."
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr "{name!s} xidməti {level!s} iş səviyyəsindən silinə bilmir."
+
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+"{level!s} işləmə səviyyəsindəki {name!s} xidməti üçün naməlum "
+"{arg!s} xidmət fəaliyyəti."
+
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"rc-update {arg!s} chroot-da çağırışına {num!s} xəta kodu ilə "
+"cavab verildi."
+
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr "Hədəf işləmə səviyyəsi mövcud deyil"
+
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+"{level!s} işləmə səviyyəsi üçün {path!s} yolu mövcud deyil."
+
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr "Hədəf xidməti mövcud deyil"
+
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr "{name!s} üçün {path!s} yolu mövcud deyil."
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Plymouth mövzusu tənzimlənməsi"
+
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "Paketləri quraşdırmaq."
+
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "(%(count)d / %(total)d) paketləri işlənir"
+
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Bir paket quraşdırılır."
+msgstr[1] "%(num)d paket quraşdırılır."
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Bir paket silinir"
+msgstr[1] "%(num)d paket silinir."
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr "Paket meneceri xətası"
+
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+"Bu paket meneceri yenilənmələri hazırlaya bilmədi. 
{!s}
 əmri xəta"
+" kodu {!s} ilə cavab verdi."
+
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+"Paket meneceri sistemi yeniləyə bimədi. 
{!s}
 əmri xəta kodu {!s} "
+"ilə cavab verdi."
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+"Paket meneceri dəyişiklikləri sistemə tətbiq edə bilmədi. 
{!s}
 "
+"əmri xəta kodu {!s} ilə cavab verdi."
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Önyükləyici qurulur."
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr "Grub quraşdırılmadı, ümumi yaddaş üçün bölmələr təyin olunmayıb"
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr "Önyükləyicinin quraşdırılmasında xəta"
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
+"Önyükləyici quraşdırıla bilmədi. Quraşdırma əmri 
{!s}
, xəta kodu "
+"{!s} ilə cavab verdi."
 
 #: src/modules/hwclock/main.py:26
 msgid "Setting hardware clock."
 msgstr "Aparat saatını ayarlamaq."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Quraşdırılma tarixi."
+#: 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:28
+msgid "Writing fstab."
+msgstr "fstab yazılır."
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
+"İstifadə etmək üçün, 
{!s}
 tənzimləməsi, 
{!s}
 üçün "
+"göstərilməyib."
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Dummy python işi."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "{} Dummy python addımı"
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr "Lokallaşma tənzimlənir."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Şəbəkə ayarları saxlanılır."
diff --git a/lang/python/be/LC_MESSAGES/python.po b/lang/python/be/LC_MESSAGES/python.po
index 6e89c01bb..1c079d708 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: 2022-05-27 11:18+0200\n"
+"POT-Creation-Date: 2022-05-29 16:17+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Źmicier Turok , 2020\n"
 "Language-Team: Belarusian (https://www.transifex.com/calamares/teams/20061/be/)\n"
@@ -21,102 +21,92 @@ 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/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "Усталяваць пакункі."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Наладзіць GRUB."
 
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Апрацоўка пакункаў (%(count)d / %(total)d)"
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "Мантаванне раздзелаў."
 
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Усталёўка аднаго пакунка."
-msgstr[1] "Усталёўка %(num)d пакункаў."
-msgstr[2] "Усталёўка %(num)d пакункаў."
-msgstr[3] "Усталёўка%(num)d пакункаў."
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Выдаленне аднаго пакунка."
-msgstr[1] "Выдаленне %(num)d пакункаў."
-msgstr[2] "Выдаленне %(num)d пакункаў."
-msgstr[3] "Выдаленне %(num)d пакункаў."
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
 msgstr ""
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
 msgstr ""
 
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
 msgstr ""
 
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Захаванне сеткавай канфігурацыі."
-
-#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
-#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
-#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
 msgid "Configuration Error"
 msgstr "Памылка канфігурацыі"
 
-#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
-#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
-msgid "No root mount point is given for 
{!s}
 to use."
-msgstr "Каранёвы пункт мантавання для
{!s}
 не пададзены."
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Наладка mkinitcpio."
-
-#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
-#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
+#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
+#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:395
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr "Раздзелы для 
{!s}
 не вызначаныя."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Стварэнне initramfs праз mkinitfs."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Не атрымалася запусціць mkinitfs у пункце прызначэння"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Наладзіць службы systemd"
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Код выхаду {}"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Немагчыма наладзіць службу"
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Наладка OpenRC dmcrypt."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr "systemctl {arg!s} у chroot вярнуў код памылкі {num!s}."
+
+#: src/modules/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/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -182,174 +172,6 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr "Пункт прызначэння \"{}\" у мэтавай сістэме не з’яўляецца каталогам"
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Наладзіць службы systemd"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Немагчыма наладзіць службу"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr "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/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Задача Dummy python."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Крок Dummy python {}"
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Усталяваць загрузчык."
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr "Наладка лакаляў."
-
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr "Мантаванне раздзелаў."
-
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr ""
-
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr ""
-
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Наладзіць тэму Plymouth"
-
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr "Запіс fstab."
-
-#: src/modules/fstab/main.py:429
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr "Наладзіць службы OpenRC"
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr "Не атрымалася дадаць службу {name!s} на ўзровень запуску  {level!s}."
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr "Не атрымалася выдаліць службу {name!s} з узроўню запуску {level!s}."
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-"Невядомае дзеянне {arg!s} для службы {name!s} на ўзроўні "
-"запуску {level!s}."
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"rc-update {arg!s} пад chroot вярнуўся з кодам памылкі {num!s}."
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr "Мэтавы ўзровень запуску не існуе"
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr "Шлях {path!s} да ўзроўня запуску {level!s} не існуе."
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr "Мэтавая служба не існуе"
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr "Шлях {path!s} да службы {level!s} не існуе."
-
-#: 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/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Наладзіць GRUB."
-
 #: src/modules/displaymanager/main.py:524
 msgid "Cannot write KDM configuration file"
 msgstr "Немагчыма запісаць файл канфігурацыі KDM"
@@ -406,14 +228,192 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "Наладка дысплейнага кіраўніка не завершаная."
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Наладка initramfs."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Наладка mkinitcpio."
+
+#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:401
+#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr "Каранёвы пункт мантавання для
{!s}
 не пададзены."
+
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Усталёўка даных."
+
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr "Наладзіць службы OpenRC"
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr "Не атрымалася дадаць службу {name!s} на ўзровень запуску  {level!s}."
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr "Не атрымалася выдаліць службу {name!s} з узроўню запуску {level!s}."
+
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+"Невядомае дзеянне {arg!s} для службы {name!s} на ўзроўні "
+"запуску {level!s}."
+
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"rc-update {arg!s} пад chroot вярнуўся з кодам памылкі {num!s}."
+
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr "Мэтавы ўзровень запуску не існуе"
+
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr "Шлях {path!s} да ўзроўня запуску {level!s} не існуе."
+
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr "Мэтавая служба не існуе"
+
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr "Шлях {path!s} да службы {level!s} не існуе."
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Наладзіць тэму Plymouth"
+
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "Усталяваць пакункі."
+
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Апрацоўка пакункаў (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Усталёўка аднаго пакунка."
+msgstr[1] "Усталёўка %(num)d пакункаў."
+msgstr[2] "Усталёўка %(num)d пакункаў."
+msgstr[3] "Усталёўка%(num)d пакункаў."
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Выдаленне аднаго пакунка."
+msgstr[1] "Выдаленне %(num)d пакункаў."
+msgstr[2] "Выдаленне %(num)d пакункаў."
+msgstr[3] "Выдаленне %(num)d пакункаў."
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Усталяваць загрузчык."
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
 
 #: src/modules/hwclock/main.py:26
 msgid "Setting hardware clock."
 msgstr "Наладка апаратнага гадзінніка."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-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:28
+msgid "Writing fstab."
+msgstr "Запіс fstab."
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Задача Dummy python."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Крок Dummy python {}"
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr "Наладка лакаляў."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Захаванне сеткавай канфігурацыі."
diff --git a/lang/python/bg/LC_MESSAGES/python.po b/lang/python/bg/LC_MESSAGES/python.po
index 864fe9b84..1816f8f38 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: 2022-05-27 11:18+0200\n"
+"POT-Creation-Date: 2022-05-29 16:17+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Georgi Georgiev (Жоро) , 2022\n"
 "Language-Team: Bulgarian (https://www.transifex.com/calamares/teams/20061/bg/)\n"
@@ -21,98 +21,90 @@ msgstr ""
 "Language: bg\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "Инсталирай пакетите."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Конфигурирай GRUB."
 
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Обработване на пакетите (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Инсталиране на пакета."
-msgstr[1] "Инсталиране на %(num)d пакета."
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Премахване на пакета."
-msgstr[1] "Премахване на %(num)d пакета."
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
 msgstr ""
 
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
 msgstr ""
 
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
-#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
-#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
 msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
-#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
-msgid "No root mount point is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Конфигуриране на mkinitcpio."
-
-#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
-#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
+#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
+#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:395
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Конфигурирай systemd"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Услугата не може да се промени"
+
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-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/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Конфигуриране на услугата dmcrypt на OpenRC."
+#: 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/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -178,171 +170,6 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Конфигурирай systemd"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Услугата не може да се промени"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py: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/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Фиктивна задача на python."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Фиктивна стъпка на python {}"
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Инсталирай програма за начално зареждане."
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-"Инсталирането на grub е неуспешно – няма определени дялове в мястото за "
-"съхранение"
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr "Грешка при инсталирането на програмата за начално зареждане"
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr "Конфигуриране на локализацията."
-
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr ""
-
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr ""
-
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr ""
-
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Конфигурирай темата на Plymouth"
-
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr "Записване на fstab."
-
-#: src/modules/fstab/main.py:429
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr "Конфигурирай OpenRC"
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr "Услугата {name!s} не може да бъде добавена към run-level {level!s}."
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/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 ""
-
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Конфигурирай GRUB."
-
 #: src/modules/displaymanager/main.py:524
 msgid "Cannot write KDM configuration file"
 msgstr "Конфигурационният файл на KDM не може да бъде записан"
@@ -397,14 +224,187 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Конфигуриране на initramfs."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Конфигуриране на mkinitcpio."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:401
+#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
+msgid "No root mount point is given for 
{!s}
 to use."
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr ""
+
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr "Конфигурирай OpenRC"
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr "Услугата {name!s} не може да бъде добавена към run-level {level!s}."
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Конфигурирай темата на Plymouth"
+
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "Инсталирай пакетите."
+
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Обработване на пакетите (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Инсталиране на пакета."
+msgstr[1] "Инсталиране на %(num)d пакета."
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Премахване на пакета."
+msgstr[1] "Премахване на %(num)d пакета."
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Инсталирай програма за начално зареждане."
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+"Инсталирането на grub е неуспешно – няма определени дялове в мястото за "
+"съхранение"
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr "Грешка при инсталирането на програмата за начално зареждане"
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr ""
+
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr ""
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr ""
+
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "Изходният код е {}"
+
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Създаване на initramfs с dracut."
+
+#: 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 "Конфигуриране на initramfs."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Конфигуриране на услугата dmcrypt на OpenRC."
+
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr "Записване на fstab."
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Фиктивна задача на python."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Фиктивна стъпка на python {}"
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr "Конфигуриране на локализацията."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr ""
diff --git a/lang/python/bn/LC_MESSAGES/python.po b/lang/python/bn/LC_MESSAGES/python.po
index 092f8bc39..e9b56c068 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: 2022-05-27 11:18+0200\n"
+"POT-Creation-Date: 2022-05-29 16:17+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: 508a8b0ef95404aa3dc5178f0ccada5e_017b8a4 , 2020\n"
 "Language-Team: Bengali (https://www.transifex.com/calamares/teams/20061/bn/)\n"
@@ -21,97 +21,90 @@ msgstr ""
 "Language: bn\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "কনফিগার করুন জিআরইউবি।"
+
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "মাউন্ট করছে পার্টিশনগুলো।"
+
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
 msgstr ""
 
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
 msgstr ""
 
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
 msgstr ""
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
 msgstr ""
 
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr ""
-
-#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
-#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
-#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
 msgid "Configuration Error"
 msgstr "কনফিগারেশন ত্রুটি"
 
-#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
-#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
-msgid "No root mount point is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr ""
-
-#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
-#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
+#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
+#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:395
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr "কোন পার্টিশন নির্দিষ্ট করা হয়নি
{!এস}
 ব্যবহার করার জন্য।"
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "কনফিগার করুন সিস্টেমডি সেবাগুলি"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "সেবা পরিবর্তন করতে পারে না"
+
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"সিস্টেমসিটিএল {এআরজি!এস}সিএইচরুট ফেরত ত্রুটি কোড দে{NUM! গুলি}।"
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: 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/unpackfs/main.py:34
@@ -178,170 +171,6 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "কনফিগার করুন সিস্টেমডি সেবাগুলি"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "সেবা পরিবর্তন করতে পারে না"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"সিস্টেমসিটিএল {এআরজি!এস}সিএইচরুট ফেরত ত্রুটি কোড দে{NUM! গুলি}।"
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py: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/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr ""
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr ""
-
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr "মাউন্ট করছে পার্টিশনগুলো।"
-
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr ""
-
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr ""
-
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr ""
-
-#: src/modules/fstab/main.py:429
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/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/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "কনফিগার করুন জিআরইউবি।"
-
 #: src/modules/displaymanager/main.py:524
 msgid "Cannot write KDM configuration file"
 msgstr ""
@@ -396,14 +225,185 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:401
+#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr ""
+
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr ""
+
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr ""
+
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr ""
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
 msgstr ""
 
 #: src/modules/hwclock/main.py:26
 msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: 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:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr ""
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/ca/LC_MESSAGES/python.po b/lang/python/ca/LC_MESSAGES/python.po
index 2336e78a5..2e75cdc45 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: 2022-05-27 11:18+0200\n"
+"POT-Creation-Date: 2022-05-29 16:17+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Davidmp , 2022\n"
 "Language-Team: Catalan (https://www.transifex.com/calamares/teams/20061/ca/)\n"
@@ -21,105 +21,95 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "Instal·la els paquets."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Configura el GRUB."
 
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Es processen paquets (%(count)d / %(total)d)"
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "Es munten les particions."
 
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "S'instal·la un paquet."
-msgstr[1] "S'instal·len %(num)d paquets."
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr "Error intern en muntar els conjunts de dades zfs"
 
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Se suprimeix un paquet."
-msgstr[1] "Se suprimeixen %(num)d paquets."
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr "No s'ha pogut importar zpool."
 
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr "Error del gestor de paquets"
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr "No s'ha pogut desblocar zpool."
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-"El gestor de paquets no ha pogut preparar les actualitzacions. "
-"L'ordre
{!s}
 ha retornat el codi d'error {!s}."
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr "No s'ha pogut establir el punt de muntatge de zfs."
 
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-"El gestor de paquets no ha pogut actualitzar el sistema. L'ordre "
-"
{!s}
 ha retornat el codi d'error {!s}."
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-"El gestor de paquets no ha pogut fer canvis al sistema instal·lat. L'ordre "
-"
{!s}
 ha retornat el codi d'error {!s}."
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Es desa la configuració de la xarxa."
-
-#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
-#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
-#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
 msgid "Configuration Error"
 msgstr "Error de configuració"
 
-#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
-#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
-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/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Es configura mkinitcpio."
-
-#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
-#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
+#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
+#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:395
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr "No s'han definit particions perquè les usi 
{!s}
."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Es creen initramfs amb mkinitfs."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr "error de muntatge de zfs"
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Ha fallat executar mkinitfs a la destinació."
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Configura els serveis de systemd"
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "El codi de sortida ha estat {}"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "No es pot modificar el servei."
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Es configura el sevei OpenRC dmcrypt."
+#: 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 ""
+"No es pot habilitar el temporitzador de systemd {name!s}."
+
+#: 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/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -187,187 +177,6 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr "La destinació \"{}\" al sistema de destinació no és un directori."
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Configura els serveis de systemd"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "No es pot modificar el servei."
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"La crida de systemctl {arg!s} a chroot ha retornat el codi "
-"d'error {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py: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 ""
-"No es pot habilitar el temporitzador de systemd {name!s}."
-
-#: 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/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Tasca de python fictícia."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Pas de python fitctici {}"
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "S'instal·la el carregador d'arrencada."
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-"No s'ha pogut instal·lar el grub. No s'han definit particions a "
-"l'emmagatzematge global."
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr "Error d'instal·lació del carregador d'arrencada"
-
-#: src/modules/bootloader/main.py:783
-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:31
-msgid "Configuring locales."
-msgstr "Es configuren les llengües."
-
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr "Es munten les particions."
-
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr "Error intern en muntar els conjunts de dades zfs"
-
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr "No s'ha pogut importar zpool."
-
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr "No s'ha pogut desblocar zpool."
-
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr "No s'ha pogut establir el punt de muntatge de zfs."
-
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr "error de muntatge de zfs"
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Configura el tema del Plymouth"
-
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr "S'escriu fstab."
-
-#: src/modules/fstab/main.py:429
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-"No hi ha cap configuració de 
{!s}
 perquè la usi 
{!s}
."
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr "Configura els serveis d'OpenRC"
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr "No es pot afegir el servei {name!s} al nivell d'execució {level!s}."
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr ""
-"No es pot suprimir el servei {name!s} del nivell d'execució {level!s}."
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-"Servei - acció desconeguda {arg!s} per al servei {name!s} al "
-"nivell d'execució {level!s}."
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"La crida de rc-update {arg!s} a chroot ha retornat el codi "
-"d'error {num!s}."
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr "El nivell d'execució de destinació no existeix."
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-"El camí per al nivell d'execució {level!s} és {path!s}, però no"
-" existeix."
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr "El servei de destinació no existeix."
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-"El camí per al servei {name!s} és {path!s}, però no existeix."
-
-#: src/modules/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/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Configura el GRUB."
-
 #: src/modules/displaymanager/main.py:524
 msgid "Cannot write KDM configuration file"
 msgstr "No es pot escriure el fitxer de configuració del KDM."
@@ -425,14 +234,205 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "La configuració del gestor de pantalla no era completa."
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Es configuren initramfs."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Es configura mkinitcpio."
+
+#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:401
+#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
+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/rawfs/main.py:26
+msgid "Installing data."
+msgstr "S'instal·len dades."
+
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr "Configura els serveis d'OpenRC"
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr "No es pot afegir el servei {name!s} al nivell d'execució {level!s}."
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr ""
+"No es pot suprimir el servei {name!s} del nivell d'execució {level!s}."
+
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+"Servei - acció desconeguda {arg!s} per al servei {name!s} al "
+"nivell d'execució {level!s}."
+
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"La crida de rc-update {arg!s} a chroot ha retornat el codi "
+"d'error {num!s}."
+
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr "El nivell d'execució de destinació no existeix."
+
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+"El camí per al nivell d'execució {level!s} és {path!s}, però no"
+" existeix."
+
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr "El servei de destinació no existeix."
+
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+"El camí per al servei {name!s} és {path!s}, però no existeix."
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Configura el tema del Plymouth"
+
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "Instal·la els paquets."
+
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Es processen paquets (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "S'instal·la un paquet."
+msgstr[1] "S'instal·len %(num)d paquets."
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Se suprimeix un paquet."
+msgstr[1] "Se suprimeixen %(num)d paquets."
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr "Error del gestor de paquets"
+
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+"El gestor de paquets no ha pogut preparar les actualitzacions. "
+"L'ordre
{!s}
 ha retornat el codi d'error {!s}."
+
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+"El gestor de paquets no ha pogut actualitzar el sistema. L'ordre "
+"
{!s}
 ha retornat el codi d'error {!s}."
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+"El gestor de paquets no ha pogut fer canvis al sistema instal·lat. L'ordre "
+"
{!s}
 ha retornat el codi d'error {!s}."
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "S'instal·la el carregador d'arrencada."
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+"No s'ha pogut instal·lar el grub. No s'han definit particions a "
+"l'emmagatzematge global."
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr "Error d'instal·lació del carregador d'arrencada"
+
+#: src/modules/bootloader/main.py:783
+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/hwclock/main.py:26
 msgid "Setting hardware clock."
 msgstr "S'estableix el rellotge del maquinari."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "S'instal·len dades."
+#: 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:28
+msgid "Writing fstab."
+msgstr "S'escriu fstab."
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
+"No hi ha cap configuració de 
{!s}
 perquè la usi 
{!s}
."
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Tasca de python fictícia."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Pas de python fitctici {}"
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr "Es configuren les llengües."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Es desa la configuració de la xarxa."
diff --git a/lang/python/ca@valencia/LC_MESSAGES/python.po b/lang/python/ca@valencia/LC_MESSAGES/python.po
index f5a80d134..f32fa68f5 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: 2022-05-27 11:18+0200\n"
+"POT-Creation-Date: 2022-05-29 16:17+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Raul , 2021\n"
 "Language-Team: Catalan (Valencian) (https://www.transifex.com/calamares/teams/20061/ca@valencia/)\n"
@@ -21,99 +21,94 @@ msgstr ""
 "Language: ca@valencia\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "Instal·la els paquets."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Configura el GRUB"
 
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "S'estan processant els paquets (%(count)d / %(total)d)"
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "S'estan muntant les particions."
 
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "S'està instal·lant un paquet."
-msgstr[1] "S'està instal·lant %(num)d paquets."
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "S’està eliminant un paquet."
-msgstr[1] "S’està eliminant %(num)d paquets."
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
 msgstr ""
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
 msgstr ""
 
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
 msgstr ""
 
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "S'està guardant la configuració de la xarxa."
-
-#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
-#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
-#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
 msgid "Configuration Error"
 msgstr "S'ha produït un error en la configuració."
 
-#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
-#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
-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/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "S'està configurant mkinitcpio."
-
-#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
-#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
+#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
+#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:395
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr "No s'han definit particions perquè les use 
{!s}
."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Creació d’initramfs amb mkinitfs."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr ""
 
-#: 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/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Configura els serveis de systemd"
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "El codi d'eixida ha estat {}"
+#: 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/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Configuració del servei OpenRC dmcrypt."
+#: 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/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -179,181 +174,6 @@ msgstr ""
 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/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Configura els serveis de systemd"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "No es pot modificar el servei."
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"La crida de systemctl {arg!s} a chroot ha retornat el codi "
-"d'error {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py: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/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Tasca de python de proves."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Pas de python de proves {}"
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Instal·la el carregador d'arrancada."
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr "Configuració d’idioma."
-
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr "S'estan muntant les particions."
-
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr ""
-
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr ""
-
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Configura el tema del Plymouth"
-
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr "Escriptura d’fstab."
-
-#: src/modules/fstab/main.py:429
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr "Configura els serveis d'OpenRC"
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr "No es pot afegir el servei {name!s} al nivell d'execució {level!s}."
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr ""
-"No es pot suprimir el servei {name!s} del nivell d'execució {level!s}."
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-"Servei - acció desconeguda {arg!s} per al servei {name!s} al "
-"nivell d'execució {level!s}."
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"La crida de rc-update {arg!s} a chroot ha retornat el codi "
-"d'error {num!s}."
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr "El nivell d'execució de destinació no existeix."
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-"El camí per al nivell d'execució {level!s} és {path!s}, però no"
-" existeix."
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr "El servei de destinació no existeix."
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-"El camí per al servei {name!s} és {path!s}, però no existeix."
-
-#: src/modules/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/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Configura el GRUB"
-
 #: src/modules/displaymanager/main.py:524
 msgid "Cannot write KDM configuration file"
 msgstr "No es pot escriure el fitxer de configuració del KDM."
@@ -411,14 +231,194 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "La configuració del gestor de pantalla no era completa."
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Es configuren initramfs."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "S'està configurant mkinitcpio."
+
+#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:401
+#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
+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/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"
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr "No es pot afegir el servei {name!s} al nivell d'execució {level!s}."
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr ""
+"No es pot suprimir el servei {name!s} del nivell d'execució {level!s}."
+
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+"Servei - acció desconeguda {arg!s} per al servei {name!s} al "
+"nivell d'execució {level!s}."
+
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"La crida de rc-update {arg!s} a chroot ha retornat el codi "
+"d'error {num!s}."
+
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr "El nivell d'execució de destinació no existeix."
+
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+"El camí per al nivell d'execució {level!s} és {path!s}, però no"
+" existeix."
+
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr "El servei de destinació no existeix."
+
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+"El camí per al servei {name!s} és {path!s}, però no existeix."
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Configura el tema del Plymouth"
+
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "Instal·la els paquets."
+
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "S'estan processant els paquets (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "S'està instal·lant un paquet."
+msgstr[1] "S'està instal·lant %(num)d paquets."
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "S’està eliminant un paquet."
+msgstr[1] "S’està eliminant %(num)d paquets."
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Instal·la el carregador d'arrancada."
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
 
 #: src/modules/hwclock/main.py:26
 msgid "Setting hardware clock."
 msgstr "Configuració del rellotge del maquinari."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "S'estan instal·lant les dades."
+#: 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:28
+msgid "Writing fstab."
+msgstr "Escriptura d’fstab."
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Tasca de python de proves."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Pas de python de proves {}"
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr "Configuració d’idioma."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "S'està guardant la configuració de la xarxa."
diff --git a/lang/python/cs_CZ/LC_MESSAGES/python.po b/lang/python/cs_CZ/LC_MESSAGES/python.po
index c765c28ad..6788e436b 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: 2022-05-27 11:18+0200\n"
+"POT-Creation-Date: 2022-05-29 16:17+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Pavel Borecki , 2022\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/calamares/teams/20061/cs_CZ/)\n"
@@ -23,108 +23,93 @@ 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/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "Nainstalovat balíčky."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Nastavování zavaděče GRUB."
 
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Zpracovávání balíčků (%(count)d / %(total)d)"
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "Připojování oddílů."
 
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Je instalován jeden balíček."
-msgstr[1] "Jsou instalovány %(num)d balíčky."
-msgstr[2] "Je instalováno %(num)d balíčků."
-msgstr[3] "Je instalováno %(num)d balíčků."
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr "Vnitřní chyba při připojování zfs datových sad"
 
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Odebírá se jeden balíček."
-msgstr[1] "Odebírají se %(num)d balíčky."
-msgstr[2] "Odebírá se %(num)d balíčků."
-msgstr[3] "Odebírá se %(num)d balíčků."
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr "Nepodařilo se naimportovat zfs fond"
 
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr "Chyba nástroje pro správu balíčků"
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr "Nepodařilo se odemknout zfs fond"
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-"Nástroji pro správu balíčků se nepodařilo připravit aktualizace. Příkaz "
-"
{!s}
 vrátil chybový kód {!s}."
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr "Nepodařilo se nastavit zfs přípojný bod"
 
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-"Nástroji pro správu balíčků se nepodařilo aktualizovat systém. Příkaz "
-"
{!s}
 vrátil chybový kód {!s}."
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-"Nástroji pro správu balíčků se nepodařilo udělat změny v instalovaném "
-"systému. Příkaz 
{!s}
 vrátil chybový kód {!s}."
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Ukládání nastavení sítě."
-
-#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
-#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
-#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
 msgid "Configuration Error"
 msgstr "Chyba nastavení"
 
-#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
-#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
-msgid "No root mount point is given for 
{!s}
 to use."
-msgstr "Pro 
{!s}
 není zadán žádný přípojný bod."
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Nastavování mkinitcpio."
-
-#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
-#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
+#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
+#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:395
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr "Pro 
{!s}
 nejsou zadány žádné oddíly."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Vytváření initramfs nástrojem mkinitfs."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr "Chyba při připojování zfs"
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Na cíli se nepodařilo spustit mkinitfs"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Nastavit služby systemd"
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Návratový kód byl {}"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Službu se nedaří upravit"
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Nastavování služby OpenRC dmcrypt."
+#: 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 "Nedaří se zapnout systemd časovač {name!s}."
+
+#: 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/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -194,187 +179,6 @@ msgstr ""
 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/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Nastavit služby systemd"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Službu se nedaří upravit"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"Volání systemctl {arg!s} v chroot vrátilo chybový kód {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py: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 "Nedaří se zapnout systemd časovač {name!s}."
-
-#: 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/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Testovací úloha python."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Testovací krok {} python."
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Instalace zavaděče systému."
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-"Nepodařilo se nainstalovat zavaděč grub – v globálním úložišti nejsou "
-"definovány žádné oddíly"
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr "Chyba při instalaci zavaděče systému"
-
-#: src/modules/bootloader/main.py:783
-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:31
-msgid "Configuring locales."
-msgstr "Nastavování místních a jazykových nastavení."
-
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr "Připojování oddílů."
-
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr "Vnitřní chyba při připojování zfs datových sad"
-
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr "Nepodařilo se naimportovat zfs fond"
-
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr "Nepodařilo se odemknout zfs fond"
-
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr "Nepodařilo se nastavit zfs přípojný bod"
-
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr "Chyba při připojování zfs"
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Nastavit téma vzhledu pro Plymouth"
-
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr "Zapisování fstab."
-
-#: src/modules/fstab/main.py:429
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-"Pro 
{!s}
 není zadáno žádné nastavení 
{!s}
, které "
-"použít. "
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr "Nastavit OpenRC služby"
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr ""
-"Nedaří se přidat službu {name!s} do úrovně chodu (runlevel) {level!s}."
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr ""
-"Nedaří se odebrat službu {name!s} z úrovně chodu (runlevel) {level!s}."
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-"Neznámá akce služby {arg!s} pro službu {name!s} v úrovni chodu "
-"(runlevel) {level!s}."
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"rc-update {arg!s} volání v chroot vrátilo kód chyby {num!s}."
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr "Cílová úroveň chodu (runlevel) neexistuje"
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-"Popis umístění pro úroveň chodu (runlevel) {level!s} je "
-"{path!s}, keterá neexistuje."
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr "Cílová služba neexistuje"
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-"Popis umístění pro službu {name!s} je {path!s}, která "
-"neexistuje."
-
-#: 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/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Nastavování zavaděče GRUB."
-
 #: src/modules/displaymanager/main.py:524
 msgid "Cannot write KDM configuration file"
 msgstr "Nedaří se zapsat soubor s nastaveními pro KDM"
@@ -431,14 +235,210 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "Nastavení správce displeje nebylo úplné"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Nastavování initramfs."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Nastavování mkinitcpio."
+
+#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:401
+#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr "Pro 
{!s}
 není zadán žádný přípojný bod."
+
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Instalace dat."
+
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr "Nastavit OpenRC služby"
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr ""
+"Nedaří se přidat službu {name!s} do úrovně chodu (runlevel) {level!s}."
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr ""
+"Nedaří se odebrat službu {name!s} z úrovně chodu (runlevel) {level!s}."
+
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+"Neznámá akce služby {arg!s} pro službu {name!s} v úrovni chodu "
+"(runlevel) {level!s}."
+
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"rc-update {arg!s} volání v chroot vrátilo kód chyby {num!s}."
+
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr "Cílová úroveň chodu (runlevel) neexistuje"
+
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+"Popis umístění pro úroveň chodu (runlevel) {level!s} je "
+"{path!s}, keterá neexistuje."
+
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr "Cílová služba neexistuje"
+
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+"Popis umístění pro službu {name!s} je {path!s}, která "
+"neexistuje."
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Nastavit téma vzhledu pro Plymouth"
+
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "Nainstalovat balíčky."
+
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Zpracovávání balíčků (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Je instalován jeden balíček."
+msgstr[1] "Jsou instalovány %(num)d balíčky."
+msgstr[2] "Je instalováno %(num)d balíčků."
+msgstr[3] "Je instalováno %(num)d balíčků."
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Odebírá se jeden balíček."
+msgstr[1] "Odebírají se %(num)d balíčky."
+msgstr[2] "Odebírá se %(num)d balíčků."
+msgstr[3] "Odebírá se %(num)d balíčků."
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr "Chyba nástroje pro správu balíčků"
+
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+"Nástroji pro správu balíčků se nepodařilo připravit aktualizace. Příkaz "
+"
{!s}
 vrátil chybový kód {!s}."
+
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+"Nástroji pro správu balíčků se nepodařilo aktualizovat systém. Příkaz "
+"
{!s}
 vrátil chybový kód {!s}."
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+"Nástroji pro správu balíčků se nepodařilo udělat změny v 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/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+"Nepodařilo se nainstalovat zavaděč grub – v globálním úložišti nejsou "
+"definovány žádné oddíly"
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr "Chyba při instalaci zavaděče systému"
+
+#: src/modules/bootloader/main.py:783
+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/hwclock/main.py:26
 msgid "Setting hardware clock."
 msgstr "Nastavování hardwarových hodin."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Instalace dat."
+#: 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:28
+msgid "Writing fstab."
+msgstr "Zapisování fstab."
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
+"Pro 
{!s}
 není zadáno žádné nastavení 
{!s}
, které "
+"použít. "
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Testovací úloha python."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Testovací krok {} python."
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr "Nastavování místních a jazykových nastavení."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Ukládání nastavení sítě."
diff --git a/lang/python/da/LC_MESSAGES/python.po b/lang/python/da/LC_MESSAGES/python.po
index 05e081e27..0a3c67a1b 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: 2022-05-27 11:18+0200\n"
+"POT-Creation-Date: 2022-05-29 16:17+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: scootergrisen, 2020\n"
 "Language-Team: Danish (https://www.transifex.com/calamares/teams/20061/da/)\n"
@@ -22,99 +22,93 @@ msgstr ""
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "Installér pakker."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Konfigurer GRUB."
 
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Forarbejder pakker (%(count)d / %(total)d)"
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "Monterer partitioner."
 
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Installerer én pakke."
-msgstr[1] "Installerer %(num)d pakker."
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Fjerner én pakke."
-msgstr[1] "Fjerner %(num)d pakker."
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
 msgstr ""
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
 msgstr ""
 
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
 msgstr ""
 
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Gemmer netværkskonfiguration."
-
-#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
-#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
-#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
 msgid "Configuration Error"
 msgstr "Fejl ved konfiguration"
 
-#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
-#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
-msgid "No root mount point is given for 
{!s}
 to use."
-msgstr ""
-"Der er ikke angivet noget rodmonteringspunkt som 
{!s}
 kan bruge."
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Konfigurerer mkinitcpio."
-
-#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
-#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
+#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
+#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:395
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr "Der er ikke angivet nogle partitioner som 
{!s}
 kan bruge."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Opretter initramfs med mkinitfs."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr ""
 
-#: 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/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Konfigurer systemd-tjenester"
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Afslutningskoden var {}"
+#: 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/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Konfigurerer OpenRC dmcrypt-tjeneste."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"systemctl {arg!s}-kald i chroot returnerede fejlkoden {num!s}."
+
+#: src/modules/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/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -180,178 +174,6 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr "Destinationen \"{}\" i målsystemet er ikke en mappe"
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Konfigurer systemd-tjenester"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Kan ikke redigere tjeneste"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"systemctl {arg!s}-kald i chroot returnerede fejlkoden {num!s}."
-
-#: src/modules/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/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Dummy python-job."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Dummy python-trin {}"
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Installér bootloader."
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr "Konfigurerer lokaliteter."
-
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr "Monterer partitioner."
-
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr ""
-
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr ""
-
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Konfigurer Plymouth-tema"
-
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr "Skriver fstab."
-
-#: src/modules/fstab/main.py:429
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr "Konfigurer OpenRC-tjenester"
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr "Kan ikke tilføje tjenesten {name!s} til kørselsniveauet {level!s}."
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr "Kan ikke fjerne tjenesten {name!s} fra kørselsniveauet {level!s}."
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-"Ukendt tjenestehandling {arg!s} til tjenesten {name!s} i "
-"kørselsniveauet {level!s}."
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"rc-update {arg!s}-kald i chroot returnerede fejlkoden {num!s}."
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr "Målkørselsniveau findes ikke"
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-"Stien til kørselsniveauet {level!s} er {path!s}, som ikke "
-"findes."
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr "Måltjenesten findes ikke"
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-"Stien til tjenesten {name!s} er {path!s}, som ikke findes."
-
-#: 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/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Konfigurer GRUB."
-
 #: src/modules/displaymanager/main.py:524
 msgid "Cannot write KDM configuration file"
 msgstr "Kan ikke skrive KDM-konfigurationsfil"
@@ -409,14 +231,192 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "Displayhåndtering-konfiguration er ikke komplet"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Konfigurerer initramfs."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Konfigurerer mkinitcpio."
+
+#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:401
+#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+"Der er ikke angivet noget rodmonteringspunkt som 
{!s}
 kan bruge."
+
+#: 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"
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr "Kan ikke tilføje tjenesten {name!s} til kørselsniveauet {level!s}."
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr "Kan ikke fjerne tjenesten {name!s} fra kørselsniveauet {level!s}."
+
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+"Ukendt tjenestehandling {arg!s} til tjenesten {name!s} i "
+"kørselsniveauet {level!s}."
+
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"rc-update {arg!s}-kald i chroot returnerede fejlkoden {num!s}."
+
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr "Målkørselsniveau findes ikke"
+
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+"Stien til kørselsniveauet {level!s} er {path!s}, som ikke "
+"findes."
+
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr "Måltjenesten findes ikke"
+
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+"Stien til tjenesten {name!s} er {path!s}, som ikke findes."
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Konfigurer Plymouth-tema"
+
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "Installér pakker."
+
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Forarbejder pakker (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Installerer én pakke."
+msgstr[1] "Installerer %(num)d pakker."
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Fjerner én pakke."
+msgstr[1] "Fjerner %(num)d pakker."
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Installér bootloader."
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
 
 #: src/modules/hwclock/main.py:26
 msgid "Setting hardware clock."
 msgstr "Indstiller hardwareur."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Installerer data."
+#: 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:28
+msgid "Writing fstab."
+msgstr "Skriver fstab."
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Dummy python-job."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Dummy python-trin {}"
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr "Konfigurerer lokaliteter."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Gemmer netværkskonfiguration."
diff --git a/lang/python/de/LC_MESSAGES/python.po b/lang/python/de/LC_MESSAGES/python.po
index 03803d311..c4da5054f 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: 2022-05-27 11:18+0200\n"
+"POT-Creation-Date: 2022-05-29 16:17+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Gustav Gyges, 2022\n"
 "Language-Team: German (https://www.transifex.com/calamares/teams/20061/de/)\n"
@@ -23,106 +23,94 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "Pakete installieren "
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "GRUB konfigurieren."
 
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Verarbeite Pakete (%(count)d / %(total)d)"
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "Hänge Partitionen ein."
 
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Installiere ein Paket"
-msgstr[1] "Installiere %(num)d Pakete."
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr "Interner Fehler beim Einhängen des ZFS-Datensets"
 
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Entferne ein Paket"
-msgstr[1] "Entferne %(num)d Pakete."
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr "Zpool konnte nicht importiert werden"
 
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr "Fehler im Paketmanager"
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr "Zpool konnte nicht entsperrt werden"
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-"Der Paketmanager konnte die Aktualisierungen nicht vorbereiten. Der Befehl "
-"
{!s}
 erzeugte Fehlercode {!s}."
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr "Zpool-Einhängepunkt konnte nicht gesetzt werden"
 
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-"Der Paketmanager konnte das System nicht aktualisieren. Der Befehl "
-"
{!s}
 erzeugte Fehlercode {!s}."
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-"Der Paketmanager konnte das installierte System nicht verändern. Der Befehl "
-"
{!s}
 erzeugte Fehlercode {!s}."
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Speichere Netzwerkkonfiguration."
-
-#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
-#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
-#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
 msgid "Configuration Error"
 msgstr "Konfigurationsfehler"
 
-#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
-#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
-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/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Konfiguriere mkinitcpio. "
-
-#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
-#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
+#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
+#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:395
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr "Für 
{!s}
 sind keine zu verwendenden Partitionen definiert."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Erstelle initramfs mit mkinitfs."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr "Fehler beim Einhängen von ZFS"
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Ausführung von mkinitfs auf dem Ziel fehlgeschlagen."
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Konfiguriere systemd-Dienste"
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Der Exit-Code war {}"
+#: 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/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Konfiguriere den dmcrypt-Dienst von OpenRC."
+#: 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 "Systemd-Timer {name!s} kann nicht aktiviert werden."
+
+#: 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/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -192,187 +180,6 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr "Das Ziel \"{}\" im Zielsystem ist kein Verzeichnis"
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Konfiguriere systemd-Dienste"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Der Dienst kann nicht geändert werden."
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"systemctl {arg!s} Aufruf in chroot lieferte Fehlercode {num!s} "
-"zurück."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py: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 "Systemd-Timer {name!s} kann nicht aktiviert werden."
-
-#: 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/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Dummy Python-Job"
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Dummy Python-Schritt {}"
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Installiere Bootloader."
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-"Grub konnte nicht installiert werden, keine Partitionen im globalen Speicher"
-" definiert."
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr "Fehler beim Installieren des Bootloaders"
-
-#: src/modules/bootloader/main.py:783
-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:31
-msgid "Configuring locales."
-msgstr "Konfiguriere Lokalisierungen."
-
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr "Hänge Partitionen ein."
-
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr "Interner Fehler beim Einhängen des ZFS-Datensets"
-
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr "Zpool konnte nicht importiert werden"
-
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr "Zpool konnte nicht entsperrt werden"
-
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr "Zpool-Einhängepunkt konnte nicht gesetzt werden"
-
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr "Fehler beim Einhängen von ZFS"
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Konfiguriere Plymouth-Thema"
-
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr "Schreibe fstab."
-
-#: src/modules/fstab/main.py:429
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-"Keine 
{!s}
 Konfiguration gegeben die 
{!s}
 benutzen "
-"könnte."
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr "Konfiguriere OpenRC-Dienste"
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr "Kann den Dienst {name!s} nicht zu Runlevel {level!s} hinzufügen."
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr "Kann den Dienst {name!s} nicht aus Runlevel {level!s} entfernen."
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-"Unbekannte Aktion {arg!s} für Dienst {name!s} in Runlevel "
-"{level!s}."
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"rc-update {arg!s} Aufruf in chroot lieferte Fehlercode {num!s} "
-"zurück."
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr "Vorgesehenes Runlevel existiert nicht"
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-"Der Pfad für Runlevel {level!s} ist {path!s}, welcher nicht "
-"existiert."
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr "Der vorgesehene Dienst existiert nicht"
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-"Der Pfad für den Dienst {name!s} is {path!s}, welcher nicht "
-"existiert."
-
-#: src/modules/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/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "GRUB konfigurieren."
-
 #: src/modules/displaymanager/main.py:524
 msgid "Cannot write KDM configuration file"
 msgstr "Schreiben der KDM-Konfigurationsdatei nicht möglich"
@@ -429,14 +236,207 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "Die Konfiguration des Displaymanager war unvollständig."
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Konfiguriere initramfs."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Konfiguriere mkinitcpio. "
+
+#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:401
+#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
+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/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Installiere Daten."
+
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr "Konfiguriere OpenRC-Dienste"
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr "Kann den Dienst {name!s} nicht zu Runlevel {level!s} hinzufügen."
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr "Kann den Dienst {name!s} nicht aus Runlevel {level!s} entfernen."
+
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+"Unbekannte Aktion {arg!s} für Dienst {name!s} in Runlevel "
+"{level!s}."
+
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"rc-update {arg!s} Aufruf in chroot lieferte Fehlercode {num!s} "
+"zurück."
+
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr "Vorgesehenes Runlevel existiert nicht"
+
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+"Der Pfad für Runlevel {level!s} ist {path!s}, welcher nicht "
+"existiert."
+
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr "Der vorgesehene Dienst existiert nicht"
+
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+"Der Pfad für den Dienst {name!s} is {path!s}, welcher nicht "
+"existiert."
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Konfiguriere Plymouth-Thema"
+
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "Pakete installieren "
+
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Verarbeite Pakete (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Installiere ein Paket"
+msgstr[1] "Installiere %(num)d Pakete."
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Entferne ein Paket"
+msgstr[1] "Entferne %(num)d Pakete."
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr "Fehler im Paketmanager"
+
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+"Der Paketmanager konnte die Aktualisierungen nicht vorbereiten. Der Befehl "
+"
{!s}
 erzeugte Fehlercode {!s}."
+
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+"Der Paketmanager konnte das System nicht aktualisieren. Der Befehl "
+"
{!s}
 erzeugte Fehlercode {!s}."
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+"Der Paketmanager konnte das installierte System nicht verändern. Der Befehl "
+"
{!s}
 erzeugte Fehlercode {!s}."
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Installiere Bootloader."
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+"Grub konnte nicht installiert werden, keine Partitionen im globalen Speicher"
+" definiert."
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr "Fehler beim Installieren des Bootloaders"
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
+"Der Bootloader konnte nicht installiert werden. Der Installationsbefehl "
+"
{!s}
 erzeugte Fehlercode {!s}."
 
 #: src/modules/hwclock/main.py:26
 msgid "Setting hardware clock."
 msgstr "Einstellen der Hardware-Uhr."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Installiere Daten."
+#: 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:28
+msgid "Writing fstab."
+msgstr "Schreibe fstab."
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
+"Keine 
{!s}
 Konfiguration gegeben die 
{!s}
 benutzen "
+"könnte."
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Dummy Python-Job"
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Dummy Python-Schritt {}"
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr "Konfiguriere Lokalisierungen."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Speichere Netzwerkkonfiguration."
diff --git a/lang/python/el/LC_MESSAGES/python.po b/lang/python/el/LC_MESSAGES/python.po
index 852b9a132..37fdd6641 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: 2022-05-27 11:18+0200\n"
+"POT-Creation-Date: 2022-05-29 16:17+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Efstathios Iosifidis , 2022\n"
 "Language-Team: Greek (https://www.transifex.com/calamares/teams/20061/el/)\n"
@@ -21,97 +21,89 @@ msgstr ""
 "Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "εγκατάσταση πακέτων."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Ρύθμιση GRUB."
 
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "Προσάρτηση κατατμήσεων."
+
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
 msgstr ""
 
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr "Σφάλμα διαχειριστή πακέτων"
-
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
 msgstr ""
 
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
 msgstr ""
 
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr ""
-
-#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
-#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
-#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
 msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
-#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
-msgid "No root mount point is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr ""
-
-#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
-#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
+#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
+#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:395
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/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/unpackfs/main.py:34
@@ -178,169 +170,6 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr ""
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr ""
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py: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/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr ""
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr ""
-
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr "Προσάρτηση κατατμήσεων."
-
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr ""
-
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr ""
-
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr "Εγγραγή fstab."
-
-#: src/modules/fstab/main.py:429
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/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/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Ρύθμιση GRUB."
-
 #: src/modules/displaymanager/main.py:524
 msgid "Cannot write KDM configuration file"
 msgstr ""
@@ -395,14 +224,185 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:401
+#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Εγκατάσταση δεδομένων."
+
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr ""
+
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "εγκατάσταση πακέτων."
+
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr ""
+
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr "Σφάλμα διαχειριστή πακέτων"
+
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr ""
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
 msgstr ""
 
 #: src/modules/hwclock/main.py:26
 msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-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:28
+msgid "Writing fstab."
+msgstr "Εγγραγή fstab."
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr ""
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr ""
diff --git a/lang/python/en_GB/LC_MESSAGES/python.po b/lang/python/en_GB/LC_MESSAGES/python.po
index ac9021b4a..911555c2c 100644
--- a/lang/python/en_GB/LC_MESSAGES/python.po
+++ b/lang/python/en_GB/LC_MESSAGES/python.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-27 11:18+0200\n"
+"POT-Creation-Date: 2022-05-29 16:17+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Karthik Balan, 2021\n"
 "Language-Team: English (United Kingdom) (https://www.transifex.com/calamares/teams/20061/en_GB/)\n"
@@ -22,97 +22,89 @@ msgstr ""
 "Language: en_GB\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "Install packages."
-
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Processing packages (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Installing one package."
-msgstr[1] "Installing %(num)d packages."
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Removing one package."
-msgstr[1] "Removing %(num)d packages."
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr "Package Manager error"
-
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Saving network configuration "
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr ""
 
-#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
-#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
-#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr ""
+
+#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
 msgid "Configuration Error"
 msgstr "Configuration  Error "
 
-#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
-#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
-msgid "No root mount point is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr ""
-
-#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
-#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
+#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
+#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:395
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/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/unpackfs/main.py:34
@@ -179,169 +171,6 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr ""
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr ""
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py: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/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Dummy python job."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Dummy python step {}"
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr "Bootloader installation error"
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr ""
-
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr ""
-
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr ""
-
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr ""
-
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr ""
-
-#: src/modules/fstab/main.py:429
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr "Configure OpenRC services"
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr "Target runlevel does not exist"
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/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/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr ""
-
 #: src/modules/displaymanager/main.py:524
 msgid "Cannot write KDM configuration file"
 msgstr "Cannot write KDM configuration file"
@@ -396,14 +225,185 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:401
+#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr "Configure OpenRC services"
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr "Target runlevel does not exist"
+
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr ""
+
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "Install packages."
+
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Processing packages (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Installing one package."
+msgstr[1] "Installing %(num)d packages."
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Removing one package."
+msgstr[1] "Removing %(num)d packages."
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr "Package Manager error"
+
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr ""
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr "Bootloader installation error"
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
 msgstr ""
 
 #: src/modules/hwclock/main.py:26
 msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: 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:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Dummy python job."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Dummy python step {}"
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Saving network configuration "
diff --git a/lang/python/eo/LC_MESSAGES/python.po b/lang/python/eo/LC_MESSAGES/python.po
index 6ea8e7c4b..f7a6c9c47 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: 2022-05-27 11:18+0200\n"
+"POT-Creation-Date: 2022-05-29 16:17+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Kurt Ankh Phoenix , 2018\n"
 "Language-Team: Esperanto (https://www.transifex.com/calamares/teams/20061/eo/)\n"
@@ -21,97 +21,89 @@ msgstr ""
 "Language: eo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "Instali pakaĵoj."
-
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Prilaborante pakaĵoj (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Instalante unu pakaĵo."
-msgstr[1] "Instalante %(num)d pakaĵoj."
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Forigante unu pakaĵo."
-msgstr[1] "Forigante %(num)d pakaĵoj."
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
 msgstr ""
 
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
-#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
-#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr ""
+
+#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
 msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
-#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
-msgid "No root mount point is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr ""
-
-#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
-#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
+#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
+#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:395
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/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/unpackfs/main.py:34
@@ -178,169 +170,6 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr ""
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr ""
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py: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/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Formala python laboro."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Formala python paŝo {}"
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr ""
-
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr ""
-
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr ""
-
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr ""
-
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr ""
-
-#: src/modules/fstab/main.py:429
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/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/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr ""
-
 #: src/modules/displaymanager/main.py:524
 msgid "Cannot write KDM configuration file"
 msgstr ""
@@ -395,14 +224,185 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:401
+#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr ""
+
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "Instali pakaĵoj."
+
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Prilaborante pakaĵoj (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Instalante unu pakaĵo."
+msgstr[1] "Instalante %(num)d pakaĵoj."
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Forigante unu pakaĵo."
+msgstr[1] "Forigante %(num)d pakaĵoj."
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr ""
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
 msgstr ""
 
 #: src/modules/hwclock/main.py:26
 msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: 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:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Formala python laboro."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Formala python paŝo {}"
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/es/LC_MESSAGES/python.po b/lang/python/es/LC_MESSAGES/python.po
index 0a2ad73e5..c29588f9b 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: 2022-05-27 11:18+0200\n"
+"POT-Creation-Date: 2022-05-29 16:17+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: strel, 2022\n"
 "Language-Team: Spanish (https://www.transifex.com/calamares/teams/20061/es/)\n"
@@ -26,106 +26,103 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "Instalar paquetes."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Configurar GRUB."
 
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Procesando paquetes (%(count)d / %(total)d)"
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "Montando las particiones."
 
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Instalando un paquete."
-msgstr[1] "Instalando %(num)d paquetes."
-msgstr[2] "Instalando %(num)d paquetes."
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Eliminando un paquete."
-msgstr[1] "Eliminando %(num)d paquetes."
-msgstr[2] "Eliminando %(num)d paquetes."
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr "Hubo un error del gestor de paquetes"
-
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
 msgstr ""
-"El gestor de paquetes no pudo preparar las actualizaciones; la orden "
-"
{!s}
 devolvió el código de error {!s}."
+"No se pudieron montar los conjuntos de datos («datasets») de zfs por un "
+"error interno"
 
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-"El gestor de paquetes no pudo actualizar el sistema; la orden "
-"
{!s}
 devolvió el código de error {!s}."
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr "No se pudo importar el «zpool»"
 
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-"El gestor de paquetes no pudo realizar cambios en el sistema a instalar; la "
-"orden 
{!s}
 devolvió el código de error {!s}."
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr "No se pudo desbloquear el «zpool»"
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Guardando configuración de red."
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr "No se pudo establecer el punto de montaje zfs"
 
-#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
-#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
-#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
 msgid "Configuration Error"
 msgstr "Error de configuración"
 
-#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
-#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
-msgid "No root mount point is given for 
{!s}
 to use."
-msgstr "No hay ningún punto de montaje en 
{!s}
 que se pueda usar."
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Configurando «mkinitcpio»."
-
-#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
-#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
+#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
+#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:395
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr "No hay ninguna partición en 
{!s}
 que se pueda usar."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Creando el «initramfs» con «mkinitfs»."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr "hubo un error con el montaje zfs"
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Hubo un error al ejecutar «mkinitfs» en el destino"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Configurar los servicios de systemd"
 
-#: 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/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/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Configurando el servicio de arranque cifrado «dmcrypt» para OpenRC "
+#: 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} del «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 («target») de systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr ""
+"No se puede activar el temporizador («timer») de systemd "
+"{name!s}."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+"No se puede desactivar el objetivo («target») de systemd "
+"{name!s}."
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+"No se puede enmascarar («mask») la unidad («unit») 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 ""
+"systemd no reconoce las órdenes {command!s} ni "
+"{suffix!s} para la unidad {name!s}."
 
 #: src/modules/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -194,199 +191,6 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr "El destino «{}» en el sistema escogido no es una carpeta"
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Configurar los servicios de systemd"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "No se puede modificar el servicio"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"La orden systemctl {arg!s} del «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 («target») de systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer {name!s}."
-msgstr ""
-"No se puede activar el temporizador («timer») de systemd "
-"{name!s}."
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target {name!s}."
-msgstr ""
-"No se puede desactivar el objetivo («target») de systemd "
-"{name!s}."
-
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit {name!s}."
-msgstr ""
-"No se puede enmascarar («mask») la unidad («unit») 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 ""
-"systemd no reconoce las órdenes {command!s} ni "
-"{suffix!s} para la unidad {name!s}."
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Tarea de python ficticia."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Paso ficticio de python {}"
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Instalar gestor de arranque."
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-"Hubo un error al instalar «grub»; no hay particiones definidas en el "
-"almacenamiento global"
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr "Hubo un error al instalar el cargador de arranque"
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-"No se pudo instalar el cargador de arranque; la orden de instalación "
-"
{!s}
 devolvió el código de error {!s}."
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr "Aplicando la configuración regional."
-
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr "Montando las particiones."
-
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr ""
-"No se pudieron montar los conjuntos de datos («datasets») de zfs por un "
-"error interno"
-
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr "No se pudo importar el «zpool»"
-
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr "No se pudo desbloquear el «zpool»"
-
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr "No se pudo establecer el punto de montaje zfs"
-
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr "hubo un error con el montaje zfs"
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Configurar tema de Plymouth"
-
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr "Escribiendo el «fstab»."
-
-#: src/modules/fstab/main.py:429
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-"No se proporciona ninguna configuración de 
{!s}
 que "
-"
{!s}
 pueda usar."
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr "Configurar servicios de OpenRC"
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr ""
-"No se puede/n añadir {name!s} de servicio/s al rango de ejecución  "
-"{level!s}."
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr ""
-"No se puede/n borrar el/los servicio/s {name!s} de los rangos de ejecución "
-"{level!s}."
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-"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:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"rc-update {arg!s} en la raíz cambiada «chroot» ha devuelto el "
-"código de error {num!s}."
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr "El nivel de ejecución («runlevel») elegido no existe"
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-"La ruta del nivel de ejecución («runlevel») {level!s} es "
-"{path!s}, que no existe."
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr "Parece que el servicio a cambiar no existe"
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-"La ruta para el servicio {name!s} es {path!s}, que no existe."
-
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Creando «initramfs» (archivos de arranque) con «dracut»."
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Hubo un error al ejecutar «dracut» en el destino"
-
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Configurar GRUB."
-
 #: src/modules/displaymanager/main.py:524
 msgid "Cannot write KDM configuration file"
 msgstr "No se puede escribir el archivo de configuración de KDM"
@@ -446,14 +250,210 @@ msgstr ""
 "La configuración del gestor de pantalla («display manager») estaba "
 "incompleta"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Configurando «initramfs» (archivos de arranque)."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Configurando «mkinitcpio»."
+
+#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:401
+#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr "No hay ningún punto de montaje en 
{!s}
 que se pueda usar."
+
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Instalando los datos."
+
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr "Configurar servicios de OpenRC"
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr ""
+"No se puede/n añadir {name!s} de servicio/s al rango de ejecución  "
+"{level!s}."
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr ""
+"No se puede/n borrar el/los servicio/s {name!s} de los rangos de ejecución "
+"{level!s}."
+
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+"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:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"rc-update {arg!s} en la raíz cambiada «chroot» ha devuelto el "
+"código de error {num!s}."
+
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr "El nivel de ejecución («runlevel») elegido no existe"
+
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+"La ruta del nivel de ejecución («runlevel») {level!s} es "
+"{path!s}, que no existe."
+
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr "Parece que el servicio a cambiar no existe"
+
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+"La ruta para el servicio {name!s} es {path!s}, que no existe."
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Configurar tema de Plymouth"
+
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "Instalar paquetes."
+
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Procesando paquetes (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Instalando un paquete."
+msgstr[1] "Instalando %(num)d paquetes."
+msgstr[2] "Instalando %(num)d paquetes."
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Eliminando un paquete."
+msgstr[1] "Eliminando %(num)d paquetes."
+msgstr[2] "Eliminando %(num)d paquetes."
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr "Hubo un error del gestor de paquetes"
+
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+"El gestor de paquetes no pudo preparar las actualizaciones; la orden "
+"
{!s}
 devolvió el código de error {!s}."
+
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+"El gestor de paquetes no pudo actualizar el sistema; la orden "
+"
{!s}
 devolvió el código de error {!s}."
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+"El gestor de paquetes no pudo realizar cambios en el sistema a instalar; la "
+"orden 
{!s}
 devolvió el código de error {!s}."
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Instalar gestor de arranque."
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+"Hubo un error al instalar «grub»; no hay particiones definidas en el "
+"almacenamiento global"
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr "Hubo un error al instalar el cargador de arranque"
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
+"No se pudo instalar el cargador de arranque; la orden de instalación "
+"
{!s}
 devolvió el código de error {!s}."
 
 #: src/modules/hwclock/main.py:26
 msgid "Setting hardware clock."
 msgstr "Ajustando el reloj interno del equipo."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Instalando los datos."
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Creando el «initramfs» con «mkinitfs»."
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Hubo un error al ejecutar «mkinitfs» en el destino"
+
+#: 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» (archivos de arranque) con «dracut»."
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Hubo un error al ejecutar «dracut» en el destino"
+
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Configurando «initramfs» (archivos de arranque)."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Configurando el servicio de arranque cifrado «dmcrypt» para OpenRC "
+
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr "Escribiendo el «fstab»."
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
+"No se proporciona ninguna configuración de 
{!s}
 que "
+"
{!s}
 pueda usar."
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Tarea de python ficticia."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Paso ficticio de python {}"
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr "Aplicando la configuración regional."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Guardando configuración de red."
diff --git a/lang/python/es_MX/LC_MESSAGES/python.po b/lang/python/es_MX/LC_MESSAGES/python.po
index 97912062d..f67f07e39 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: 2022-05-27 11:18+0200\n"
+"POT-Creation-Date: 2022-05-29 16:17+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: guillermo pacheco , 2022\n"
 "Language-Team: Spanish (Mexico) (https://www.transifex.com/calamares/teams/20061/es_MX/)\n"
@@ -23,100 +23,95 @@ msgstr ""
 "Language: es_MX\n"
 "Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "Instalar paquetes."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Configura GRUB."
 
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Procesando paquetes (%(count)d/%(total)d)"
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "Montando particiones."
 
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Instalando un paquete."
-msgstr[1] "Instalando%(num)d paquetes."
-msgstr[2] "Instalando%(num)d paquetes."
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Removiendo un paquete."
-msgstr[1] "Removiendo %(num)dpaquetes."
-msgstr[2] "Removiendo %(num)dpaquetes."
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
 msgstr ""
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
 msgstr ""
 
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
 msgstr ""
 
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Guardando configuración de red."
-
-#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
-#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
-#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
 msgid "Configuration Error"
 msgstr "Error de configuración"
 
-#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
-#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
-msgid "No root mount point is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Configurando mkinitcpio"
-
-#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
-#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
+#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
+#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:395
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr "No hay particiones definidas para que 
{!s}
 use."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Creando initramfs con mkinitfs."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Se falló al intentar correr mkinitfs en el objetivo"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Configura los servicios de systemd"
 
-#: 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/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/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Configurando el servicio OpenRc dmcrypt."
+#: 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/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -184,174 +179,6 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr "El destino \"{}\" en el sistema objetivo no es un directorio"
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Configura los servicios de systemd"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "No se puede modificar el servicio."
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"La llamada de: systemctl {arg!s} en chroot retorna código de "
-"error {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py: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/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Trabajo python ficticio."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Paso python ficticio {}"
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Instalar el cargador de arranque."
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr "Configurando locales."
-
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr "Montando particiones."
-
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr ""
-
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr ""
-
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Configurando el tema de Plymouth"
-
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr "Escribiento fstab."
-
-#: src/modules/fstab/main.py:429
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr "Configura los servicios de OpenRC"
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr "El nivel de ejecución del objetivo no existe"
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr "El servicio objetivo no existe"
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/dracut/main.py: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/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Configura GRUB."
-
 #: src/modules/displaymanager/main.py:524
 msgid "Cannot write KDM configuration file"
 msgstr "No se puede escribir el archivo de configuración de KDM"
@@ -408,14 +235,187 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "La configuración del gestor de pantalla estaba incompleta"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Configurando initramfs."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Configurando mkinitcpio"
+
+#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:401
+#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Instalando data."
+
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr "Configura los servicios de OpenRC"
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr "El nivel de ejecución del objetivo no existe"
+
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr "El servicio objetivo no existe"
+
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Configurando el tema de Plymouth"
+
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "Instalar paquetes."
+
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Procesando paquetes (%(count)d/%(total)d)"
+
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Instalando un paquete."
+msgstr[1] "Instalando%(num)d paquetes."
+msgstr[2] "Instalando%(num)d paquetes."
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Removiendo un paquete."
+msgstr[1] "Removiendo %(num)dpaquetes."
+msgstr[2] "Removiendo %(num)dpaquetes."
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Instalar el cargador de arranque."
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
 
 #: src/modules/hwclock/main.py:26
 msgid "Setting hardware clock."
 msgstr "Configurando el reloj del hardware."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Instalando data."
+#: 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:28
+msgid "Writing fstab."
+msgstr "Escribiento fstab."
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Trabajo python ficticio."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Paso python ficticio {}"
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr "Configurando locales."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Guardando configuración de red."
diff --git a/lang/python/es_PR/LC_MESSAGES/python.po b/lang/python/es_PR/LC_MESSAGES/python.po
index 25e3cceb5..a1b120382 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: 2022-05-27 11:18+0200\n"
+"POT-Creation-Date: 2022-05-29 16:17+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Spanish (Puerto Rico) (https://www.transifex.com/calamares/teams/20061/es_PR/)\n"
 "MIME-Version: 1.0\n"
@@ -17,99 +17,89 @@ msgstr ""
 "Language: es_PR\n"
 "Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
 msgstr ""
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
 msgstr ""
 
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
 msgstr ""
 
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr ""
-
-#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
-#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
-#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
 msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
-#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
-msgid "No root mount point is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr ""
-
-#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
-#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
+#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
+#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:395
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/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/unpackfs/main.py:34
@@ -176,169 +166,6 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr ""
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr ""
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py: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/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr ""
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr ""
-
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr ""
-
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr ""
-
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr ""
-
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr ""
-
-#: src/modules/fstab/main.py:429
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/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/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr ""
-
 #: src/modules/displaymanager/main.py:524
 msgid "Cannot write KDM configuration file"
 msgstr ""
@@ -393,14 +220,187 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:401
+#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr ""
+
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr ""
+
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr ""
+
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr ""
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
 msgstr ""
 
 #: src/modules/hwclock/main.py:26
 msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: 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:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr ""
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/et/LC_MESSAGES/python.po b/lang/python/et/LC_MESSAGES/python.po
index 4dfabe52a..634cf4230 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: 2022-05-27 11:18+0200\n"
+"POT-Creation-Date: 2022-05-29 16:17+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Madis Otenurm, 2019\n"
 "Language-Team: Estonian (https://www.transifex.com/calamares/teams/20061/et/)\n"
@@ -21,97 +21,89 @@ msgstr ""
 "Language: et\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "Paigalda paketid."
-
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Pakkide töötlemine (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Paigaldan ühe paketi."
-msgstr[1] "Paigaldan %(num)d paketti."
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Eemaldan ühe paketi."
-msgstr[1] "Eemaldan %(num)d paketti."
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
 msgstr ""
 
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
-#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
-#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr ""
+
+#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
 msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
-#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
-msgid "No root mount point is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr ""
-
-#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
-#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
+#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
+#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:395
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/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/unpackfs/main.py:34
@@ -178,169 +170,6 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr ""
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr ""
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py: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/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Testiv python'i töö."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Testiv python'i aste {}"
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr ""
-
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr ""
-
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr ""
-
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr ""
-
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr ""
-
-#: src/modules/fstab/main.py:429
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/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/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr ""
-
 #: src/modules/displaymanager/main.py:524
 msgid "Cannot write KDM configuration file"
 msgstr "KDM-konfiguratsioonifaili ei saa kirjutada"
@@ -395,14 +224,185 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:401
+#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr ""
+
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "Paigalda paketid."
+
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Pakkide töötlemine (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Paigaldan ühe paketi."
+msgstr[1] "Paigaldan %(num)d paketti."
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Eemaldan ühe paketi."
+msgstr[1] "Eemaldan %(num)d paketti."
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr ""
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
 msgstr ""
 
 #: src/modules/hwclock/main.py:26
 msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: 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:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Testiv python'i töö."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Testiv python'i aste {}"
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/eu/LC_MESSAGES/python.po b/lang/python/eu/LC_MESSAGES/python.po
index c9c388fd3..750b0465f 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: 2022-05-27 11:18+0200\n"
+"POT-Creation-Date: 2022-05-29 16:17+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Ander Elortondo, 2019\n"
 "Language-Team: Basque (https://www.transifex.com/calamares/teams/20061/eu/)\n"
@@ -21,97 +21,89 @@ msgstr ""
 "Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "Instalatu paketeak"
-
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Paketeak prozesatzen (%(count)d/ %(total)d) "
-
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Pakete bat instalatzen."
-msgstr[1] "%(num)dpakete instalatzen."
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Pakete bat kentzen."
-msgstr[1] "%(num)dpakete kentzen."
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
 msgstr ""
 
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
-#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
-#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr ""
+
+#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
 msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
-#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
-msgid "No root mount point is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr ""
-
-#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
-#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
+#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
+#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:395
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/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/unpackfs/main.py:34
@@ -178,169 +170,6 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr ""
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr ""
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py: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/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Dummy python lana."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Dummy python urratsa {}"
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr ""
-
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr ""
-
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr ""
-
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr ""
-
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr ""
-
-#: src/modules/fstab/main.py:429
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/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/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr ""
-
 #: src/modules/displaymanager/main.py:524
 msgid "Cannot write KDM configuration file"
 msgstr "Ezin da KDM konfigurazio fitxategia idatzi"
@@ -396,14 +225,185 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "Pantaila kudeatzaile konfigurazioa osotu gabe"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:401
+#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr ""
+
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "Instalatu paketeak"
+
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Paketeak prozesatzen (%(count)d/ %(total)d) "
+
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Pakete bat instalatzen."
+msgstr[1] "%(num)dpakete instalatzen."
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Pakete bat kentzen."
+msgstr[1] "%(num)dpakete kentzen."
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr ""
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
 msgstr ""
 
 #: src/modules/hwclock/main.py:26
 msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: 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:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Dummy python lana."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Dummy python urratsa {}"
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/fa/LC_MESSAGES/python.po b/lang/python/fa/LC_MESSAGES/python.po
index 88111cffa..a76d6d1ab 100644
--- a/lang/python/fa/LC_MESSAGES/python.po
+++ b/lang/python/fa/LC_MESSAGES/python.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-27 11:18+0200\n"
+"POT-Creation-Date: 2022-05-29 16:17+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Mahdy Mirzade , 2021\n"
 "Language-Team: Persian (https://www.transifex.com/calamares/teams/20061/fa/)\n"
@@ -23,104 +23,94 @@ msgstr ""
 "Language: fa\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "نصب بسته‌ها."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "در حال پیکربندی گراب."
 
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "در حال پردازش بسته‌ها (%(count)d/%(total)d)"
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "در حال سوار کردن افرازها."
 
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "در حال نصب یک بسته."
-msgstr[1] "در حال نصب %(num)d بسته."
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "در حال برداشتن یک بسته."
-msgstr[1] "در حال برداشتن %(num)d بسته."
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr "خطای مدیر بسته"
-
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
 msgstr ""
-"مدیر بسته نتوانست برای بروزرسانی ها آماده شود، دستور 
{!s}
 با خطای"
-" {!s} مواجه شد."
 
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
 msgstr ""
-"مدیر بسته نتوانست سامانه را بروز کند. دستور 
{!s}
 با خطای {!s} "
-"مواجه شد."
 
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
 msgstr ""
-"مدیر بسته نتوانست تغییرات را برای نصب سامانه انجام دهد. دستور "
-"
{!s}
 با خطای {!s} مواجه شد."
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "در حال ذخیرهٔ پیکربندی شبکه."
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr ""
 
-#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
-#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
-#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
 msgid "Configuration Error"
 msgstr "خطای پیکربندی"
 
-#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
-#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
-msgid "No root mount point is given for 
{!s}
 to use."
-msgstr "هیچ نقطهٔ اتّصال ریشه‌ای برای استفادهٔ 
{!s}
 داده نشده."
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "پیکربندی mkinitcpio."
-
-#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
-#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
+#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
+#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:395
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr "هیچ افرازی برای استفادهٔ 
{!s}
 تعریف نشده."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "درحال ایجاد initramfs با mkinitfs."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "شکست در اجرا mkinitfs روی هدف"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "در حال پیکربندی خدمات سیستم‌دی"
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "رمز خروج {} بود"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "نمی‌توان خدمت را دستکاری کرد"
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "در حال پیکربندی خدمت dmcrypt OpenRC."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"فراخوانی systemctl {arg!s} در chroot رمز خطای {num!s} را "
+"برگرداند."
+
+#: src/modules/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 "نمی‌توان تایمر سیستم‌دی {name!s} را به کار انداخت."
+
+#: 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/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -186,183 +176,6 @@ msgstr "شکست در یافتن unsquashfs. مطمئن شوید بسته squash
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr "مقصد {} در سامانهٔ هدف، یک شاخه نیست"
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "در حال پیکربندی خدمات سیستم‌دی"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "نمی‌توان خدمت را دستکاری کرد"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"فراخوانی 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 "نمی‌توان تایمر سیستم‌دی {name!s} را به کار انداخت."
-
-#: 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/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "کار پایتونی الکی."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "گام پایتونی الکی {}"
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "نصب بارکنندهٔ راه‌اندازی."
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr "خطای نصب بوت لودر"
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-"بوت لودر نتوانست نصب شود. دستور 
{!s}
 برای نصب با خطای {!s} مواجه "
-"شد."
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr "پیکربندی مکانها"
-
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr "در حال سوار کردن افرازها."
-
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr ""
-
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr ""
-
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "در حال پیکربندی زمینهٔ پلی‌موث"
-
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr "در حال نوشتن fstab."
-
-#: src/modules/fstab/main.py:429
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-"هیچ تنظیمات 
{!s}
 برای استفاده برای 
{!s}
 داده نشده است."
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr "پیکربندی خدمات OpenRC"
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr "نمی‌توان خدمت {name!s} را به سطح اجرایی {level!s} افزود."
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr "نمی‌توان خدمت {name!s} را از سطح اجرایی {level!s} برداشت."
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-"دستور سرویس {arg!s} برای سرویس {name!s} در سطح اجرای {level!s}"
-"  ناشناخته است."
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"فراخوانی rc-update {arg!s} در chroot کد خطای {num!s} را "
-"برگرداند."
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr "سطح اجرایی هدف وجود ندارد."
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-"مسیر برای سطح اجرای {level!s} برابر {path!s} است، که وجود "
-"ندارد."
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr "خدمت هدف وجود ندارد"
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-"مسیر برای سرویس {name!s} برابر {path!s} است، که وجود ندارد."
-
-#: src/modules/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/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "در حال پیکربندی گراب."
-
 #: src/modules/displaymanager/main.py:524
 msgid "Cannot write KDM configuration file"
 msgstr "نمی‌توان پروندهٔ پیکربندی KDM را نوشت"
@@ -419,14 +232,201 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "پیکربندی مدیر نمایش کامل نبود"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "در حال پیکربندی initramfs."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "پیکربندی mkinitcpio."
+
+#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:401
+#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr "هیچ نقطهٔ اتّصال ریشه‌ای برای استفادهٔ 
{!s}
 داده نشده."
+
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "داده‌های نصب"
+
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr "پیکربندی خدمات OpenRC"
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr "نمی‌توان خدمت {name!s} را به سطح اجرایی {level!s} افزود."
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr "نمی‌توان خدمت {name!s} را از سطح اجرایی {level!s} برداشت."
+
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+"دستور سرویس {arg!s} برای سرویس {name!s} در سطح اجرای {level!s}"
+"  ناشناخته است."
+
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"فراخوانی rc-update {arg!s} در chroot کد خطای {num!s} را "
+"برگرداند."
+
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr "سطح اجرایی هدف وجود ندارد."
+
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+"مسیر برای سطح اجرای {level!s} برابر {path!s} است، که وجود "
+"ندارد."
+
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr "خدمت هدف وجود ندارد"
+
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+"مسیر برای سرویس {name!s} برابر {path!s} است، که وجود ندارد."
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "در حال پیکربندی زمینهٔ پلی‌موث"
+
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "نصب بسته‌ها."
+
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "در حال پردازش بسته‌ها (%(count)d/%(total)d)"
+
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "در حال نصب یک بسته."
+msgstr[1] "در حال نصب %(num)d بسته."
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "در حال برداشتن یک بسته."
+msgstr[1] "در حال برداشتن %(num)d بسته."
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr "خطای مدیر بسته"
+
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+"مدیر بسته نتوانست برای بروزرسانی ها آماده شود، دستور 
{!s}
 با خطای"
+" {!s} مواجه شد."
+
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+"مدیر بسته نتوانست سامانه را بروز کند. دستور 
{!s}
 با خطای {!s} "
+"مواجه شد."
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+"مدیر بسته نتوانست تغییرات را برای نصب سامانه انجام دهد. دستور "
+"
{!s}
 با خطای {!s} مواجه شد."
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "نصب بارکنندهٔ راه‌اندازی."
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr "خطای نصب بوت لودر"
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
+"بوت لودر نتوانست نصب شود. دستور 
{!s}
 برای نصب با خطای {!s} مواجه "
+"شد."
 
 #: src/modules/hwclock/main.py:26
 msgid "Setting hardware clock."
 msgstr "در حال تنظیم ساعت سخت‌افزاری."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-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:28
+msgid "Writing fstab."
+msgstr "در حال نوشتن fstab."
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
+"هیچ تنظیمات 
{!s}
 برای استفاده برای 
{!s}
 داده نشده است."
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "کار پایتونی الکی."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "گام پایتونی الکی {}"
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr "پیکربندی مکانها"
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "در حال ذخیرهٔ پیکربندی شبکه."
diff --git a/lang/python/fi_FI/LC_MESSAGES/python.po b/lang/python/fi_FI/LC_MESSAGES/python.po
index 4c4e26489..8cf356fda 100644
--- a/lang/python/fi_FI/LC_MESSAGES/python.po
+++ b/lang/python/fi_FI/LC_MESSAGES/python.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-27 11:18+0200\n"
+"POT-Creation-Date: 2022-05-29 16:17+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Jiri Grönroos , 2022\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/calamares/teams/20061/fi_FI/)\n"
@@ -22,104 +22,92 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "Asenna paketit."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Määritä GRUB."
 
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Käsitellään paketteja (%(count)d / %(total)d)"
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "Liitetään osioita."
 
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Asennetaan yhtä pakettia."
-msgstr[1] "Asennetaan %(num)d pakettia."
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr "Sisäinen virhe liitettäessä zfs-tietojoukkoa"
 
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Poistetaan yhtä pakettia."
-msgstr[1] "Poistetaan %(num)d pakettia."
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr "Zpoolin tuonti epäonnistui"
 
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr "Paketinhallinnan virhe"
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr "Zpoolin lukituksen avaaminen epäonnistui"
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-"Paketinhallinta ei voinut valmistella päivityksiä. Komento 
{!s}
 "
-"palautti virhekoodin {!s}."
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr "Määritys zfs-liitospisteen epäonnistui"
 
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-"Paketinhallinta ei voinut päivittää järjestelmää. Komento 
{!s}
 "
-"palautti virhekoodin {!s}."
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-"Paketinhallinta ei voinut tehdä muutoksia asennettuun järjestelmään. Komento"
-" 
{!s}
 palautti virhekoodin {!s}."
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Tallennetaan verkon määrityksiä."
-
-#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
-#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
-#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
 msgid "Configuration Error"
 msgstr "Määritysvirhe"
 
-#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
-#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
-msgid "No root mount point is given for 
{!s}
 to use."
-msgstr "Kohteelle 
{!s}
 ei ole annettu juuriliitospistettä."
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Määritetään mkinitcpio."
-
-#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
-#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
+#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
+#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:395
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr "Osioita ei ole määritetty käytettäväksi kohteelle 
{!s}
 ."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Luodaan initramfs mkinitfs:llä."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr "zfs-liitosvirhe"
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "mkinitfs:n suorittaminen kohteessa epäonnistui"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Määritä systemd-palvelut"
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Poistumiskoodi oli {}"
+#: 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/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Määritetään OpenRC:n dmcrypt-palvelua."
+#: 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 {name!s} ei voi ottaa käyttöön."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Systemd-kohdetta {name!s} ei voi ottaa käyttöön."
+
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr "Systemd-ajastinta {name!s} ei voi ottaa käyttöön."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Systemd-kohdetta {name!s} ei voi poistaa käytöstä."
+
+#: 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 ""
+"Tuntemattomia systemd-komentoja {command!s} ja "
+"{suffix!s} yksikölle {name!s}."
 
 #: src/modules/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -187,180 +175,6 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr "Kohdejärjestelmän kohde \"{}\"  ei ole hakemisto"
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Määritä systemd-palvelut"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Palvelua ei voi muokata"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr "systemctl {arg!s} chroot palautti virhe koodin {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Systemd-palvelua {name!s} ei voi ottaa käyttöön."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Systemd-kohdetta {name!s} ei voi ottaa käyttöön."
-
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer {name!s}."
-msgstr "Systemd-ajastinta {name!s} ei voi ottaa käyttöön."
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Systemd-kohdetta {name!s} ei voi poistaa käytöstä."
-
-#: 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 ""
-"Tuntemattomia systemd-komentoja {command!s} ja "
-"{suffix!s} yksikölle {name!s}."
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Dummy-mallinen python-työ."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Dummy-mallinen python-vaihe {}"
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Asenna käynnistyslatain."
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-"Grubin asennus epäonnistui, yleisessä levytilassa ei ole määritetty osioita"
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr "Käynnistyslataimen asennusvirhe"
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-"Käynnistyslatainta ei voitu asentaa. Asennuskomento 
{!s}
 palautti"
-" virhekoodin {!s}."
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr "Määritetään maa-asetuksia."
-
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr "Liitetään osioita."
-
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr "Sisäinen virhe liitettäessä zfs-tietojoukkoa"
-
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr "Zpoolin tuonti epäonnistui"
-
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr "Zpoolin lukituksen avaaminen epäonnistui"
-
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr "Määritys zfs-liitospisteen epäonnistui"
-
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr "zfs-liitosvirhe"
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Määritä Plymouthin teema"
-
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr "Kirjoitetaan fstabiin."
-
-#: src/modules/fstab/main.py:429
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-"\"
{!s}
\"-määritystä ei ole annettu käytettäväksi kohteelle "
-"
{!s}
."
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr "Määritä OpenRC-palvelut"
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr "Palvelua {name!s} ei voi lisätä suorituksen tasolle {level!s}."
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr "Ei voi poistaa palvelua {name!s} suorituksen tasolla {level!s}."
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-"Tuntematon  huoltotoiminto{arg!s} palvelun {name!s} "
-"palvelutasolle  {level!s}."
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"rc-update {arg!s} palautti chrootissa virhekoodin {num!s}."
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr "Kohteen ajotasoa ei ole olemassa"
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr "Ajotason polku {level!s} on {path!s}, jota ei ole."
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr "Kohdepalvelua ei ole"
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-"Palvelun polku {name!s} on {path!s},  jota ei ole olemassa."
-
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Luodaan initramfs:ää dracutilla."
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Dracutin suorittaminen kohteessa ei onnistunut"
-
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Määritä GRUB."
-
 #: src/modules/displaymanager/main.py:524
 msgid "Cannot write KDM configuration file"
 msgstr "KDM-määritystiedostoa ei voi kirjoittaa"
@@ -417,14 +231,200 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "Näytönhallinnan kokoonpano oli puutteellinen"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Määritetään initramfs."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Määritetään mkinitcpio."
+
+#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:401
+#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr "Kohteelle 
{!s}
 ei ole annettu juuriliitospistettä."
+
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Asennetaan tietoja."
+
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr "Määritä OpenRC-palvelut"
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr "Palvelua {name!s} ei voi lisätä suorituksen tasolle {level!s}."
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr "Ei voi poistaa palvelua {name!s} suorituksen tasolla {level!s}."
+
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+"Tuntematon  huoltotoiminto{arg!s} palvelun {name!s} "
+"palvelutasolle  {level!s}."
+
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"rc-update {arg!s} palautti chrootissa virhekoodin {num!s}."
+
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr "Kohteen ajotasoa ei ole olemassa"
+
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr "Ajotason polku {level!s} on {path!s}, jota ei ole."
+
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr "Kohdepalvelua ei ole"
+
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+"Palvelun polku {name!s} on {path!s},  jota ei ole olemassa."
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Määritä Plymouthin teema"
+
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "Asenna paketit."
+
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Käsitellään paketteja (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Asennetaan yhtä pakettia."
+msgstr[1] "Asennetaan %(num)d pakettia."
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Poistetaan yhtä pakettia."
+msgstr[1] "Poistetaan %(num)d pakettia."
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr "Paketinhallinnan virhe"
+
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+"Paketinhallinta ei voinut valmistella päivityksiä. Komento 
{!s}
 "
+"palautti virhekoodin {!s}."
+
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+"Paketinhallinta ei voinut päivittää järjestelmää. Komento 
{!s}
 "
+"palautti virhekoodin {!s}."
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+"Paketinhallinta ei voinut tehdä muutoksia asennettuun järjestelmään. Komento"
+" 
{!s}
 palautti virhekoodin {!s}."
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Asenna käynnistyslatain."
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+"Grubin asennus epäonnistui, yleisessä levytilassa ei ole määritetty osioita"
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr "Käynnistyslataimen asennusvirhe"
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
+"Käynnistyslatainta ei voitu asentaa. Asennuskomento 
{!s}
 palautti"
+" virhekoodin {!s}."
 
 #: src/modules/hwclock/main.py:26
 msgid "Setting hardware clock."
 msgstr "Asetetaan laitteiston kelloa."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Asennetaan tietoja."
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Luodaan initramfs mkinitfs:llä."
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "mkinitfs:n suorittaminen kohteessa 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 "Luodaan initramfs:ää dracutilla."
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Dracutin suorittaminen kohteessa 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 "Määritetään OpenRC:n dmcrypt-palvelua."
+
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr "Kirjoitetaan fstabiin."
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
+"\"
{!s}
\"-määritystä ei ole annettu käytettäväksi kohteelle "
+"
{!s}
."
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Dummy-mallinen python-työ."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Dummy-mallinen python-vaihe {}"
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr "Määritetään maa-asetuksia."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Tallennetaan verkon määrityksiä."
diff --git a/lang/python/fr/LC_MESSAGES/python.po b/lang/python/fr/LC_MESSAGES/python.po
index e51a050e3..0bc8c1e1b 100644
--- a/lang/python/fr/LC_MESSAGES/python.po
+++ b/lang/python/fr/LC_MESSAGES/python.po
@@ -11,17 +11,17 @@
 # Seboss666 , 2019
 # Florian B , 2019
 # Arnaud Ferraris , 2019
-# roxfr , 2021
 # Aestan , 2022
+# roxfr , 2022
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-27 11:18+0200\n"
+"POT-Creation-Date: 2022-05-29 16:17+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
-"Last-Translator: Aestan , 2022\n"
+"Last-Translator: roxfr , 2022\n"
 "Language-Team: French (https://www.transifex.com/calamares/teams/20061/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -29,169 +29,50 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "Installer les paquets."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Configuration du GRUB."
 
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Traitement des paquets (%(count)d / %(total)d)"
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "Montage des partitions."
 
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Installation d'un paquet."
-msgstr[1] "Installation de %(num)d paquets."
-msgstr[2] "Installation de %(num)d paquets."
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr "Erreur interne lors du montage des jeux de données zfs"
 
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Suppression d'un paquet."
-msgstr[1] "Suppression de %(num)d paquets."
-msgstr[2] "Suppression de %(num)d paquets."
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr "Échec de l'importation de zpool"
 
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr ""
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr "Impossible de déverrouiller zpool"
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr "Impossible de définir le point de montage zfs"
 
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Sauvegarde de la configuration du réseau en cours."
-
-#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
-#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
-#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
 msgid "Configuration Error"
 msgstr "Erreur de configuration"
 
-#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
-#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
-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/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Configuration de mkinitcpio."
-
-#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
-#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
+#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
+#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:395
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr ""
 "Aucune partition n'est définie pour être utilisée par 
{!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/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Le code de sortie était {}"
-
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Configuration du service OpenRC dmcrypt."
-
-#: 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:467
-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."
-msgstr ""
-
-#: src/modules/unpackfs/main.py:434
-msgid "Bad mount point for root partition"
-msgstr "Mauvais point de montage pour la partition racine"
-
-#: src/modules/unpackfs/main.py:435
-msgid "rootMountPoint is \"{}\", which does not exist."
-msgstr ""
-
-#: src/modules/unpackfs/main.py:439 src/modules/unpackfs/main.py:455
-#: src/modules/unpackfs/main.py:459 src/modules/unpackfs/main.py:465
-#: src/modules/unpackfs/main.py:480
-msgid "Bad unpackfs configuration"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:440
-msgid "There is no configuration information."
-msgstr ""
-
-#: src/modules/unpackfs/main.py:456
-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:460
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "Le système de fichiers source \"{}\" n'existe pas"
-
-#: src/modules/unpackfs/main.py:466
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed."
-msgstr ""
-
-#: src/modules/unpackfs/main.py:481
-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/mount/main.py:253
+msgid "zfs mounting error"
+msgstr "erreur de montage zfs"
 
 #: src/modules/services-systemd/main.py:26
 msgid "Configure systemd services"
@@ -220,7 +101,7 @@ msgstr "Impossible d'activer la cible systemd {name!s}."
 
 #: src/modules/services-systemd/main.py:67
 msgid "Cannot enable systemd timer {name!s}."
-msgstr ""
+msgstr "Impossible d'activer le minuteur systemd {name!s}."
 
 #: src/modules/services-systemd/main.py:71
 msgid "Cannot disable systemd target {name!s}."
@@ -238,135 +119,73 @@ msgstr ""
 "Commandes systemd {command!s} et {suffix!s} "
 "inconnues pour l'unit {name!s}."
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Tâche factice de python"
+#: src/modules/unpackfs/main.py:34
+msgid "Filling up filesystems."
+msgstr "Remplir les systèmes de fichiers."
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Étape factice de python {}"
+#: src/modules/unpackfs/main.py:254
+msgid "rsync failed with error code {}."
+msgstr "rsync a échoué avec le code d'erreur {}."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Installation du bootloader."
+#: src/modules/unpackfs/main.py:299
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Décompression de l'image {}/{}, fichier {}/{}"
 
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
+#: 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:467
+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."
+msgstr "globalstorage ne contient pas de clé \"rootMountPoint\"."
+
+#: src/modules/unpackfs/main.py:434
+msgid "Bad mount point for root partition"
+msgstr "Mauvais point de montage pour la partition racine"
+
+#: src/modules/unpackfs/main.py:435
+msgid "rootMountPoint is \"{}\", which does not exist."
+msgstr "Le point de montage racine est \"{}\", qui n'existe pas."
+
+#: src/modules/unpackfs/main.py:439 src/modules/unpackfs/main.py:455
+#: src/modules/unpackfs/main.py:459 src/modules/unpackfs/main.py:465
+#: src/modules/unpackfs/main.py:480
+msgid "Bad unpackfs configuration"
+msgstr "Mauvaise configuration unpackfs"
+
+#: src/modules/unpackfs/main.py:440
+msgid "There is no configuration information."
+msgstr "Il n'y a pas d'informations de configuration."
+
+#: src/modules/unpackfs/main.py:456
+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/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
+#: src/modules/unpackfs/main.py:460
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Le système de fichiers source \"{}\" n'existe pas"
 
-#: src/modules/bootloader/main.py:783
+#: src/modules/unpackfs/main.py:466
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed."
 msgstr ""
+"Impossible de trouver unsquashfs, assurez-vous que le package squashfs-tools"
+" est installé."
 
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr "Configuration des locales."
-
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr "Montage des partitions."
-
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr ""
-
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr ""
-
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Configurer le thème Plymouth"
-
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr "Écriture du fstab."
-
-#: src/modules/fstab/main.py:429
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr "Configurer les services OpenRC"
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr "Impossible d'ajouter le service {name!s} au run-level {level!s}."
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr "Impossible de retirer le service {name!s} du run-level {level!s}."
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-"Service-action {arg!s} inconnue pour le service {name!s} dans "
-"le run-level {level!s}."
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"L'appel  rc-update {arg!s} dans chroot a renvoyé le code "
-"d'erreur {num!s}."
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr "Le runlevel cible n'existe pas"
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-"Le chemin pour le runlevel {level!s} est {path!s}, qui n'existe"
-" pas."
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr "Le service cible n'existe pas"
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-"Le chemin pour le service {name!s} est {path!s}, qui n'existe "
-"pas."
-
-#: 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/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Configuration du GRUB."
+#: src/modules/unpackfs/main.py:481
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "La destination \"{}\" dans le système cible n'est pas un répertoire"
 
 #: src/modules/displaymanager/main.py:524
 msgid "Cannot write KDM configuration file"
@@ -426,14 +245,209 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "La configuration du gestionnaire d'affichage était incomplète"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Configuration du initramfs."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Configuration de mkinitcpio."
+
+#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:401
+#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
+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/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"
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr "Impossible d'ajouter le service {name!s} au run-level {level!s}."
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr "Impossible de retirer le service {name!s} du run-level {level!s}."
+
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+"Service-action {arg!s} inconnue pour le service {name!s} dans "
+"le run-level {level!s}."
+
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"L'appel  rc-update {arg!s} dans chroot a renvoyé le code "
+"d'erreur {num!s}."
+
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr "Le runlevel cible n'existe pas"
+
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+"Le chemin pour le runlevel {level!s} est {path!s}, qui n'existe"
+" pas."
+
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr "Le service cible n'existe pas"
+
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+"Le chemin pour le service {name!s} est {path!s}, qui n'existe "
+"pas."
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Configurer le thème Plymouth"
+
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "Installer les paquets."
+
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Traitement des paquets (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Installation d'un paquet."
+msgstr[1] "Installation de %(num)d paquets."
+msgstr[2] "Installation de %(num)d paquets."
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Suppression d'un paquet."
+msgstr[1] "Suppression de %(num)d paquets."
+msgstr[2] "Suppression de %(num)d paquets."
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr "Erreur du gestionnaire de paquets"
+
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+"Le gestionnaire de paquets n'a pas pu préparer les mises à jour. La commande"
+" 
{!s}
 a renvoyé le code d'erreur {!s}."
+
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+"Le gestionnaire de paquets n'a pas pu mettre à jour le système. La commande "
+"
{!s}
 a renvoyé le code d'erreur {!s}."
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+"Le gestionnaire de paquets n'a pas pu apporter de modifications au système "
+"installé. La commande 
{!s}
 a renvoyé le code d'erreur {!s}."
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Installation du bootloader."
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+"Échec de l'installation de grub, aucune partition définie dans le stockage "
+"global"
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr "Erreur d'installation du chargeur de démarrage"
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
+"Le chargeur de démarrage n'a pas pu être installé. La commande "
+"d'installation 
{!s}
 a renvoyé le code d'erreur {!s}."
 
 #: src/modules/hwclock/main.py:26
 msgid "Setting hardware clock."
 msgstr "Configuration de l'horloge matériel."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Installation de données."
+#: 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:28
+msgid "Writing fstab."
+msgstr "Écriture du fstab."
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
+"Aucune configuration 
{!s}
n'est donnée pour 
{!s}
 à "
+"utiliser."
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Tâche factice de python"
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Étape factice de python {}"
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr "Configuration des locales."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Sauvegarde de la configuration du réseau en cours."
diff --git a/lang/python/fur/LC_MESSAGES/python.po b/lang/python/fur/LC_MESSAGES/python.po
index fe1c9b56d..efd03caf9 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: 2022-05-27 11:18+0200\n"
+"POT-Creation-Date: 2022-05-29 16:17+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Fabio Tomat , 2020\n"
 "Language-Team: Friulian (https://www.transifex.com/calamares/teams/20061/fur/)\n"
@@ -21,99 +21,95 @@ msgstr ""
 "Language: fur\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "Instale pachets."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Configure GRUB."
 
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Elaborazion dai pachets (%(count)d / %(total)d)"
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "Montaç des partizions."
 
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Daûr a instalâ un pachet."
-msgstr[1] "Daûr a instalâ %(num)d pachets."
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Daûr a gjavâ un pachet."
-msgstr[1] "Daûr a gjavâ %(num)d pachets."
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
 msgstr ""
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
 msgstr ""
 
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
 msgstr ""
 
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Salvament de configurazion di rêt."
-
-#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
-#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
-#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
 msgid "Configuration Error"
 msgstr "Erôr di configurazion"
 
-#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
-#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
-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/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Daûr a configurâ di mkinitcpio."
-
-#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
-#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
+#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
+#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:395
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr "No je stade definide nissune partizion di doprâ par 
{!s}
."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Daûr a creâ il initramfs cun mkinitfs."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr ""
 
-#: 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/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Configure i servizis di systemd"
 
-#: 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/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Impussibil modificâ il servizi"
 
-#: 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: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/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -179,180 +175,6 @@ msgstr ""
 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/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Configure i servizis di systemd"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Impussibil modificâ il servizi"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"La clamade systemctl {arg!s} in chroot e à tornât il codiç di "
-"erôr {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py: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/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Lavôr di python pustiç."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Passaç di python pustiç {}"
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Instale il bootloader."
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr "Daûr a configurâ la localizazion."
-
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr "Montaç des partizions."
-
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr ""
-
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr ""
-
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Configure il teme di Plymouth"
-
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr "Daûr a scrivi fstab."
-
-#: src/modules/fstab/main.py:429
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr "Configure i servizis OpenRC"
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr "Impussibil zontâ il servizi {name!s} al run-level {level!s}."
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr "Impussibil gjavâ il servizi {name!s} dal run-level {level!s}."
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-"Azion dal servizi {arg!s} no cognossude pal servizi {name!s} "
-"tal run-level {level!s}."
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"La clamade rc-update {arg!s} in chroot e à tornât il codiç di "
-"erôr {num!s}."
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr "Il runlevel di destinazion nol esist"
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-"Il percors pal runlevel {level!s} al è {path!s}, che nol esist."
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr "Il servizi di destinazion nol esist"
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-"Il percors pal servizi {name!s} al è {path!s}, che nol esist."
-
-#: 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/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Configure GRUB."
-
 #: src/modules/displaymanager/main.py:524
 msgid "Cannot write KDM configuration file"
 msgstr "Impussibil scrivi il file di configurazion di KDM"
@@ -409,14 +231,192 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "La configurazion dal gjestôr dai visôrs no jere complete"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Daûr a configurâ initramfs."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Daûr a configurâ di mkinitcpio."
+
+#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:401
+#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
+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/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"
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr "Impussibil zontâ il servizi {name!s} al run-level {level!s}."
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr "Impussibil gjavâ il servizi {name!s} dal run-level {level!s}."
+
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+"Azion dal servizi {arg!s} no cognossude pal servizi {name!s} "
+"tal run-level {level!s}."
+
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"La clamade rc-update {arg!s} in chroot e à tornât il codiç di "
+"erôr {num!s}."
+
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr "Il runlevel di destinazion nol esist"
+
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+"Il percors pal runlevel {level!s} al è {path!s}, che nol esist."
+
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr "Il servizi di destinazion nol esist"
+
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+"Il percors pal servizi {name!s} al è {path!s}, che nol esist."
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Configure il teme di Plymouth"
+
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "Instale pachets."
+
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Elaborazion dai pachets (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Daûr a instalâ un pachet."
+msgstr[1] "Daûr a instalâ %(num)d pachets."
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Daûr a gjavâ un pachet."
+msgstr[1] "Daûr a gjavâ %(num)d pachets."
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Instale il bootloader."
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
 
 #: src/modules/hwclock/main.py:26
 msgid "Setting hardware clock."
 msgstr "Daûr a configurâ l'orloi hardware."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Daûr a instalâ i dâts."
+#: 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:28
+msgid "Writing fstab."
+msgstr "Daûr a scrivi fstab."
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Lavôr di python pustiç."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Passaç di python pustiç {}"
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr "Daûr a configurâ la localizazion."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Salvament de configurazion di rêt."
diff --git a/lang/python/gl/LC_MESSAGES/python.po b/lang/python/gl/LC_MESSAGES/python.po
index 90d46d053..3d5404e9d 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: 2022-05-27 11:18+0200\n"
+"POT-Creation-Date: 2022-05-29 16:17+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Xosé, 2018\n"
 "Language-Team: Galician (https://www.transifex.com/calamares/teams/20061/gl/)\n"
@@ -21,97 +21,89 @@ msgstr ""
 "Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "Instalar paquetes."
-
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "A procesar paquetes  (%(count)d/%(total)d)"
-
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "A instalar un paquete."
-msgstr[1] "A instalar %(num)d paquetes."
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "A retirar un paquete."
-msgstr[1] "A retirar %(num)d paquetes."
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
 msgstr ""
 
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
-#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
-#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr ""
+
+#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
 msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
-#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
-msgid "No root mount point is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr ""
-
-#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
-#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
+#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
+#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:395
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/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/unpackfs/main.py:34
@@ -178,169 +170,6 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr ""
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr ""
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py: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/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Tarefa parva de python."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Paso parvo de python {}"
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr ""
-
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr ""
-
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr ""
-
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr ""
-
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr ""
-
-#: src/modules/fstab/main.py:429
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/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/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr ""
-
 #: src/modules/displaymanager/main.py:524
 msgid "Cannot write KDM configuration file"
 msgstr "Non é posíbel escribir o ficheiro de configuración de KDM"
@@ -396,14 +225,185 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "A configuración do xestor de pantalla foi incompleta"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:401
+#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr ""
+
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "Instalar paquetes."
+
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "A procesar paquetes  (%(count)d/%(total)d)"
+
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "A instalar un paquete."
+msgstr[1] "A instalar %(num)d paquetes."
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "A retirar un paquete."
+msgstr[1] "A retirar %(num)d paquetes."
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr ""
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
 msgstr ""
 
 #: src/modules/hwclock/main.py:26
 msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: 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:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Tarefa parva de python."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Paso parvo de python {}"
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/gu/LC_MESSAGES/python.po b/lang/python/gu/LC_MESSAGES/python.po
index 873b44cc5..37573ac56 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: 2022-05-27 11:18+0200\n"
+"POT-Creation-Date: 2022-05-29 16:17+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Gujarati (https://www.transifex.com/calamares/teams/20061/gu/)\n"
 "MIME-Version: 1.0\n"
@@ -17,97 +17,89 @@ msgstr ""
 "Language: gu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
 msgstr ""
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
 msgstr ""
 
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
 msgstr ""
 
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr ""
-
-#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
-#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
-#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
 msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
-#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
-msgid "No root mount point is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr ""
-
-#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
-#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
+#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
+#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:395
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/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/unpackfs/main.py:34
@@ -174,169 +166,6 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr ""
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr ""
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py: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/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr ""
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr ""
-
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr ""
-
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr ""
-
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr ""
-
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr ""
-
-#: src/modules/fstab/main.py:429
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/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/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr ""
-
 #: src/modules/displaymanager/main.py:524
 msgid "Cannot write KDM configuration file"
 msgstr ""
@@ -391,14 +220,185 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:401
+#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr ""
+
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr ""
+
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr ""
+
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr ""
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
 msgstr ""
 
 #: src/modules/hwclock/main.py:26
 msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: 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:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr ""
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/he/LC_MESSAGES/python.po b/lang/python/he/LC_MESSAGES/python.po
index 9b74ec228..eb8962949 100644
--- a/lang/python/he/LC_MESSAGES/python.po
+++ b/lang/python/he/LC_MESSAGES/python.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-27 11:18+0200\n"
+"POT-Creation-Date: 2022-05-29 16:17+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Yaron Shahrabani , 2022\n"
 "Language-Team: Hebrew (https://www.transifex.com/calamares/teams/20061/he/)\n"
@@ -23,108 +23,95 @@ 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/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "התקנת חבילות."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "הגדרת GRUB."
 
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "החבילות מעובדות (%(count)d/%(total)d)"
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "מחיצות מעוגנות."
 
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "מותקנת חבילה אחת."
-msgstr[1] "מותקנות %(num)d חבילות."
-msgstr[2] "מותקנות %(num)d חבילות."
-msgstr[3] "מותקנות %(num)d חבילות."
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr "שגיאה פנימית בעיגון סדרות נתונים של zfs"
 
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "מתבצעת הסרה של חבילה אחת."
-msgstr[1] "מתבצעת הסרה של %(num)d חבילות."
-msgstr[2] "מתבצעת הסרה של %(num)d חבילות."
-msgstr[3] "מתבצעת הסרה של %(num)d חבילות."
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr "ייבוא zpool נכשל"
 
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr "שגיאת מנהל חבילות"
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr "שחרור zpool נכשל"
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-"מנהל החבילות לא הצליח להכין את העדכונים. הפקודה 
{!s}
 החזירה את "
-"קוד השגיאה {!s}."
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr "הגדרת נקודת עיגון של zfs נכשלה"
 
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-"מנהל החבילות לא הצליח לעדכן את המערכת. הפקודה 
{!s}
 החזירה את קוד "
-"השגיאה {!s}."
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-"מנהל החבילות לא הצליח לערוך שינויים במערכת המותקנת. הפקודה 
{!s}
 "
-"החזירה את קוד השגיאה {!s}."
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "הגדרות הרשת נשמרות."
-
-#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
-#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
-#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
 msgid "Configuration Error"
 msgstr "שגיאת הגדרות"
 
-#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
-#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
-msgid "No root mount point is given for 
{!s}
 to use."
-msgstr "לא סופקה נקודת עגינת שורש לשימוש של 
{!s}
."
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "mkinitcpio מותקן."
-
-#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
-#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
+#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
+#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:395
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr "לא הוגדרו מחיצות לשימוש של 
{!s}
."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "initramfs נוצר בעזרת mkinitfs."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr "שגיאת עיגון zfs"
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "הרצת mkinitfs על היעד נכשלה"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "הגדרת שירותי systemd"
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "קוד היציאה היה {}"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "לא ניתן לשנות את השירות"
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "שירות dmcrypt ל־OpenRC מוגדר."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"systemctl {arg!s} הקריאה ב־chroot החזירה את קוד השגיאה {num!s}."
+
+#: src/modules/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/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -192,181 +179,6 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr "היעד „{}” במערכת הקבצים המיועדת אינו תיקייה"
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "הגדרת שירותי systemd"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "לא ניתן לשנות את השירות"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"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/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "משימת דמה של Python."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "צעד דמה של Python {}"
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "התקנת מנהל אתחול."
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr "ההתקנה של grub נכשלה, לא הוגדרו מחיצות באחסון הכללי"
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr "שגיאת התקנת מנהל אתחול"
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-"לא ניתן להתקין את מנהל האתחול. פקודת ההתקנה 
{!s}
 החזירה את קוד "
-"השגיאה {!s}."
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr "השפות מוגדרות."
-
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr "מחיצות מעוגנות."
-
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr "שגיאה פנימית בעיגון סדרות נתונים של zfs"
-
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr "ייבוא zpool נכשל"
-
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr "שחרור zpool נכשל"
-
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr "הגדרת נקודת עיגון של zfs נכשלה"
-
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr "שגיאת עיגון zfs"
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "הגדרת ערכת עיצוב של Plymouth"
-
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr "fstab נכתב."
-
-#: src/modules/fstab/main.py:429
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr "לא סופקה תצורת 
{!s}
 לשימוש 
{!s}
."
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr "הגדרת שירותי OpenRC"
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr "לא ניתן להוסיף את השירות {name!s} לשכבת ההפעלה {level!s}."
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr "לא ניתן להסיר את השירות {name!s} משכבת ההפעלה {level!s}."
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-"service-action‏ (פעולת שירות) {arg!s} בלתי ידועה עבור השירות "
-"{name!s} בשכבת ההפעלה {level!s}."
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"הקריאה rc-update {arg!s} במצב chroot החזירה את קוד השגיאה "
-"{num!s}."
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr "יעד שכבת ההפעלה אינו קיים"
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-"הנתיב לשכבת ההפעלה {level!s} הוא {path!s} ונתיב זה אינו קיים."
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr "שירות היעד אינו קיים"
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr "הנתיב לשירות {name!s} הוא {path!s}, שאינו קיים."
-
-#: src/modules/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/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "הגדרת GRUB."
-
 #: src/modules/displaymanager/main.py:524
 msgid "Cannot write KDM configuration file"
 msgstr "לא ניתן לכתוב את קובץ התצורה של KDM"
@@ -423,14 +235,202 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "תצורת מנהל התצוגה אינה שלמה"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "initramfs מוגדר."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "mkinitcpio מותקן."
+
+#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:401
+#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr "לא סופקה נקודת עגינת שורש לשימוש של 
{!s}
."
+
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "הנתונים מותקנים."
+
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr "הגדרת שירותי OpenRC"
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr "לא ניתן להוסיף את השירות {name!s} לשכבת ההפעלה {level!s}."
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr "לא ניתן להסיר את השירות {name!s} משכבת ההפעלה {level!s}."
+
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+"service-action‏ (פעולת שירות) {arg!s} בלתי ידועה עבור השירות "
+"{name!s} בשכבת ההפעלה {level!s}."
+
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"הקריאה rc-update {arg!s} במצב chroot החזירה את קוד השגיאה "
+"{num!s}."
+
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr "יעד שכבת ההפעלה אינו קיים"
+
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+"הנתיב לשכבת ההפעלה {level!s} הוא {path!s} ונתיב זה אינו קיים."
+
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr "שירות היעד אינו קיים"
+
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr "הנתיב לשירות {name!s} הוא {path!s}, שאינו קיים."
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "הגדרת ערכת עיצוב של Plymouth"
+
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "התקנת חבילות."
+
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "החבילות מעובדות (%(count)d/%(total)d)"
+
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "מותקנת חבילה אחת."
+msgstr[1] "מותקנות %(num)d חבילות."
+msgstr[2] "מותקנות %(num)d חבילות."
+msgstr[3] "מותקנות %(num)d חבילות."
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "מתבצעת הסרה של חבילה אחת."
+msgstr[1] "מתבצעת הסרה של %(num)d חבילות."
+msgstr[2] "מתבצעת הסרה של %(num)d חבילות."
+msgstr[3] "מתבצעת הסרה של %(num)d חבילות."
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr "שגיאת מנהל חבילות"
+
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+"מנהל החבילות לא הצליח להכין את העדכונים. הפקודה 
{!s}
 החזירה את "
+"קוד השגיאה {!s}."
+
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+"מנהל החבילות לא הצליח לעדכן את המערכת. הפקודה 
{!s}
 החזירה את קוד "
+"השגיאה {!s}."
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+"מנהל החבילות לא הצליח לערוך שינויים במערכת המותקנת. הפקודה 
{!s}
 "
+"החזירה את קוד השגיאה {!s}."
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "התקנת מנהל אתחול."
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr "ההתקנה של grub נכשלה, לא הוגדרו מחיצות באחסון הכללי"
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr "שגיאת התקנת מנהל אתחול"
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
+"לא ניתן להתקין את מנהל האתחול. פקודת ההתקנה 
{!s}
 החזירה את קוד "
+"השגיאה {!s}."
 
 #: src/modules/hwclock/main.py:26
 msgid "Setting hardware clock."
 msgstr "שעון החומרה מוגדר."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-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:28
+msgid "Writing fstab."
+msgstr "fstab נכתב."
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr "לא סופקה תצורת 
{!s}
 לשימוש 
{!s}
."
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "משימת דמה של Python."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "צעד דמה של Python {}"
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr "השפות מוגדרות."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "הגדרות הרשת נשמרות."
diff --git a/lang/python/hi/LC_MESSAGES/python.po b/lang/python/hi/LC_MESSAGES/python.po
index 1de7c2b87..7f14e243e 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: 2022-05-27 11:18+0200\n"
+"POT-Creation-Date: 2022-05-29 16:17+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Panwar108 , 2022\n"
 "Language-Team: Hindi (https://www.transifex.com/calamares/teams/20061/hi/)\n"
@@ -21,105 +21,92 @@ msgstr ""
 "Language: hi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "पैकेज इंस्टॉल करना।"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "GRUB विन्यस्त करना।"
 
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "पैकेज (%(count)d / %(total)d) संसाधित किए जा रहे हैं"
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "विभाजन माउंट करना।"
 
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "एक पैकेज इंस्टॉल किया जा रहा है।"
-msgstr[1] "%(num)d पैकेज इंस्टॉल किए जा रहे हैं।"
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr "zfs डेटासेट माउंट करते समय आंतरिक त्रुटि"
 
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "एक पैकेज हटाया जा रहा है।"
-msgstr[1] "%(num)d पैकेज हटाए जा रहे हैं।"
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr "zpool आयात विफल"
 
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr "पैकेज प्रबंधक त्रुटि"
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr "zpool अनलॉक करना विफल"
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-"पैकेज प्रबंधक द्वारा अपडेट तैयार करना विफल। कमांड 
{!s}
 हेतु "
-"त्रुटि कोड {!s} प्राप्त।"
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr "zfs माउंट पॉइंट निर्धारण विफल"
 
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-"पैकेज प्रबंधक द्वारा सिस्टम अपडेट करना विफल। कमांड 
{!s}
 हेतु "
-"त्रुटि कोड {!s} प्राप्त।"
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-"पैकेज प्रबंधक द्वारा इंस्टॉल हो रखें सिस्टम पर परिवर्तन करना विफल। कमांड "
-"
{!s}
 हेतु त्रुटि कोड {!s} प्राप्त।"
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "नेटवर्क विन्यास सेटिंग्स संचित करना।"
-
-#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
-#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
-#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
 msgid "Configuration Error"
 msgstr "विन्यास त्रुटि"
 
-#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
-#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
-msgid "No root mount point is given for 
{!s}
 to use."
-msgstr ""
-"
{!s}
 के उपयोग हेतु कोई रुट माउंट पॉइंट प्रदान नहीं किया गया।"
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "mkinitcpio को विन्यस्त करना।"
-
-#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
-#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
+#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
+#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:395
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr "
{!s}
 के उपयोग हेतु कोई विभाजन परिभाषित नहीं हैं।"
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "mkinitfs के साथ initramfs बनाना।"
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr "zfs माउंट संबंधी त्रुटि"
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "लक्ष्य पर mkinitfs निष्पादन विफल"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "systemd सेवाएँ विन्यस्त करना"
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "त्रुटि कोड  {}"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "सेवा को संशोधित नहीं किया जा सकता"
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "OpenRC dmcrypt सेवा विन्यस्त करना।"
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr "chroot में systemctl {arg!s} कॉल त्रुटि कोड {num!s}।"
+
+#: src/modules/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 ""
+"यूनिट {name!s} हेतु अज्ञात systemd कमांड {command!s} व "
+"{suffix!s}।"
 
 #: src/modules/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -187,178 +174,6 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr "लक्षित सिस्टम में \"{}\" स्थान कोई डायरेक्टरी नहीं है"
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "systemd सेवाएँ विन्यस्त करना"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "सेवा को संशोधित नहीं किया जा सकता"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr "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 टाइमर {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/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "डमी पाइथन प्रक्रिया ।"
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "डमी पाइथन प्रक्रिया की चरण संख्या {}"
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "बूट लोडर इंस्टॉल करना।"
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr "grub इंस्टॉल करना विफल, सर्वत्र संचयन में कोई विभाजन परिभाषित नहीं है"
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr "बूट लोडर इंस्टॉल त्रुटि"
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-"बूट लोडर इंस्टॉल करना विफल। इंस्टॉल कमांड 
{!s}
 हेतु त्रुटि कोड "
-"{!s} प्राप्त।"
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr "स्थानिकी को विन्यस्त करना।"
-
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr "विभाजन माउंट करना।"
-
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr "zfs डेटासेट माउंट करते समय आंतरिक त्रुटि"
-
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr "zpool आयात विफल"
-
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr "zpool अनलॉक करना विफल"
-
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr "zfs माउंट पॉइंट निर्धारण विफल"
-
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr "zfs माउंट संबंधी त्रुटि"
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Plymouth थीम विन्यस्त करना "
-
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr "fstab पर राइट करना।"
-
-#: src/modules/fstab/main.py:429
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-"कोई 
{!s}
 विन्यास प्रदान नहीं किया गया 
{!s}
 के उपयोग "
-"हेतु।"
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr "OpenRC सेवाएँ विन्यस्त करना"
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr "रन-लेवल {level!s} में सेवा {name!s} को जोड़ा नहीं जा सका।"
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr "रन-लेवल {level!s} में सेवा {name!s} को हटाया नहीं जा सका।"
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-"रन-लेवल {level!s} में सेवा {name!s} हेतु अज्ञात सेवा-कार्य "
-"{arg!s}।"
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr "chroot में  rc-update {arg!s} कॉल त्रुटि कोड {num!s}।"
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr "लक्षित रनलेवल मौजूद नहीं है"
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-"रनलेवल {level!s} हेतु पथ {path!s} है, जो कि मौजूद नहीं है।"
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr "लक्षित सेवा मौजूद नहीं है"
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr "सेवा {name!s} हेतु पथ {path!s} है, जो कि मौजूद नहीं है।"
-
-#: src/modules/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/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "GRUB विन्यस्त करना।"
-
 #: src/modules/displaymanager/main.py:524
 msgid "Cannot write KDM configuration file"
 msgstr "KDM विन्यास फ़ाइल राइट नहीं की जा सकती"
@@ -415,14 +230,199 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "डिस्प्ले प्रबंधक विन्यास अधूरा था"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "initramfs को विन्यस्त करना। "
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "mkinitcpio को विन्यस्त करना।"
+
+#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:401
+#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+"
{!s}
 के उपयोग हेतु कोई रुट माउंट पॉइंट प्रदान नहीं किया गया।"
+
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "डाटा इंस्टॉल करना।"
+
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr "OpenRC सेवाएँ विन्यस्त करना"
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr "रन-लेवल {level!s} में सेवा {name!s} को जोड़ा नहीं जा सका।"
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr "रन-लेवल {level!s} में सेवा {name!s} को हटाया नहीं जा सका।"
+
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+"रन-लेवल {level!s} में सेवा {name!s} हेतु अज्ञात सेवा-कार्य "
+"{arg!s}।"
+
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr "chroot में  rc-update {arg!s} कॉल त्रुटि कोड {num!s}।"
+
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr "लक्षित रनलेवल मौजूद नहीं है"
+
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+"रनलेवल {level!s} हेतु पथ {path!s} है, जो कि मौजूद नहीं है।"
+
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr "लक्षित सेवा मौजूद नहीं है"
+
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr "सेवा {name!s} हेतु पथ {path!s} है, जो कि मौजूद नहीं है।"
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Plymouth थीम विन्यस्त करना "
+
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "पैकेज इंस्टॉल करना।"
+
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "पैकेज (%(count)d / %(total)d) संसाधित किए जा रहे हैं"
+
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "एक पैकेज इंस्टॉल किया जा रहा है।"
+msgstr[1] "%(num)d पैकेज इंस्टॉल किए जा रहे हैं।"
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "एक पैकेज हटाया जा रहा है।"
+msgstr[1] "%(num)d पैकेज हटाए जा रहे हैं।"
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr "पैकेज प्रबंधक त्रुटि"
+
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+"पैकेज प्रबंधक द्वारा अपडेट तैयार करना विफल। कमांड 
{!s}
 हेतु "
+"त्रुटि कोड {!s} प्राप्त।"
+
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+"पैकेज प्रबंधक द्वारा सिस्टम अपडेट करना विफल। कमांड 
{!s}
 हेतु "
+"त्रुटि कोड {!s} प्राप्त।"
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+"पैकेज प्रबंधक द्वारा इंस्टॉल हो रखें सिस्टम पर परिवर्तन करना विफल। कमांड "
+"
{!s}
 हेतु त्रुटि कोड {!s} प्राप्त।"
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "बूट लोडर इंस्टॉल करना।"
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr "grub इंस्टॉल करना विफल, सर्वत्र संचयन में कोई विभाजन परिभाषित नहीं है"
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr "बूट लोडर इंस्टॉल त्रुटि"
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
+"बूट लोडर इंस्टॉल करना विफल। इंस्टॉल कमांड 
{!s}
 हेतु त्रुटि कोड "
+"{!s} प्राप्त।"
 
 #: src/modules/hwclock/main.py:26
 msgid "Setting hardware clock."
 msgstr "हार्डवेयर घड़ी सेट करना।"
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-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:28
+msgid "Writing fstab."
+msgstr "fstab पर राइट करना।"
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
+"कोई 
{!s}
 विन्यास प्रदान नहीं किया गया 
{!s}
 के उपयोग "
+"हेतु।"
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "डमी पाइथन प्रक्रिया ।"
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "डमी पाइथन प्रक्रिया की चरण संख्या {}"
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr "स्थानिकी को विन्यस्त करना।"
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "नेटवर्क विन्यास सेटिंग्स संचित करना।"
diff --git a/lang/python/hr/LC_MESSAGES/python.po b/lang/python/hr/LC_MESSAGES/python.po
index 4aefea56d..3e5309798 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: 2022-05-27 11:18+0200\n"
+"POT-Creation-Date: 2022-05-29 16:17+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Lovro Kudelić , 2022\n"
 "Language-Team: Croatian (https://www.transifex.com/calamares/teams/20061/hr/)\n"
@@ -21,107 +21,94 @@ 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/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "Instaliraj pakete."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Konfigurirajte GRUB."
 
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Obrađujem pakete (%(count)d / %(total)d)"
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "Montiranje particija."
 
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Instaliram paket."
-msgstr[1] "Instaliram %(num)d pakete."
-msgstr[2] "Instaliram %(num)d pakete."
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr "Interna pogreška pri postavljanju zfs skupova podataka"
 
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Uklanjam paket."
-msgstr[1] "Uklanjam %(num)d pakete."
-msgstr[2] "Uklanjam %(num)d pakete."
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr "Nije uspio uvoz zpool-a"
 
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr "Pogreška upravitelja paketa"
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr "Otključavanje zpool-a nije uspjelo"
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-"Upravitelj paketa nije mogao pripremiti ažuriranja. Naredba 
{!s}
 "
-"je vratila kôd pogreške {!s}."
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr "Nije uspjelo postavljanje ZFS točke montiranja"
 
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-"Upravitelj paketa nije mogao ažurirati sustav. Naredba 
{!s}
 je "
-"vratila kod pogreške {!s}."
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-"Upravitelj paketa nije mogao izvršiti promjene na instaliranom sustavu. "
-"Naredba 
{!s}
 je vratila kôd pogreške {!s}."
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Spremanje mrežne konfiguracije."
-
-#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
-#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
-#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
 msgid "Configuration Error"
 msgstr "Greška konfiguracije"
 
-#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
-#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
-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/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Konfiguriranje mkinitcpio."
-
-#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
-#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
+#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
+#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:395
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr "Nema definiranih particija za 
{!s}
 korištenje."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Stvaranje initramfs s mkinitfs."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr "ZFS greška montiranja"
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Pokretanje mkinitfs na ciljanom sustavu nije uspjelo"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Konfiguriraj systemd servise"
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Izlazni kod bio je {}"
+#: 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/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Konfiguriranje servisa OpenRC dmcrypt."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"systemctl {arg!s} 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 "Nije moguće omogućiti systemd timer {name!s}."
+
+#: 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/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -189,184 +176,6 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr "Odredište \"{}\" u ciljnom sustavu nije direktorij"
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Konfiguriraj systemd servise"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Ne mogu modificirati servis"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"systemctl {arg!s} poziv u chroot-u vratio je kod pogreške "
-"{num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py: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 "Nije moguće omogućiti systemd timer {name!s}."
-
-#: 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/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Testni python posao."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Testni python korak {}"
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Instaliram bootloader."
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-"Instalacija gruba nije uspjela, nema definiranih particija u globalnoj "
-"pohrani"
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr "Greška prilikom instalacije bootloadera"
-
-#: src/modules/bootloader/main.py:783
-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:31
-msgid "Configuring locales."
-msgstr "Konfiguriranje lokalizacije."
-
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr "Montiranje particija."
-
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr "Interna pogreška pri postavljanju zfs skupova podataka"
-
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr "Nije uspio uvoz zpool-a"
-
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr "Otključavanje zpool-a nije uspjelo"
-
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr "Nije uspjelo postavljanje ZFS točke montiranja"
-
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr "ZFS greška montiranja"
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Konfigurirajte Plymouth temu"
-
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr "Zapisujem fstab."
-
-#: src/modules/fstab/main.py:429
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr "Nije dana konfiguracija 
{!s}
 za 
{!s}
 upotrebu."
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr "Konfigurirajte OpneRC servise"
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr "Ne mogu dodati servis {name!s} u run-level {level!s}."
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr "Ne mogu ukloniti servis {name!s} iz run-level-a {level!s}."
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-"Nepoznat service-action {arg!s} za servis {name!s} u run-level "
-"{level!s}."
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"rc-update {arg!s} poziv u chroot-u vratio je kod pogreške "
-"{num!s}."
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr "Ciljni runlevel ne postoji"
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-"Putanja za runlevel {level!s} je {path!s}, međutim ona ne "
-"postoji."
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr "Ciljni servis ne postoji"
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-"Putanja servisa  {name!s} je {path!s}, međutim ona ne postoji."
-
-#: src/modules/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/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Konfigurirajte GRUB."
-
 #: src/modules/displaymanager/main.py:524
 msgid "Cannot write KDM configuration file"
 msgstr "Ne mogu zapisati KDM konfiguracijsku datoteku"
@@ -423,14 +232,205 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "Konfiguracija upravitelja zaslona nije bila potpuna"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Konfiguriranje initramfs."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Konfiguriranje mkinitcpio."
+
+#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:401
+#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
+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/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Instaliranje podataka."
+
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr "Konfigurirajte OpneRC servise"
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr "Ne mogu dodati servis {name!s} u run-level {level!s}."
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr "Ne mogu ukloniti servis {name!s} iz run-level-a {level!s}."
+
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+"Nepoznat service-action {arg!s} za servis {name!s} u run-level "
+"{level!s}."
+
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"rc-update {arg!s} poziv u chroot-u vratio je kod pogreške "
+"{num!s}."
+
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr "Ciljni runlevel ne postoji"
+
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+"Putanja za runlevel {level!s} je {path!s}, međutim ona ne "
+"postoji."
+
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr "Ciljni servis ne postoji"
+
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+"Putanja servisa  {name!s} je {path!s}, međutim ona ne postoji."
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Konfigurirajte Plymouth temu"
+
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "Instaliraj pakete."
+
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Obrađujem pakete (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Instaliram paket."
+msgstr[1] "Instaliram %(num)d pakete."
+msgstr[2] "Instaliram %(num)d pakete."
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Uklanjam paket."
+msgstr[1] "Uklanjam %(num)d pakete."
+msgstr[2] "Uklanjam %(num)d pakete."
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr "Pogreška upravitelja paketa"
+
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+"Upravitelj paketa nije mogao pripremiti ažuriranja. Naredba 
{!s}
 "
+"je vratila kôd pogreške {!s}."
+
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+"Upravitelj paketa nije mogao ažurirati sustav. Naredba 
{!s}
 je "
+"vratila kod pogreške {!s}."
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+"Upravitelj paketa nije mogao izvršiti promjene na instaliranom sustavu. "
+"Naredba 
{!s}
 je vratila kôd pogreške {!s}."
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Instaliram bootloader."
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+"Instalacija gruba nije uspjela, nema definiranih particija u globalnoj "
+"pohrani"
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr "Greška prilikom instalacije bootloadera"
+
+#: src/modules/bootloader/main.py:783
+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/hwclock/main.py:26
 msgid "Setting hardware clock."
 msgstr "Postavljanje hardverskog sata."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Instaliranje podataka."
+#: 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:28
+msgid "Writing fstab."
+msgstr "Zapisujem fstab."
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr "Nije dana konfiguracija 
{!s}
 za 
{!s}
 upotrebu."
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Testni python posao."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Testni python korak {}"
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr "Konfiguriranje lokalizacije."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Spremanje mrežne konfiguracije."
diff --git a/lang/python/hu/LC_MESSAGES/python.po b/lang/python/hu/LC_MESSAGES/python.po
index cfb414382..f6cfa4b29 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: 2022-05-27 11:18+0200\n"
+"POT-Creation-Date: 2022-05-29 16:17+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Lajos Pasztor , 2019\n"
 "Language-Team: Hungarian (https://www.transifex.com/calamares/teams/20061/hu/)\n"
@@ -24,98 +24,94 @@ msgstr ""
 "Language: hu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "Csomagok telepítése."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "GRUB konfigurálása."
 
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Csomagok feldolgozása (%(count)d / %(total)d)"
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "Partíciók csatolása."
 
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Egy csomag telepítése."
-msgstr[1] "%(num)d csomag telepítése."
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Egy csomag eltávolítása."
-msgstr[1] "%(num)d csomag eltávolítása."
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
 msgstr ""
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
 msgstr ""
 
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
 msgstr ""
 
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Hálózati konfiguráció mentése."
-
-#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
-#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
-#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
 msgid "Configuration Error"
 msgstr "Konfigurációs hiba"
 
-#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
-#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
-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/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "mkinitcpio konfigurálása."
-
-#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
-#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
+#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
+#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:395
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr "Nincsenek partíciók meghatározva a 
{!s}
 használatához."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "systemd szolgáltatások beállítása"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "a szolgáltatást nem lehet módosítani"
+
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"systemctl {arg!s} hívás a chroot-ban hibakódot okozott {num!s}."
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py: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/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/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/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "OpenRC dmcrypt szolgáltatás konfigurálá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/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -181,179 +177,6 @@ msgstr ""
 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/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "systemd szolgáltatások beállítása"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "a szolgáltatást nem lehet módosítani"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"systemctl {arg!s} hívás a chroot-ban hibakódot okozott {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py: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/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Hamis Python feladat."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Hamis {}. Python lépés"
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Rendszerbetöltő telepítése."
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr "nyelvi értékek konfigurálása."
-
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr "Partíciók csatolása."
-
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr ""
-
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr ""
-
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Plymouth téma beállítása"
-
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr "fstab írása."
-
-#: src/modules/fstab/main.py:429
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr "OpenRC szolgáltatások beállítása"
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr "Nem lehet  {name!s} szolgáltatást hozzáadni a run-level {level!s}."
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr "Nem lehet törölni a {name!s} szolgáltatást a {level!s} futás-szintből"
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-"Ismeretlen service-action {arg!s} a szolgáltatáshoz {name!s} in"
-" run-level {level!s}."
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"rc-update {arg!s} hívás a chroot-ban hibakódot adott: {num!s}."
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr "A cél futási szint nem létezik"
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-"A futási-szint elérési útja {level!s} ami {path!s}, nem "
-"létezik."
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr "A cél szolgáltatás nem létezik"
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-"A szolgáltatás {name!s} elérési útja {path!s}, nem létezik."
-
-#: 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/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "GRUB konfigurálása."
-
 #: src/modules/displaymanager/main.py:524
 msgid "Cannot write KDM configuration file"
 msgstr "A KDM konfigurációs fájl nem írható"
@@ -408,14 +231,191 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "A kijelzőkezelő konfigurációja hiányos volt"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "initramfs konfigurálása."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "mkinitcpio konfigurálása."
+
+#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:401
+#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
+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/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"
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr "Nem lehet  {name!s} szolgáltatást hozzáadni a run-level {level!s}."
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr "Nem lehet törölni a {name!s} szolgáltatást a {level!s} futás-szintből"
+
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+"Ismeretlen service-action {arg!s} a szolgáltatáshoz {name!s} in"
+" run-level {level!s}."
+
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"rc-update {arg!s} hívás a chroot-ban hibakódot adott: {num!s}."
+
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr "A cél futási szint nem létezik"
+
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+"A futási-szint elérési útja {level!s} ami {path!s}, nem "
+"létezik."
+
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr "A cél szolgáltatás nem létezik"
+
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+"A szolgáltatás {name!s} elérési útja {path!s}, nem létezik."
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Plymouth téma beállítása"
+
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "Csomagok telepítése."
+
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Csomagok feldolgozása (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Egy csomag telepítése."
+msgstr[1] "%(num)d csomag telepítése."
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Egy csomag eltávolítása."
+msgstr[1] "%(num)d csomag eltávolítása."
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Rendszerbetöltő telepítése."
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
 
 #: src/modules/hwclock/main.py:26
 msgid "Setting hardware clock."
 msgstr "Rendszeridő beállítása."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Adatok telepítése."
+#: 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:28
+msgid "Writing fstab."
+msgstr "fstab írása."
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Hamis Python feladat."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Hamis {}. Python lépés"
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr "nyelvi értékek konfigurálása."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Hálózati konfiguráció mentése."
diff --git a/lang/python/id/LC_MESSAGES/python.po b/lang/python/id/LC_MESSAGES/python.po
index c431120ba..7e96cff3a 100644
--- a/lang/python/id/LC_MESSAGES/python.po
+++ b/lang/python/id/LC_MESSAGES/python.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-27 11:18+0200\n"
+"POT-Creation-Date: 2022-05-29 16:17+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Drajat Hasan , 2021\n"
 "Language-Team: Indonesian (https://www.transifex.com/calamares/teams/20061/id/)\n"
@@ -23,95 +23,89 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "Instal paket-paket."
-
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Paket pemrosesan (%(count)d/%(total)d)"
-
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Menginstal paket %(num)d"
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "mencopot %(num)d paket"
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
 msgstr ""
 
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
-#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
-#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr ""
+
+#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
 msgid "Configuration Error"
 msgstr "Kesalahan Konfigurasi"
 
-#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
-#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
-msgid "No root mount point is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr ""
-
-#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
-#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
+#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
+#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:395
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/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/unpackfs/main.py:34
@@ -178,169 +172,6 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr ""
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr ""
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py: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/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Tugas dumi python."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Langkah {} dumi python"
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr ""
-
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr ""
-
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr ""
-
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr ""
-
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr ""
-
-#: src/modules/fstab/main.py:429
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/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/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr ""
-
 #: src/modules/displaymanager/main.py:524
 msgid "Cannot write KDM configuration file"
 msgstr "Gak bisa menulis file konfigurasi KDM"
@@ -395,14 +226,183 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "Konfigurasi display manager belum rampung"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:401
+#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr ""
+
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "Instal paket-paket."
+
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Paket pemrosesan (%(count)d/%(total)d)"
+
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Menginstal paket %(num)d"
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "mencopot %(num)d paket"
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr ""
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
 msgstr ""
 
 #: src/modules/hwclock/main.py:26
 msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: 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:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Tugas dumi python."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Langkah {} dumi python"
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/ie/LC_MESSAGES/python.po b/lang/python/ie/LC_MESSAGES/python.po
index 49eb3b925..542aa39f2 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: 2022-05-27 11:18+0200\n"
+"POT-Creation-Date: 2022-05-29 16:17+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Caarmi, 2020\n"
 "Language-Team: Interlingue (https://www.transifex.com/calamares/teams/20061/ie/)\n"
@@ -21,97 +21,91 @@ msgstr ""
 "Language: ie\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "Installante paccages."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Configurante GRUB."
 
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "Montente partitiones."
+
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
 msgstr ""
 
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
 msgstr ""
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
 msgstr ""
 
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
 msgstr ""
 
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr ""
-
-#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
-#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
-#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
 msgid "Configuration Error"
 msgstr "Errore de configuration"
 
-#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
-#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
-msgid "No root mount point is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Configurante mkinitcpio."
-
-#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
-#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
+#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
+#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:395
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr "Null partition es definit por usa de 
{!s}
."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Configurante servicios de systemd"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Li code de termination esset {}"
+#: 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/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: 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/unpackfs/main.py:34
@@ -178,173 +172,6 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Configurante servicios de systemd"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr ""
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"Invocation de systemctl {arg!s} in chroot retrodat li code "
-"{num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py: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/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr ""
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Installante li bootloader."
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr "Configurante locales."
-
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr "Montente partitiones."
-
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr ""
-
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr ""
-
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Configurante li tema de Plymouth"
-
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr "Scrition de fstab."
-
-#: src/modules/fstab/main.py:429
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr "Configurante servicios de OpenRC"
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"Invocation de rc-update {arg!s} in chroot retrodat li code "
-"{num!s}."
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr ""
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr ""
-
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Configurante GRUB."
-
 #: src/modules/displaymanager/main.py:524
 msgid "Cannot write KDM configuration file"
 msgstr "Ne successat scrir li file de configuration de KDM"
@@ -399,14 +226,187 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Configurante initramfs."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Configurante mkinitcpio."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:401
+#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
+msgid "No root mount point is given for 
{!s}
 to use."
 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"
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"Invocation de rc-update {arg!s} in chroot retrodat li code "
+"{num!s}."
+
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Configurante li tema de Plymouth"
+
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "Installante paccages."
+
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr ""
+
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Installante li bootloader."
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr ""
+
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr ""
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr ""
+
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "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:28
+msgid "Writing fstab."
+msgstr "Scrition de fstab."
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr ""
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr "Configurante locales."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr ""
diff --git a/lang/python/is/LC_MESSAGES/python.po b/lang/python/is/LC_MESSAGES/python.po
index 77254f6f7..159832f79 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: 2022-05-27 11:18+0200\n"
+"POT-Creation-Date: 2022-05-29 16:17+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Kristján Magnússon, 2017\n"
 "Language-Team: Icelandic (https://www.transifex.com/calamares/teams/20061/is/)\n"
@@ -21,97 +21,89 @@ msgstr ""
 "Language: is\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);\n"
 
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "Setja upp pakka."
-
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Vinnslupakkar (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Setja upp einn pakka."
-msgstr[1] "Setur upp %(num)d pakka."
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Fjarlægi einn pakka."
-msgstr[1] "Fjarlægi %(num)d pakka."
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
 msgstr ""
 
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
-#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
-#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr ""
+
+#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
 msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
-#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
-msgid "No root mount point is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr ""
-
-#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
-#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
+#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
+#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:395
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/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/unpackfs/main.py:34
@@ -178,169 +170,6 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr ""
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr ""
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py: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/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr ""
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr ""
-
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr ""
-
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr ""
-
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr ""
-
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr ""
-
-#: src/modules/fstab/main.py:429
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/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/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr ""
-
 #: src/modules/displaymanager/main.py:524
 msgid "Cannot write KDM configuration file"
 msgstr ""
@@ -395,14 +224,185 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:401
+#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr ""
+
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "Setja upp pakka."
+
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Vinnslupakkar (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Setja upp einn pakka."
+msgstr[1] "Setur upp %(num)d pakka."
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Fjarlægi einn pakka."
+msgstr[1] "Fjarlægi %(num)d pakka."
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr ""
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
 msgstr ""
 
 #: src/modules/hwclock/main.py:26
 msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: 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:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr ""
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/it_IT/LC_MESSAGES/python.po b/lang/python/it_IT/LC_MESSAGES/python.po
index 7f113f9ab..b5187ea77 100644
--- a/lang/python/it_IT/LC_MESSAGES/python.po
+++ b/lang/python/it_IT/LC_MESSAGES/python.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-27 11:18+0200\n"
+"POT-Creation-Date: 2022-05-29 16:17+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Saverio , 2022\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/calamares/teams/20061/it_IT/)\n"
@@ -25,100 +25,95 @@ msgstr ""
 "Language: it_IT\n"
 "Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "Installa pacchetti."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Configura GRUB."
 
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Elaborazione dei pacchetti (%(count)d / %(total)d)"
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "Montaggio partizioni."
 
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Installando un pacchetto."
-msgstr[1] "Installazione di %(num)d pacchetti."
-msgstr[2] "Installazione di %(num)d pacchetti."
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Rimuovendo un pacchetto."
-msgstr[1] "Rimozione di %(num)d pacchetti."
-msgstr[2] "Rimozione di %(num)d pacchetti."
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr "Errore del gestore dei pacchetti"
-
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
 msgstr ""
 
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr "Importazione zpool non riuscita"
+
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr "Sblocco zpool non riuscito"
+
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
 msgstr ""
 
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Salvataggio della configurazione di rete."
-
-#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
-#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
-#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
 msgid "Configuration Error"
 msgstr "Errore di Configurazione"
 
-#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
-#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
-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/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Configurazione di mkinitcpio."
-
-#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
-#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
+#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
+#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:395
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr "Nessuna partizione definita per l'uso con 
{!s}
."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Sto creando initramfs con mkinitfs."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr "errore di mount zfs"
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Impossibile eseguire mkinitfs sulla destinazione"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Configura servizi  systemd"
 
-#: 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/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Impossibile modificare il servizio"
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Configurazione del servizio OpenRC dmcrypt."
+#: 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/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -184,182 +179,6 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr "La destinazione del sistema \"{}\" non è una directory"
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Configura servizi  systemd"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Impossibile modificare il servizio"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"La chiamata systemctl {arg!s} in chroot ha restituito il codice"
-" di errore {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py: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/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Job python fittizio."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Python step {} fittizio"
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Installa il bootloader."
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-"Installazione di grub non riuscita, nessuna partizione definita "
-"nell'archiviazione globale"
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr "Errore di installazione del boot loader"
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr "Configurazione della localizzazione."
-
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr "Montaggio partizioni."
-
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr ""
-
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr "Importazione zpool non riuscita"
-
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr "Sblocco zpool non riuscito"
-
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr ""
-
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr "errore di mount zfs"
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Configura il tema Plymouth"
-
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr "Scrittura di fstab."
-
-#: src/modules/fstab/main.py:429
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr "Configura i servizi OpenRC"
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr "Impossibile aggiungere il servizio {name!s} al run-level {level!s}."
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr "Impossibile rimuovere il servizio {name!s} dal run-level {level!s}."
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-"Service-action sconosciuta {arg!s} per il servizio {name!s} nel"
-" run-level {level!s}."
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"La chiamata rc-update {arg!s} in chroot ha ritornato il codice "
-"di errore {num!s}."
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr "Il runlevel target non esiste"
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-"Il percorso del runlevel {level!s} è {path!s}, ma non esiste."
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr "Il servizio target non esiste"
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-"Il percorso del servizio {name!s} è {path!s}, ma non esiste."
-
-#: 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/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Configura GRUB."
-
 #: src/modules/displaymanager/main.py:524
 msgid "Cannot write KDM configuration file"
 msgstr "Impossibile scrivere il file di configurazione di KDM"
@@ -417,14 +236,195 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "La configurazione del display manager è incompleta"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Configurazione di initramfs."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Configurazione di mkinitcpio."
+
+#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:401
+#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
+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/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"
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr "Impossibile aggiungere il servizio {name!s} al run-level {level!s}."
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr "Impossibile rimuovere il servizio {name!s} dal run-level {level!s}."
+
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+"Service-action sconosciuta {arg!s} per il servizio {name!s} nel"
+" run-level {level!s}."
+
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"La chiamata rc-update {arg!s} in chroot ha ritornato il codice "
+"di errore {num!s}."
+
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr "Il runlevel target non esiste"
+
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+"Il percorso del runlevel {level!s} è {path!s}, ma non esiste."
+
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr "Il servizio target non esiste"
+
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+"Il percorso del servizio {name!s} è {path!s}, ma non esiste."
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Configura il tema Plymouth"
+
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "Installa pacchetti."
+
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Elaborazione dei pacchetti (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Installando un pacchetto."
+msgstr[1] "Installazione di %(num)d pacchetti."
+msgstr[2] "Installazione di %(num)d pacchetti."
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Rimuovendo un pacchetto."
+msgstr[1] "Rimozione di %(num)d pacchetti."
+msgstr[2] "Rimozione di %(num)d pacchetti."
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr "Errore del gestore dei pacchetti"
+
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Installa il bootloader."
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+"Installazione di grub non riuscita, nessuna partizione definita "
+"nell'archiviazione globale"
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr "Errore di installazione del boot loader"
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
 
 #: src/modules/hwclock/main.py:26
 msgid "Setting hardware clock."
 msgstr "Impostazione del clock hardware."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Installazione dei dati."
+#: 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:28
+msgid "Writing fstab."
+msgstr "Scrittura di fstab."
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Job python fittizio."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Python step {} fittizio"
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr "Configurazione della localizzazione."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Salvataggio della configurazione di rete."
diff --git a/lang/python/ja-Hira/LC_MESSAGES/python.po b/lang/python/ja-Hira/LC_MESSAGES/python.po
index 38cbed4f5..5dd940672 100644
--- a/lang/python/ja-Hira/LC_MESSAGES/python.po
+++ b/lang/python/ja-Hira/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-27 11:18+0200\n"
+"POT-Creation-Date: 2022-05-29 16:17+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Japanese (Hiragana) (https://www.transifex.com/calamares/teams/20061/ja-Hira/)\n"
 "MIME-Version: 1.0\n"
@@ -17,95 +17,89 @@ msgstr ""
 "Language: ja-Hira\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
 msgstr ""
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
 msgstr ""
 
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
 msgstr ""
 
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr ""
-
-#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
-#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
-#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
 msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
-#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
-msgid "No root mount point is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr ""
-
-#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
-#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
+#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
+#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:395
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/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/unpackfs/main.py:34
@@ -172,169 +166,6 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr ""
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr ""
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py: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/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr ""
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr ""
-
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr ""
-
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr ""
-
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr ""
-
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr ""
-
-#: src/modules/fstab/main.py:429
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/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/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr ""
-
 #: src/modules/displaymanager/main.py:524
 msgid "Cannot write KDM configuration file"
 msgstr ""
@@ -389,14 +220,183 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:401
+#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr ""
+
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr ""
+
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr ""
+
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr ""
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
 msgstr ""
 
 #: src/modules/hwclock/main.py:26
 msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: 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:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr ""
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/ja/LC_MESSAGES/python.po b/lang/python/ja/LC_MESSAGES/python.po
index 0f2aef676..10f7f4310 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: 2022-05-27 11:18+0200\n"
+"POT-Creation-Date: 2022-05-29 16:17+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: UTUMI Hirosi , 2022\n"
 "Language-Team: Japanese (https://www.transifex.com/calamares/teams/20061/ja/)\n"
@@ -23,100 +23,93 @@ msgstr ""
 "Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "パッケージのインストール"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "GRUBを設定にします。"
 
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "パッケージを処理しています (%(count)d / %(total)d)"
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "パーティションのマウント。"
 
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] " %(num)d パッケージをインストールしています。"
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr "zfs データセットのマウントで内部エラーが発生"
 
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] " %(num)d パッケージを削除しています。"
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr "zpool のインポートに失敗しました"
 
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr "パッケージマネージャーのエラー"
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr "zpool のロック解除に失敗しました。"
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-"パッケージマネージャーはアップデートを準備できませんでした。コマンド 
{!s}
 はエラーコード {!s} を返しました。"
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr "zfs マウントポイントの設定に失敗しました"
 
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-"パッケージマネージャーはシステムをアップデートできませんでした。 コマンド 
{!s}
 はエラーコード {!s} を返しました。"
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-"パッケージマネージャーはインストールされているシステムに変更を加えられませんでした。コマンド 
{!s}
 はエラーコード {!s} "
-"を返しました。"
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "ネットワーク設定を保存しています。"
-
-#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
-#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
-#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
 msgid "Configuration Error"
 msgstr "コンフィグレーションエラー"
 
-#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
-#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
-msgid "No root mount point is given for 
{!s}
 to use."
-msgstr " 
{!s}
 を使用するのにルートマウントポイントが与えられていません。"
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "mkinitcpioを設定しています。"
-
-#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
-#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
+#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
+#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:395
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr "
{!s}
 に使用するパーティションが定義されていません。"
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "mkinitfsを使用してinitramfsを作成します。"
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr "zfs のマウントでエラー"
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "ターゲットでmkinitfsを実行できませんでした"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "systemdサービスを設定"
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "停止コードは {} でした"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "サービスが変更できません"
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "OpenRC dmcryptサービスを設定しています。"
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"chroot で systemctl {arg!s} を呼び出すと、エラーコード {num!s} が返されました。"
+
+#: src/modules/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/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -182,174 +175,6 @@ msgstr "unsquashfs が見つかりませんでした。squashfs-tools パッケ
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr "ターゲットシステムの宛先 \"{}\" はディレクトリではありません"
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "systemdサービスを設定"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "サービスが変更できません"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"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/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Dummy python job."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Dummy python step {}"
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "ブートローダーをインストール"
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr "grub のインストールに失敗しました。グローバルストレージにパーティションが定義されていません"
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr "ブートローダーのインストールエラー"
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-"ブートローダーをインストールできませんでした。インストールコマンド 
{!s}
 がエラーコード {!s} を返しました。"
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr "ロケールを設定しています。"
-
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr "パーティションのマウント。"
-
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr "zfs データセットのマウントで内部エラーが発生"
-
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr "zpool のインポートに失敗しました"
-
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr "zpool のロック解除に失敗しました。"
-
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr "zfs マウントポイントの設定に失敗しました"
-
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr "zfs のマウントでエラー"
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Plymouthテーマを設定"
-
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr "fstabを書き込んでいます。"
-
-#: src/modules/fstab/main.py:429
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr "
{!s}
 が使用する 
{!s}
 設定が指定されていません。"
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr "OpenRCサービスを設定"
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr "ランレベル  {level!s} にサービス {name!s} が追加できません。"
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr "ランレベル  {level!s} からサービス {name!s} が削除できません。"
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-"ランレベル {level!s} 内のサービス {name!s} に対する未知のサービスアクション {arg!s}。"
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr "chrootで rc-update {arg!s} を呼び出すとエラーコード {num!s} が返されました。"
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr "ターゲットとするランレベルは存在しません"
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr "ランレベル {level!s} のパスが {path!s} です。これは存在しません。"
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr "ターゲットとするサービスは存在しません"
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr "サービス {name!s} のパスが {path!s} です。これは存在しません。"
-
-#: src/modules/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/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "GRUBを設定にします。"
-
 #: src/modules/displaymanager/main.py:524
 msgid "Cannot write KDM configuration file"
 msgstr "KDMの設定ファイルに書き込みができません"
@@ -404,14 +229,189 @@ msgstr "globalstorage と displaymanager.conf の両方で、displaymanagers リ
 msgid "Display manager configuration was incomplete"
 msgstr "ディスプレイマネージャの設定が不完全です"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "initramfsを設定しています。"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "mkinitcpioを設定しています。"
+
+#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:401
+#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr " 
{!s}
 を使用するのにルートマウントポイントが与えられていません。"
+
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "データのインストール。"
+
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr "OpenRCサービスを設定"
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr "ランレベル  {level!s} にサービス {name!s} が追加できません。"
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr "ランレベル  {level!s} からサービス {name!s} が削除できません。"
+
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+"ランレベル {level!s} 内のサービス {name!s} に対する未知のサービスアクション {arg!s}。"
+
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr "chrootで rc-update {arg!s} を呼び出すとエラーコード {num!s} が返されました。"
+
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr "ターゲットとするランレベルは存在しません"
+
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr "ランレベル {level!s} のパスが {path!s} です。これは存在しません。"
+
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr "ターゲットとするサービスは存在しません"
+
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr "サービス {name!s} のパスが {path!s} です。これは存在しません。"
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Plymouthテーマを設定"
+
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "パッケージのインストール"
+
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "パッケージを処理しています (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] " %(num)d パッケージをインストールしています。"
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] " %(num)d パッケージを削除しています。"
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr "パッケージマネージャーのエラー"
+
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+"パッケージマネージャーはアップデートを準備できませんでした。コマンド 
{!s}
 はエラーコード {!s} を返しました。"
+
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+"パッケージマネージャーはシステムをアップデートできませんでした。 コマンド 
{!s}
 はエラーコード {!s} を返しました。"
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+"パッケージマネージャーはインストールされているシステムに変更を加えられませんでした。コマンド 
{!s}
 はエラーコード {!s} "
+"を返しました。"
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "ブートローダーをインストール"
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr "grub のインストールに失敗しました。グローバルストレージにパーティションが定義されていません"
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr "ブートローダーのインストールエラー"
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
+"ブートローダーをインストールできませんでした。インストールコマンド 
{!s}
 がエラーコード {!s} を返しました。"
 
 #: src/modules/hwclock/main.py:26
 msgid "Setting hardware clock."
 msgstr "ハードウェアクロックの設定"
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-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:28
+msgid "Writing fstab."
+msgstr "fstabを書き込んでいます。"
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr "
{!s}
 が使用する 
{!s}
 設定が指定されていません。"
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Dummy python job."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Dummy python step {}"
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr "ロケールを設定しています。"
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "ネットワーク設定を保存しています。"
diff --git a/lang/python/kk/LC_MESSAGES/python.po b/lang/python/kk/LC_MESSAGES/python.po
index a7435ec50..e6f2bb036 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: 2022-05-27 11:18+0200\n"
+"POT-Creation-Date: 2022-05-29 16:17+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Kazakh (https://www.transifex.com/calamares/teams/20061/kk/)\n"
 "MIME-Version: 1.0\n"
@@ -17,97 +17,89 @@ msgstr ""
 "Language: kk\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
 msgstr ""
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
 msgstr ""
 
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
 msgstr ""
 
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr ""
-
-#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
-#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
-#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
 msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
-#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
-msgid "No root mount point is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr ""
-
-#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
-#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
+#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
+#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:395
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/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/unpackfs/main.py:34
@@ -174,169 +166,6 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr ""
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr ""
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py: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/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr ""
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr ""
-
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr ""
-
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr ""
-
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr ""
-
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr ""
-
-#: src/modules/fstab/main.py:429
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/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/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr ""
-
 #: src/modules/displaymanager/main.py:524
 msgid "Cannot write KDM configuration file"
 msgstr ""
@@ -391,14 +220,185 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:401
+#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr ""
+
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr ""
+
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr ""
+
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr ""
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
 msgstr ""
 
 #: src/modules/hwclock/main.py:26
 msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: 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:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr ""
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/kn/LC_MESSAGES/python.po b/lang/python/kn/LC_MESSAGES/python.po
index 89c354676..3c1265d64 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: 2022-05-27 11:18+0200\n"
+"POT-Creation-Date: 2022-05-29 16:17+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Kannada (https://www.transifex.com/calamares/teams/20061/kn/)\n"
 "MIME-Version: 1.0\n"
@@ -17,97 +17,89 @@ msgstr ""
 "Language: kn\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
 msgstr ""
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
 msgstr ""
 
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
 msgstr ""
 
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr ""
-
-#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
-#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
-#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
 msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
-#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
-msgid "No root mount point is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr ""
-
-#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
-#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
+#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
+#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:395
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/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/unpackfs/main.py:34
@@ -174,169 +166,6 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr ""
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr ""
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py: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/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr ""
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr ""
-
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr ""
-
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr ""
-
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr ""
-
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr ""
-
-#: src/modules/fstab/main.py:429
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/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/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr ""
-
 #: src/modules/displaymanager/main.py:524
 msgid "Cannot write KDM configuration file"
 msgstr ""
@@ -391,14 +220,185 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:401
+#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr ""
+
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr ""
+
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr ""
+
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr ""
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
 msgstr ""
 
 #: src/modules/hwclock/main.py:26
 msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: 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:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr ""
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/ko/LC_MESSAGES/python.po b/lang/python/ko/LC_MESSAGES/python.po
index d752526c5..dc2f27b8c 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: 2022-05-27 11:18+0200\n"
+"POT-Creation-Date: 2022-05-29 16:17+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Junghee Lee , 2022\n"
 "Language-Team: Korean (https://www.transifex.com/calamares/teams/20061/ko/)\n"
@@ -22,97 +22,92 @@ msgstr ""
 "Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "패키지를 설치합니다."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "GRUB 구성"
 
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "패키지 처리중 (%(count)d / %(total)d)"
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "파티션 마운트 중."
 
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "%(num)d개의 패키지들을 설치하는 중입니다."
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr "zfs 데이터세트를 마운트하는 중 내부 오류"
 
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "%(num)d개의 패키지들을 제거하는 중입니다."
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr "zpool을 가져오지 못했습니다"
 
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr "패키지 관리자 오류"
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr "zpool의 잠금을 해제하지 못했습니다"
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr "패키지 관리자가 업데이트를 준비할 수 없습니다. 
{!s}
 명령에서  {!s} 오류 코드를 반환했습니다."
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr "zfs 마운트위치를 지정하지 못했습니다"
 
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr "패키지 관리자가 시스템을 업데이트할 수 없습니다. 
{!s}
 명령에서  {!s} 오류 코드를 반환했습니다."
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-"패키지 관리자가 설치된 시스템을 변경할 수 없습니다. 
{!s}
 명령에서  {!s} 오류 코드를 반환했습니다."
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "네트워크 구성 저장 중."
-
-#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
-#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
-#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
 msgid "Configuration Error"
 msgstr "구성 오류"
 
-#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
-#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
-msgid "No root mount point is given for 
{!s}
 to use."
-msgstr "
{!s}
에서 사용할 루트 마운트 지점이 제공되지 않음."
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "mkinitcpio 구성 중."
-
-#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
-#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
+#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
+#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:395
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr "사용할 
{!s}
에 대해 정의된 파티션이 없음."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "mkinitfs로 initramfs 생성 중."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr "zfs 마운트하는 중 오류"
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "대상에서 mkinitfs를 실행하지 못했습니다"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "systemd 서비스 구성"
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "종료 코드 {}"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "서비스를 수정할 수 없음"
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "OpenRC dmcrypt 서비스 구성 중."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr "chroot에서 systemctl {arg!s} 호출에서오류 코드 {num}를 반환 했습니다."
+
+#: 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 "시스템 타이머 {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 "시스템 유닛 {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/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -178,173 +173,6 @@ msgstr "unsquashfs를 찾지 못했습니다. squashfs-tools 패키지가 설치
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr "대상 시스템의 \"{}\" 목적지가 디렉토리가 아닙니다."
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "systemd 서비스 구성"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "서비스를 수정할 수 없음"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr "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 "시스템 타이머 {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 "시스템 유닛 {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/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "더미 파이썬 작업."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "더미 파이썬 단계 {}"
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "부트로더 설치."
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr "grub을 설치하지 못했습니다. 파티션 없음이 전역 저장소에 정의되었습니다"
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr "부트로더 설치 오류"
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr "부트로더를 설치할 수 없습니다. 
{!s}
 설치 명령에서  {!s} 오류 코드를 반환했습니다."
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr "로컬 구성 중."
-
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr "파티션 마운트 중."
-
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr "zfs 데이터세트를 마운트하는 중 내부 오류"
-
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr "zpool을 가져오지 못했습니다"
-
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr "zpool의 잠금을 해제하지 못했습니다"
-
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr "zfs 마운트위치를 지정하지 못했습니다"
-
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr "zfs 마운트하는 중 오류"
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "플리머스 테마 구성"
-
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr "fstab 쓰기."
-
-#: src/modules/fstab/main.py:429
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr "
{!s}
 구성 없음은 
{!s}
을(를) 사용할 수 있도록 제공됩니다."
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr "OpenRC 서비스 구성"
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr "run-level {level!s}에 {name!s} 서비스를 추가할 수 없습니다."
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr "실행-수준 {level! s}에서 서비스 {name! s}를 제거할 수 없습니다."
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-"run-level {level!s}의 service {name!s}에 대해 알 수 없는 service-action "
-"{arg!s}입니다."
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr "chroot의 rc-update {arg!s} 호출이 오류 코드 {num!s}를 반환 했습니다."
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr "runlevel 대상이 존재하지 않습니다."
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr "runlevel {level!s}의 경로는 존재하지 않는 {path!s}입니다."
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr "대상 서비스가 존재하지 않습니다."
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr "{name!s} 서비스에 대한 경로는 {path!s}이고, 존재하지 않습니다."
-
-#: src/modules/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/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "GRUB 구성"
-
 #: src/modules/displaymanager/main.py:524
 msgid "Cannot write KDM configuration file"
 msgstr "KDM 구성 파일을 쓸 수 없습니다."
@@ -401,14 +229,186 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "디스플레이 관리자 구성이 완료되지 않았습니다."
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "initramfs 구성 중."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "mkinitcpio 구성 중."
+
+#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:401
+#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr "
{!s}
에서 사용할 루트 마운트 지점이 제공되지 않음."
+
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "데이터 설치중."
+
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr "OpenRC 서비스 구성"
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr "run-level {level!s}에 {name!s} 서비스를 추가할 수 없습니다."
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr "실행-수준 {level! s}에서 서비스 {name! s}를 제거할 수 없습니다."
+
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+"run-level {level!s}의 service {name!s}에 대해 알 수 없는 service-action "
+"{arg!s}입니다."
+
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr "chroot의 rc-update {arg!s} 호출이 오류 코드 {num!s}를 반환 했습니다."
+
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr "runlevel 대상이 존재하지 않습니다."
+
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr "runlevel {level!s}의 경로는 존재하지 않는 {path!s}입니다."
+
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr "대상 서비스가 존재하지 않습니다."
+
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr "{name!s} 서비스에 대한 경로는 {path!s}이고, 존재하지 않습니다."
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "플리머스 테마 구성"
+
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "패키지를 설치합니다."
+
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "패키지 처리중 (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "%(num)d개의 패키지들을 설치하는 중입니다."
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "%(num)d개의 패키지들을 제거하는 중입니다."
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr "패키지 관리자 오류"
+
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr "패키지 관리자가 업데이트를 준비할 수 없습니다. 
{!s}
 명령에서  {!s} 오류 코드를 반환했습니다."
+
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr "패키지 관리자가 시스템을 업데이트할 수 없습니다. 
{!s}
 명령에서  {!s} 오류 코드를 반환했습니다."
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+"패키지 관리자가 설치된 시스템을 변경할 수 없습니다. 
{!s}
 명령에서  {!s} 오류 코드를 반환했습니다."
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "부트로더 설치."
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr "grub을 설치하지 못했습니다. 파티션 없음이 전역 저장소에 정의되었습니다"
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr "부트로더 설치 오류"
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr "부트로더를 설치할 수 없습니다. 
{!s}
 설치 명령에서  {!s} 오류 코드를 반환했습니다."
 
 #: src/modules/hwclock/main.py:26
 msgid "Setting hardware clock."
 msgstr "하드웨어 클럭 설정 중."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-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:28
+msgid "Writing fstab."
+msgstr "fstab 쓰기."
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr "
{!s}
 구성 없음은 
{!s}
을(를) 사용할 수 있도록 제공됩니다."
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "더미 파이썬 작업."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "더미 파이썬 단계 {}"
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr "로컬 구성 중."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "네트워크 구성 저장 중."
diff --git a/lang/python/lo/LC_MESSAGES/python.po b/lang/python/lo/LC_MESSAGES/python.po
index faf2073eb..d03942766 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: 2022-05-27 11:18+0200\n"
+"POT-Creation-Date: 2022-05-29 16:17+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Lao (https://www.transifex.com/calamares/teams/20061/lo/)\n"
 "MIME-Version: 1.0\n"
@@ -17,95 +17,89 @@ msgstr ""
 "Language: lo\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
 msgstr ""
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
 msgstr ""
 
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
 msgstr ""
 
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr ""
-
-#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
-#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
-#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
 msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
-#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
-msgid "No root mount point is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr ""
-
-#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
-#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
+#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
+#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:395
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/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/unpackfs/main.py:34
@@ -172,169 +166,6 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr ""
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr ""
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py: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/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr ""
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr ""
-
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr ""
-
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr ""
-
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr ""
-
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr ""
-
-#: src/modules/fstab/main.py:429
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/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/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr ""
-
 #: src/modules/displaymanager/main.py:524
 msgid "Cannot write KDM configuration file"
 msgstr ""
@@ -389,14 +220,183 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:401
+#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr ""
+
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr ""
+
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr ""
+
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr ""
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
 msgstr ""
 
 #: src/modules/hwclock/main.py:26
 msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: 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:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr ""
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/lt/LC_MESSAGES/python.po b/lang/python/lt/LC_MESSAGES/python.po
index 22976c79c..86ab5a504 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: 2022-05-27 11:18+0200\n"
+"POT-Creation-Date: 2022-05-29 16:17+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Moo, 2022\n"
 "Language-Team: Lithuanian (https://www.transifex.com/calamares/teams/20061/lt/)\n"
@@ -22,110 +22,94 @@ 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/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "Įdiegti paketus."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Konfigūruoti GRUB."
 
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Apdorojami paketai (%(count)d / %(total)d)"
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "Prijungiami skaidiniai."
 
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Įdiegiamas %(num)d paketas."
-msgstr[1] "Įdiegiami %(num)d paketai."
-msgstr[2] "Įdiegiama %(num)d paketų."
-msgstr[3] "Įdiegiama %(num)d paketų."
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr "Vidinė klaida prijungiant zfs duomenų rinkinius"
 
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Šalinamas %(num)d paketas."
-msgstr[1] "Šalinami %(num)d paketai."
-msgstr[2] "Šalinama %(num)d paketų."
-msgstr[3] "Šalinama %(num)d paketų."
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr "Nepavyko importuoti zpool"
 
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr "Paketų tvarkytuvės klaida"
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr "Nepavyko atrakinti zpool"
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-"Paketų tvarkytuvei nepavyko paruošti atnaujinimų. Komanda 
{!s}
 "
-"grąžino klaidos kodą {!s}."
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr "Nepavyko nustatyti zfs prijungimo taško"
 
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-"Paketų tvarkytuvei nepavyko atnaujinti sistemos. Komanda 
{!s}
 "
-"grąžino klaidos kodą {!s}."
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-"Paketų tvarkytuvei nepavyko atlikti pakeitimų įdiegtoje sistemoje. Komanda "
-"
{!s}
 grąžino klaidos kodą {!s}."
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Įrašoma tinklo konfigūracija."
-
-#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
-#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
-#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
 msgid "Configuration Error"
 msgstr "Konfigūracijos klaida"
 
-#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
-#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
-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/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Konfigūruojama mkinitcpio."
-
-#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
-#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
+#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
+#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:395
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr "Nėra apibrėžta jokių skaidinių, skirtų 
{!s}
 naudojimui."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Kuriama initramfs naudojant mkinitfs."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr "zfs prijungimo klaida"
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Nepavyko paskirties vietoje paleisti mkinitfs"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Konfigūruoti systemd tarnybas"
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Išėjimo kodas buvo {}"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Nepavyksta modifikuoti tarnybos"
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Konfigūruojama OpenRC dmcrypt tarnyba."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"systemctl {arg!s} iškvieta, esanti chroot, grąžino klaidos kodą"
+" {num!s}."
+
+#: src/modules/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/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -193,186 +177,6 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr "Paskirties vieta „{}“, esanti paskirties sistemoje, nėra katalogas"
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Konfigūruoti systemd tarnybas"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Nepavyksta modifikuoti tarnybos"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"systemctl {arg!s} iškvieta, esanti chroot, grąžino klaidos kodą"
-" {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py: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/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Fiktyvi python užduotis."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Fiktyvus python žingsnis {}"
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Įdiegti operacinės sistemos paleidyklę."
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-"Nepavyko įdiegti grub paleidyklės, visuotinėje saugykloje nėra apibrėžta "
-"jokių skaidinių"
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr "Operacinės sistemos paleidyklės diegimo klaida"
-
-#: src/modules/bootloader/main.py:783
-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:31
-msgid "Configuring locales."
-msgstr "Konfigūruojamos lokalės."
-
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr "Prijungiami skaidiniai."
-
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr "Vidinė klaida prijungiant zfs duomenų rinkinius"
-
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr "Nepavyko importuoti zpool"
-
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr "Nepavyko atrakinti zpool"
-
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr "Nepavyko nustatyti zfs prijungimo taško"
-
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr "zfs prijungimo klaida"
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Konfigūruoti Plymouth temą"
-
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr "Rašoma fstab."
-
-#: src/modules/fstab/main.py:429
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-"Nenurodyta jokia 
{!s}
 konfigūracija, kurią 
{!s}
 galėtų"
-" naudoti."
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr "Konfigūruoti OpenRC tarnybas"
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr "Nepavyksta pridėti tarnybą {name!s} į vykdymo lygmenį {level!s}."
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr "Nepavyksta pašalinti tarnybą {name!s} iš vykdymo lygmens {level!s}."
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-"Nežinomas tarnybos veiksmas {arg!s}, skirtas tarnybai {name!s} "
-"vykdymo lygmenyje {level!s}."
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"rc-update {arg!s} iškvieta, esanti chroot, grąžino klaidos kodą"
-" {num!s}."
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr "Paskirties vykdymo lygmens nėra"
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-"Vykdymo lygmens {level!s} kelias yra {path!s}, kurio savo "
-"ruožtu nėra."
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr "Paskirties tarnybos nėra"
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-"Tarnybos {name!s} kelias yra {path!s}, kurio savo ruožtu nėra."
-
-#: src/modules/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/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Konfigūruoti GRUB."
-
 #: src/modules/displaymanager/main.py:524
 msgid "Cannot write KDM configuration file"
 msgstr "Nepavyksta įrašyti KDM konfigūracijos failą"
@@ -429,14 +233,210 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "Ekranų tvarkytuvės konfigūracija yra nepilna"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Konfigūruojama initramfs."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Konfigūruojama mkinitcpio."
+
+#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:401
+#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
+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/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Įdiegiami duomenys."
+
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr "Konfigūruoti OpenRC tarnybas"
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr "Nepavyksta pridėti tarnybą {name!s} į vykdymo lygmenį {level!s}."
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr "Nepavyksta pašalinti tarnybą {name!s} iš vykdymo lygmens {level!s}."
+
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+"Nežinomas tarnybos veiksmas {arg!s}, skirtas tarnybai {name!s} "
+"vykdymo lygmenyje {level!s}."
+
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"rc-update {arg!s} iškvieta, esanti chroot, grąžino klaidos kodą"
+" {num!s}."
+
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr "Paskirties vykdymo lygmens nėra"
+
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+"Vykdymo lygmens {level!s} kelias yra {path!s}, kurio savo "
+"ruožtu nėra."
+
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr "Paskirties tarnybos nėra"
+
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+"Tarnybos {name!s} kelias yra {path!s}, kurio savo ruožtu nėra."
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Konfigūruoti Plymouth temą"
+
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "Įdiegti paketus."
+
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Apdorojami paketai (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Įdiegiamas %(num)d paketas."
+msgstr[1] "Įdiegiami %(num)d paketai."
+msgstr[2] "Įdiegiama %(num)d paketų."
+msgstr[3] "Įdiegiama %(num)d paketų."
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Šalinamas %(num)d paketas."
+msgstr[1] "Šalinami %(num)d paketai."
+msgstr[2] "Šalinama %(num)d paketų."
+msgstr[3] "Šalinama %(num)d paketų."
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr "Paketų tvarkytuvės klaida"
+
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+"Paketų tvarkytuvei nepavyko paruošti atnaujinimų. Komanda 
{!s}
 "
+"grąžino klaidos kodą {!s}."
+
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+"Paketų tvarkytuvei nepavyko atnaujinti sistemos. Komanda 
{!s}
 "
+"grąžino klaidos kodą {!s}."
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+"Paketų tvarkytuvei nepavyko atlikti pakeitimų įdiegtoje sistemoje. Komanda "
+"
{!s}
 grąžino klaidos kodą {!s}."
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Įdiegti operacinės sistemos paleidyklę."
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+"Nepavyko įdiegti grub paleidyklės, visuotinėje saugykloje nėra apibrėžta "
+"jokių skaidinių"
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr "Operacinės sistemos paleidyklės diegimo klaida"
+
+#: src/modules/bootloader/main.py:783
+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/hwclock/main.py:26
 msgid "Setting hardware clock."
 msgstr "Nustatomas aparatinės įrangos laikrodis."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Įdiegiami duomenys."
+#: 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:28
+msgid "Writing fstab."
+msgstr "Rašoma fstab."
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
+"Nenurodyta jokia 
{!s}
 konfigūracija, kurią 
{!s}
 galėtų"
+" naudoti."
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Fiktyvi python užduotis."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Fiktyvus python žingsnis {}"
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr "Konfigūruojamos lokalės."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Įrašoma tinklo konfigūracija."
diff --git a/lang/python/lv/LC_MESSAGES/python.po b/lang/python/lv/LC_MESSAGES/python.po
index 7f34d28a9..359fc75ed 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: 2022-05-27 11:18+0200\n"
+"POT-Creation-Date: 2022-05-29 16:17+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Latvian (https://www.transifex.com/calamares/teams/20061/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -17,99 +17,89 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
 msgstr ""
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
 msgstr ""
 
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
 msgstr ""
 
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr ""
-
-#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
-#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
-#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
 msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
-#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
-msgid "No root mount point is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr ""
-
-#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
-#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
+#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
+#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:395
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/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/unpackfs/main.py:34
@@ -176,169 +166,6 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr ""
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr ""
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py: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/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr ""
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr ""
-
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr ""
-
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr ""
-
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr ""
-
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr ""
-
-#: src/modules/fstab/main.py:429
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/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/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr ""
-
 #: src/modules/displaymanager/main.py:524
 msgid "Cannot write KDM configuration file"
 msgstr ""
@@ -393,14 +220,187 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:401
+#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr ""
+
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr ""
+
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr ""
+
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr ""
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
 msgstr ""
 
 #: src/modules/hwclock/main.py:26
 msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: 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:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr ""
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/mk/LC_MESSAGES/python.po b/lang/python/mk/LC_MESSAGES/python.po
index 428d17b55..b60863411 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: 2022-05-27 11:18+0200\n"
+"POT-Creation-Date: 2022-05-29 16:17+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Martin Ristovski , 2018\n"
 "Language-Team: Macedonian (https://www.transifex.com/calamares/teams/20061/mk/)\n"
@@ -21,97 +21,89 @@ msgstr ""
 "Language: mk\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
 msgstr ""
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
 msgstr ""
 
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
 msgstr ""
 
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr ""
-
-#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
-#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
-#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
 msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
-#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
-msgid "No root mount point is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr ""
-
-#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
-#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
+#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
+#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:395
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/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/unpackfs/main.py:34
@@ -178,169 +170,6 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr ""
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr ""
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py: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/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr ""
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr ""
-
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr ""
-
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr ""
-
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr ""
-
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr ""
-
-#: src/modules/fstab/main.py:429
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/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/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr ""
-
 #: src/modules/displaymanager/main.py:524
 msgid "Cannot write KDM configuration file"
 msgstr "KDM конфигурациониот фајл не може да се создаде"
@@ -395,14 +224,185 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:401
+#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr ""
+
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr ""
+
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr ""
+
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr ""
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
 msgstr ""
 
 #: src/modules/hwclock/main.py:26
 msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: 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:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr ""
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/ml/LC_MESSAGES/python.po b/lang/python/ml/LC_MESSAGES/python.po
index 0044044f7..8c8538c79 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: 2022-05-27 11:18+0200\n"
+"POT-Creation-Date: 2022-05-29 16:17+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Balasankar C , 2019\n"
 "Language-Team: Malayalam (https://www.transifex.com/calamares/teams/20061/ml/)\n"
@@ -22,97 +22,89 @@ msgstr ""
 "Language: ml\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
 msgstr ""
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
 msgstr ""
 
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
 msgstr ""
 
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr ""
-
-#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
-#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
-#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
 msgid "Configuration Error"
 msgstr "ക്രമീകരണത്തിൽ പിഴവ്"
 
-#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
-#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
-msgid "No root mount point is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr ""
-
-#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
-#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
+#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
+#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:395
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/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/unpackfs/main.py:34
@@ -179,169 +171,6 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr ""
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr ""
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py: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/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr ""
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "ബൂട്ട്‌ലോടർ ഇൻസ്റ്റാൾ ചെയ്യൂ ."
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr ""
-
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr ""
-
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr ""
-
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr ""
-
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr ""
-
-#: src/modules/fstab/main.py:429
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/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/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr ""
-
 #: src/modules/displaymanager/main.py:524
 msgid "Cannot write KDM configuration file"
 msgstr ""
@@ -396,14 +225,185 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:401
+#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr ""
+
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr ""
+
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr ""
+
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "ബൂട്ട്‌ലോടർ ഇൻസ്റ്റാൾ ചെയ്യൂ ."
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
 msgstr ""
 
 #: src/modules/hwclock/main.py:26
 msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: 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:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr ""
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/mr/LC_MESSAGES/python.po b/lang/python/mr/LC_MESSAGES/python.po
index e87b45c06..c58ce5feb 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: 2022-05-27 11:18+0200\n"
+"POT-Creation-Date: 2022-05-29 16:17+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Marathi (https://www.transifex.com/calamares/teams/20061/mr/)\n"
 "MIME-Version: 1.0\n"
@@ -17,97 +17,89 @@ msgstr ""
 "Language: mr\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
 msgstr ""
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
 msgstr ""
 
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
 msgstr ""
 
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr ""
-
-#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
-#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
-#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
 msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
-#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
-msgid "No root mount point is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr ""
-
-#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
-#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
+#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
+#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:395
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/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/unpackfs/main.py:34
@@ -174,169 +166,6 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr ""
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr ""
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py: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/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr ""
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr ""
-
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr ""
-
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr ""
-
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr ""
-
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr ""
-
-#: src/modules/fstab/main.py:429
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/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/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr ""
-
 #: src/modules/displaymanager/main.py:524
 msgid "Cannot write KDM configuration file"
 msgstr ""
@@ -391,14 +220,185 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:401
+#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr ""
+
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr ""
+
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr ""
+
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr ""
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
 msgstr ""
 
 #: src/modules/hwclock/main.py:26
 msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: 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:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr ""
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/nb/LC_MESSAGES/python.po b/lang/python/nb/LC_MESSAGES/python.po
index d9c72f36f..432ee6a28 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: 2022-05-27 11:18+0200\n"
+"POT-Creation-Date: 2022-05-29 16:17+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: 865ac004d9acf2568b2e4b389e0007c7_fba755c <3516cc82d94f87187da1e036e5f09e42_616112>, 2017\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/calamares/teams/20061/nb/)\n"
@@ -21,97 +21,89 @@ msgstr ""
 "Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "Installer pakker."
-
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
 msgstr ""
 
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
 msgstr ""
 
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
-#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
-#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
 msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
-#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
-msgid "No root mount point is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr ""
-
-#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
-#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
+#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
+#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:395
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/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/unpackfs/main.py:34
@@ -178,169 +170,6 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr ""
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr ""
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py: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/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr ""
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr ""
-
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr ""
-
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr ""
-
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr ""
-
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr ""
-
-#: src/modules/fstab/main.py:429
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/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/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr ""
-
 #: src/modules/displaymanager/main.py:524
 msgid "Cannot write KDM configuration file"
 msgstr ""
@@ -395,14 +224,185 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:401
+#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr ""
+
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "Installer pakker."
+
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr ""
+
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr ""
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
 msgstr ""
 
 #: src/modules/hwclock/main.py:26
 msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: 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:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr ""
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/ne_NP/LC_MESSAGES/python.po b/lang/python/ne_NP/LC_MESSAGES/python.po
index 4889f1aaa..0352f3128 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: 2022-05-27 11:18+0200\n"
+"POT-Creation-Date: 2022-05-29 16:17+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Nepali (Nepal) (https://www.transifex.com/calamares/teams/20061/ne_NP/)\n"
 "MIME-Version: 1.0\n"
@@ -17,97 +17,89 @@ msgstr ""
 "Language: ne_NP\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
 msgstr ""
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
 msgstr ""
 
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
 msgstr ""
 
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr ""
-
-#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
-#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
-#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
 msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
-#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
-msgid "No root mount point is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr ""
-
-#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
-#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
+#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
+#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:395
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/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/unpackfs/main.py:34
@@ -174,169 +166,6 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr ""
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr ""
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py: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/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr ""
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr ""
-
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr ""
-
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr ""
-
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr ""
-
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr ""
-
-#: src/modules/fstab/main.py:429
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/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/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr ""
-
 #: src/modules/displaymanager/main.py:524
 msgid "Cannot write KDM configuration file"
 msgstr ""
@@ -391,14 +220,185 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:401
+#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr ""
+
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr ""
+
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr ""
+
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr ""
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
 msgstr ""
 
 #: src/modules/hwclock/main.py:26
 msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: 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:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr ""
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/nl/LC_MESSAGES/python.po b/lang/python/nl/LC_MESSAGES/python.po
index 1c2df21db..cb4f2301a 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: 2022-05-27 11:18+0200\n"
+"POT-Creation-Date: 2022-05-29 16:17+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Adriaan de Groot , 2020\n"
 "Language-Team: Dutch (https://www.transifex.com/calamares/teams/20061/nl/)\n"
@@ -22,99 +22,95 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "Pakketten installeren."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "GRUB instellen."
 
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Pakketten verwerken (%(count)d/ %(total)d)"
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "Partities mounten."
 
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Pakket installeren."
-msgstr[1] "%(num)d pakketten installeren."
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Pakket verwijderen."
-msgstr[1] "%(num)d pakketten verwijderen."
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
 msgstr ""
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
 msgstr ""
 
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
 msgstr ""
 
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Netwerk-configuratie opslaan."
-
-#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
-#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
-#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
 msgid "Configuration Error"
 msgstr "Configuratiefout"
 
-#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
-#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
-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/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Instellen van mkinitcpio"
-
-#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
-#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
+#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
+#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:395
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr "Geen partities gedefinieerd voor 
{!s}
 om te gebruiken."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Een initramfs wordt aangemaakt met mkinitfs."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr ""
 
-#: 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/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Configureer systemd services "
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "De afsluitcode was {}"
+#: 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/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Configureren van OpenRC dmcrypt service."
+#: 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/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -182,180 +178,6 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr "De bestemming \"{}\" in het doelsysteem is niet een map"
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Configureer systemd services "
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "De service kan niet worden gewijzigd"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"systemctl {arg!s} aanroeping in chroot resulteerde in foutcode "
-"{num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py: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/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Voorbeeld Python-taak"
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Voorbeeld Python-stap {}"
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Installeer bootloader"
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr "Taal en locatie instellen."
-
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr "Partities mounten."
-
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr ""
-
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr ""
-
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Plymouth thema instellen"
-
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr "fstab schrijven."
-
-#: src/modules/fstab/main.py:429
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr "Configureer OpenRC services"
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr "Kon service {name!s} niet toegoeven aan runlevel {level!s}."
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr "Kon service {name!s} niet verwijderen van runlevel {level!s}."
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-"Onbekende serviceactie {arg!s} voor service {name!s} in "
-"runlevel {level!s}."
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"rc-update {arg!s} aanroeping in chroot resulteerde in foutcode "
-"{num!s}."
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr "Doel runlevel bestaat niet"
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-"Het pad voor runlevel {level!s} is {path!s}, welke niet bestaat"
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr "Doelservice bestaat niet"
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-"Het pad voor service {level!s} is {path!s}, welke niet bestaat"
-
-#: 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/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "GRUB instellen."
-
 #: src/modules/displaymanager/main.py:524
 msgid "Cannot write KDM configuration file"
 msgstr "Schrijven naar het KDM-configuratiebestand is mislukt "
@@ -412,14 +234,192 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "Display manager configuratie was incompleet"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Instellen van initramfs."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Instellen van mkinitcpio"
+
+#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:401
+#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
+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/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"
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr "Kon service {name!s} niet toegoeven aan runlevel {level!s}."
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr "Kon service {name!s} niet verwijderen van runlevel {level!s}."
+
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+"Onbekende serviceactie {arg!s} voor service {name!s} in "
+"runlevel {level!s}."
+
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"rc-update {arg!s} aanroeping in chroot resulteerde in foutcode "
+"{num!s}."
+
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr "Doel runlevel bestaat niet"
+
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+"Het pad voor runlevel {level!s} is {path!s}, welke niet bestaat"
+
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr "Doelservice bestaat niet"
+
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+"Het pad voor service {level!s} is {path!s}, welke niet bestaat"
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Plymouth thema instellen"
+
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "Pakketten installeren."
+
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Pakketten verwerken (%(count)d/ %(total)d)"
+
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Pakket installeren."
+msgstr[1] "%(num)d pakketten installeren."
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Pakket verwijderen."
+msgstr[1] "%(num)d pakketten verwijderen."
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Installeer bootloader"
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
 
 #: src/modules/hwclock/main.py:26
 msgid "Setting hardware clock."
 msgstr "Instellen van hardwareklok"
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Data aan het installeren."
+#: 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:28
+msgid "Writing fstab."
+msgstr "fstab schrijven."
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Voorbeeld Python-taak"
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Voorbeeld Python-stap {}"
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr "Taal en locatie instellen."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Netwerk-configuratie opslaan."
diff --git a/lang/python/oc/LC_MESSAGES/python.po b/lang/python/oc/LC_MESSAGES/python.po
index 54cdd1cd6..7082f3099 100644
--- a/lang/python/oc/LC_MESSAGES/python.po
+++ b/lang/python/oc/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-27 11:18+0200\n"
+"POT-Creation-Date: 2022-05-29 16:17+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Quentin PAGÈS, 2022\n"
 "Language-Team: Occitan (post 1500) (https://www.transifex.com/calamares/teams/20061/oc/)\n"
@@ -21,97 +21,89 @@ msgstr ""
 "Language: oc\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
 msgstr ""
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
 msgstr ""
 
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
 msgstr ""
 
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr ""
-
-#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
-#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
-#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
 msgid "Configuration Error"
 msgstr "Error de configuracion"
 
-#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
-#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
-msgid "No root mount point is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr ""
-
-#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
-#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
+#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
+#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:395
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/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/unpackfs/main.py:34
@@ -178,169 +170,6 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr ""
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr ""
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py: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/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr ""
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr ""
-
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr ""
-
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr ""
-
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr ""
-
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr ""
-
-#: src/modules/fstab/main.py:429
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/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/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr ""
-
 #: src/modules/displaymanager/main.py:524
 msgid "Cannot write KDM configuration file"
 msgstr ""
@@ -395,14 +224,185 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:401
+#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr ""
+
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr ""
+
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr ""
+
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr ""
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
 msgstr ""
 
 #: src/modules/hwclock/main.py:26
 msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: 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:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr ""
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/pl/LC_MESSAGES/python.po b/lang/python/pl/LC_MESSAGES/python.po
index 32e616f4f..aab2d9603 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: 2022-05-27 11:18+0200\n"
+"POT-Creation-Date: 2022-05-29 16:17+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Jacob B. , 2021\n"
 "Language-Team: Polish (https://www.transifex.com/calamares/teams/20061/pl/)\n"
@@ -24,103 +24,93 @@ 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/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "Zainstaluj pakiety."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Konfiguracja GRUB."
 
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Przetwarzanie pakietów (%(count)d / %(total)d)"
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "Montowanie partycji."
 
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Instalowanie jednego pakietu."
-msgstr[1] "Instalowanie %(num)d pakietów."
-msgstr[2] "Instalowanie %(num)d pakietów."
-msgstr[3] "Instalowanie%(num)d pakietów."
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Usuwanie jednego pakietu."
-msgstr[1] "Usuwanie %(num)d pakietów."
-msgstr[2] "Usuwanie %(num)d pakietów."
-msgstr[3] "Usuwanie %(num)d pakietów."
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
 msgstr ""
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
 msgstr ""
 
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
 msgstr ""
 
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Zapisywanie konfiguracji sieci."
-
-#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
-#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
-#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
 msgid "Configuration Error"
 msgstr "Błąd konfiguracji"
 
-#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
-#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
-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/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Konfigurowanie mkinitcpio."
-
-#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
-#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
+#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
+#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:395
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr "Nie ma zdefiniowanych partycji dla 
{!s}
 do użytku."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Tworzenie initramfs z mkinitfs."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Nie udało się włączyć mkinitfs."
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Konfiguracja usług systemd"
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Kod wyjściowy to {}"
+#: 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/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Konfigurowanie usługi OpenRC dmcrypt."
+#: 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/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -188,179 +178,6 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr "Miejsce docelowe \"{}\" w docelowym systemie nie jest katalogiem"
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Konfiguracja usług systemd"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Nie można zmodyfikować usług"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"Wezwanie systemctl {arg!s} w chroot zwróciło kod błędu {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py: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/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Zadanie fikcyjne Python."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Krok fikcyjny Python {}"
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Instalacja programu rozruchowego."
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr "Konfigurowanie ustawień lokalnych."
-
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr "Montowanie partycji."
-
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr ""
-
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr ""
-
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Konfiguracja motywu Plymouth"
-
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr "Zapisywanie fstab."
-
-#: src/modules/fstab/main.py:429
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr "Konfiguracja usług OpenRC"
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr ""
-"Nie udało się dodać usługi {name!s} do poziomu-uruchamiania {level!s}."
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr ""
-"Nie udało się usunąć usługi {name!s} do poziomu-uruchamiania {level!s}."
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-"Nieznana akcja-usługi {arg!s} dla usługi {name!s} w poziomie-"
-"uruchamiania {level!s}."
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"rc-update {arg!s} wezwanie w chroot zwróciło kod błędu {num!s}."
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr "Docelowy poziom odtwarzania nie istnieje"
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-"Ścieżka do poziomu odtwarzania {level!s} to {path!s},  nie "
-"istnieje."
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr "Docelowa usługa nie istnieje"
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr "Ścieżka do usługi {name!s} to {path!s},  nie istnieje."
-
-#: 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/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Konfiguracja GRUB."
-
 #: src/modules/displaymanager/main.py:524
 msgid "Cannot write KDM configuration file"
 msgstr "Nie można zapisać pliku konfiguracji KDM"
@@ -417,14 +234,197 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "Konfiguracja menedżera wyświetlania była niekompletna"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Konfigurowanie initramfs."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Konfigurowanie mkinitcpio."
+
+#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:401
+#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
+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/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"
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr ""
+"Nie udało się dodać usługi {name!s} do poziomu-uruchamiania {level!s}."
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr ""
+"Nie udało się usunąć usługi {name!s} do poziomu-uruchamiania {level!s}."
+
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+"Nieznana akcja-usługi {arg!s} dla usługi {name!s} w poziomie-"
+"uruchamiania {level!s}."
+
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"rc-update {arg!s} wezwanie w chroot zwróciło kod błędu {num!s}."
+
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr "Docelowy poziom odtwarzania nie istnieje"
+
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+"Ścieżka do poziomu odtwarzania {level!s} to {path!s},  nie "
+"istnieje."
+
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr "Docelowa usługa nie istnieje"
+
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr "Ścieżka do usługi {name!s} to {path!s},  nie istnieje."
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Konfiguracja motywu Plymouth"
+
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "Zainstaluj pakiety."
+
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Przetwarzanie pakietów (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Instalowanie jednego pakietu."
+msgstr[1] "Instalowanie %(num)d pakietów."
+msgstr[2] "Instalowanie %(num)d pakietów."
+msgstr[3] "Instalowanie%(num)d pakietów."
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Usuwanie jednego pakietu."
+msgstr[1] "Usuwanie %(num)d pakietów."
+msgstr[2] "Usuwanie %(num)d pakietów."
+msgstr[3] "Usuwanie %(num)d pakietów."
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Instalacja programu rozruchowego."
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
 
 #: src/modules/hwclock/main.py:26
 msgid "Setting hardware clock."
 msgstr "Ustawianie zegara systemowego."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Instalowanie danych."
+#: 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:28
+msgid "Writing fstab."
+msgstr "Zapisywanie fstab."
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Zadanie fikcyjne Python."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Krok fikcyjny Python {}"
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr "Konfigurowanie ustawień lokalnych."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Zapisywanie konfiguracji sieci."
diff --git a/lang/python/pt_BR/LC_MESSAGES/python.po b/lang/python/pt_BR/LC_MESSAGES/python.po
index fdf84133a..122da0e9b 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: 2022-05-27 11:18+0200\n"
+"POT-Creation-Date: 2022-05-29 16:17+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: André Marcelo Alvarenga , 2022\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/calamares/teams/20061/pt_BR/)\n"
@@ -22,107 +22,94 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "Instalar pacotes."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Configurar GRUB."
 
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Processando pacotes (%(count)d / %(total)d)"
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "Montando partições."
 
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Instalando um pacote."
-msgstr[1] "Instalando %(num)d pacotes."
-msgstr[2] "Instalando %(num)d pacotes."
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr "Erro interno ao montar datasets zfs"
 
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Removendo um pacote."
-msgstr[1] "Removendo %(num)d pacotes."
-msgstr[2] "Removendo %(num)d pacotes."
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr "Falha ao importar zpool"
 
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr "Erro do Gerenciador de Pacotes"
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr "Falha ao desbloquear zpool"
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-"O gerenciador de pacotes não pôde preparar as atualizações. O comando "
-"
{!s}
 retornou o código de erro {!s}."
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr "Falha ao definir o ponto de montagem zfs"
 
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-"O gerenciador de pacotes não pôde atualizar o sistema. O comando "
-"
{!s}
 retornou o código de erro {!s}."
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-"O gerenciador de pacotes não pôde fazer mudanças no sistema instalado. O "
-"comando 
{!s}
 retornou o código de erro {!s}."
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Salvando configuração de rede."
-
-#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
-#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
-#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
 msgid "Configuration Error"
 msgstr "Erro de Configuração."
 
-#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
-#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
-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/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Configurando mkinitcpio."
-
-#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
-#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
+#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
+#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:395
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr "Sem partições definidas para uso por 
{!s}
."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Criando initramfs com mkinitfs."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr "erro de montagem zfs"
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Falha ao executar mkinitfs no alvo"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Configurar serviços do systemd"
 
-#: 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/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/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Configurando serviço dmcrypt do OpenRC."
+#: 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 "Não foi possível ativar o cronômetro systemd {name!s}."
+
+#: 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/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -190,187 +177,6 @@ msgstr ""
 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/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Configurar serviços do systemd"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Não é possível modificar o serviço"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"A chamada systemctl {arg!s} no chroot retornou o código de erro"
-" {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py: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 "Não foi possível ativar o cronômetro systemd {name!s}."
-
-#: 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/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Tarefa modelo python."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Etapa modelo python {}"
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Instalar carregador de inicialização."
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-"Falha ao instalar o grub, não há partições definidas no armazenamento global"
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr "Erro de instalação do carregador de inicialização"
-
-#: src/modules/bootloader/main.py:783
-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:31
-msgid "Configuring locales."
-msgstr "Configurando locais."
-
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr "Montando partições."
-
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr "Erro interno ao montar datasets zfs"
-
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr "Falha ao importar zpool"
-
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr "Falha ao desbloquear zpool"
-
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr "Falha ao definir o ponto de montagem zfs"
-
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr "erro de montagem zfs"
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Configurar tema do Plymouth"
-
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr "Escrevendo fstab."
-
-#: src/modules/fstab/main.py:429
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-"Nenhuma configuração 
{!s}
 é dada para que 
{!s}
 possa "
-"utilizar."
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr "Configurar serviços do OpenRC"
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr ""
-"Não é possível adicionar serviço {name!s} ao nível de execução {level!s}."
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr ""
-"Não é possível remover serviço {name!s} do nível de execução {level!s}."
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-"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:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"Chamada rc-update {arg!s} no chroot retornou o código de erro "
-"{num!s}."
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr "O nível de execução de destino não existe"
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-"O caminho para o nível de execução {level!s} é {path!s}, que "
-"não existe."
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr "O serviço de destino não existe"
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-"O caminho para o serviço {name!s} é {path!s}, que não existe."
-
-#: 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/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Configurar GRUB."
-
 #: src/modules/displaymanager/main.py:524
 msgid "Cannot write KDM configuration file"
 msgstr "Não foi possível gravar o arquivo de configuração do KDM"
@@ -428,14 +234,208 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "A configuração do gerenciador de exibição está incompleta"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Configurando initramfs."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Configurando mkinitcpio."
+
+#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:401
+#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
+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/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"
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr ""
+"Não é possível adicionar serviço {name!s} ao nível de execução {level!s}."
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr ""
+"Não é possível remover serviço {name!s} do nível de execução {level!s}."
+
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+"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:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"Chamada rc-update {arg!s} no chroot retornou o código de erro "
+"{num!s}."
+
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr "O nível de execução de destino não existe"
+
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+"O caminho para o nível de execução {level!s} é {path!s}, que "
+"não existe."
+
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr "O serviço de destino não existe"
+
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+"O caminho para o serviço {name!s} é {path!s}, que não existe."
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Configurar tema do Plymouth"
+
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "Instalar pacotes."
+
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Processando pacotes (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Instalando um pacote."
+msgstr[1] "Instalando %(num)d pacotes."
+msgstr[2] "Instalando %(num)d pacotes."
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Removendo um pacote."
+msgstr[1] "Removendo %(num)d pacotes."
+msgstr[2] "Removendo %(num)d pacotes."
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr "Erro do Gerenciador de Pacotes"
+
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+"O gerenciador de pacotes não pôde preparar as atualizações. O comando "
+"
{!s}
 retornou o código de erro {!s}."
+
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+"O gerenciador de pacotes não pôde atualizar o sistema. O comando "
+"
{!s}
 retornou o código de erro {!s}."
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+"O gerenciador de pacotes não pôde fazer mudanças no sistema instalado. O "
+"comando 
{!s}
 retornou o código de erro {!s}."
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Instalar carregador de inicialização."
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+"Falha ao instalar o grub, não há partições definidas no armazenamento global"
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr "Erro de instalação do carregador de inicialização"
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
+"O carregador de inicialização não pôde ser instalado. O comando de "
+"instalação 
{!s}
 retornou o código de erro {!s}."
 
 #: src/modules/hwclock/main.py:26
 msgid "Setting hardware clock."
 msgstr "Configurando relógio de hardware."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Instalando os dados."
+#: 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:28
+msgid "Writing fstab."
+msgstr "Escrevendo fstab."
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
+"Nenhuma configuração 
{!s}
 é dada para que 
{!s}
 possa "
+"utilizar."
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Tarefa modelo python."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Etapa modelo python {}"
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr "Configurando locais."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Salvando configuração de rede."
diff --git a/lang/python/pt_PT/LC_MESSAGES/python.po b/lang/python/pt_PT/LC_MESSAGES/python.po
index 92a0037dd..1a4dd86c8 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: 2022-05-27 11:18+0200\n"
+"POT-Creation-Date: 2022-05-29 16:17+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Ricardo Simões , 2022\n"
 "Language-Team: Portuguese (Portugal) (https://www.transifex.com/calamares/teams/20061/pt_PT/)\n"
@@ -23,106 +23,94 @@ msgstr ""
 "Language: pt_PT\n"
 "Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "Instalar pacotes."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Configurar o GRUB."
 
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "A processar pacotes (%(count)d / %(total)d)"
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "A montar partições."
 
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "A instalar um pacote."
-msgstr[1] "A instalar %(num)d pacotes."
-msgstr[2] "A instalar %(num)d pacotes."
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr "Erro interno ao montar os conjuntos de dados zfs"
 
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "A remover um pacote."
-msgstr[1] "A remover %(num)d pacotes."
-msgstr[2] "A remover %(num)d pacotes."
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr "Falha ao importar zpool"
 
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr "Erro do gestor de pacotes"
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr "Falha ao desbloquear zpool"
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-"O gestor de pacotes não conseguiu preparar atualizações. O comando "
-"
{!s}
 apresentou o código de erro {!s}."
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr "Falha ao definir o ponto de montagem zfs"
 
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-"O gestor de pacotes não conseguiu atualizar o sistema. O comando "
-"
{!s}
 apresentou o código de erro {!s}."
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-"O gestor de pacotes não pôde fazer alterações ao sistema instalado. O "
-"comando 
{!s}
devolveu o código de erro {!s}."
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "A guardar a configuração de rede."
-
-#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
-#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
-#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
 msgid "Configuration Error"
 msgstr "Erro de configuração"
 
-#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
-#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
-msgid "No root mount point is given for 
{!s}
 to use."
-msgstr "Nenhum ponto de montagem root é fornecido para 
{!s}
 usar."
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "A configurar o mkintcpio."
-
-#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
-#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
+#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
+#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:395
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr "Nenhuma partição está definida para 
{!s}
 usar."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "A criar o initramfs com o mkinitfs."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr "erro de montagem zfs"
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Falha ao executar o mkintfs no destino"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Configurar serviços systemd"
 
-#: 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/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/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "A configurar o serviço OpenRC dmcrypt."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"systemctl {arg!s} 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 "Não é possível ativar o temporizador systemd {name!s}."
+
+#: 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/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -192,187 +180,6 @@ msgstr ""
 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/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Configurar serviços systemd"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Não é possível modificar serviço"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"systemctl {arg!s} chamar pelo chroot retornou com código de "
-"erro {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py: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 "Não é possível ativar o temporizador systemd {name!s}."
-
-#: 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/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Tarefa Dummy python."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Passo Dummy python {}"
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Instalar o carregador de arranque."
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-"Falha ao instalar o grub, sem partições definidas no armazenamento global"
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr "Erro de instalação do carregador de arranque"
-
-#: src/modules/bootloader/main.py:783
-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:31
-msgid "Configuring locales."
-msgstr "A configurar a localização."
-
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr "A montar partições."
-
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr "Erro interno ao montar os conjuntos de dados zfs"
-
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr "Falha ao importar zpool"
-
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr "Falha ao desbloquear zpool"
-
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr "Falha ao definir o ponto de montagem zfs"
-
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr "erro de montagem zfs"
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Configurar tema do Plymouth"
-
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr "A escrever o fstab."
-
-#: src/modules/fstab/main.py:429
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-"Não é dada nenhuma configuração 
{!s}
 para 
{!s}
 "
-"utilizar."
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr "Configurar serviços OpenRC"
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr ""
-"Não é possível adicionar o serviço {name!s} ao nível de execução {level!s}."
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr ""
-"Não é possível remover o serviço {name!s} do nível de execução {level!s}."
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-"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:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"rc-update {arg!s} chamar pelo chroot retornou com código de "
-"erro {num!s}."
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr "O nível de execução do destino não existe"
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-"O caminho para o nível de execução {level!s} é {path!s}, que "
-"não existe."
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr "O serviço do destino não existe"
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-"O caminho para o serviço {name!s} é {path!s}, que não existe."
-
-#: 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/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Configurar o GRUB."
-
 #: src/modules/displaymanager/main.py:524
 msgid "Cannot write KDM configuration file"
 msgstr "Não é possível gravar o ficheiro de configuração KDM"
@@ -430,14 +237,207 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "A configuração do gestor de exibição estava incompleta"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "A configurar o initramfs."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "A configurar o mkintcpio."
+
+#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:401
+#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr "Nenhum ponto de montagem root é fornecido para 
{!s}
 usar."
+
+#: 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"
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr ""
+"Não é possível adicionar o serviço {name!s} ao nível de execução {level!s}."
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr ""
+"Não é possível remover o serviço {name!s} do nível de execução {level!s}."
+
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+"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:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"rc-update {arg!s} chamar pelo chroot retornou com código de "
+"erro {num!s}."
+
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr "O nível de execução do destino não existe"
+
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+"O caminho para o nível de execução {level!s} é {path!s}, que "
+"não existe."
+
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr "O serviço do destino não existe"
+
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+"O caminho para o serviço {name!s} é {path!s}, que não existe."
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Configurar tema do Plymouth"
+
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "Instalar pacotes."
+
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "A processar pacotes (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "A instalar um pacote."
+msgstr[1] "A instalar %(num)d pacotes."
+msgstr[2] "A instalar %(num)d pacotes."
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "A remover um pacote."
+msgstr[1] "A remover %(num)d pacotes."
+msgstr[2] "A remover %(num)d pacotes."
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr "Erro do gestor de pacotes"
+
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+"O gestor de pacotes não conseguiu preparar atualizações. O comando "
+"
{!s}
 apresentou o código de erro {!s}."
+
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+"O gestor de pacotes não conseguiu atualizar o sistema. O comando "
+"
{!s}
 apresentou o código de erro {!s}."
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+"O gestor de pacotes não pôde fazer alterações ao sistema instalado. O "
+"comando 
{!s}
devolveu o código de erro {!s}."
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Instalar o carregador de arranque."
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+"Falha ao instalar o grub, sem partições definidas no armazenamento global"
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr "Erro de instalação do carregador de arranque"
+
+#: src/modules/bootloader/main.py:783
+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/hwclock/main.py:26
 msgid "Setting hardware clock."
 msgstr "A definir o relógio do hardware."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "A instalar dados."
+#: 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:28
+msgid "Writing fstab."
+msgstr "A escrever o fstab."
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
+"Não é dada nenhuma configuração 
{!s}
 para 
{!s}
 "
+"utilizar."
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Tarefa Dummy python."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Passo Dummy python {}"
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr "A configurar a localização."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "A guardar a configuração de rede."
diff --git a/lang/python/ro/LC_MESSAGES/python.po b/lang/python/ro/LC_MESSAGES/python.po
index 65b77c595..c4d4a8c0e 100644
--- a/lang/python/ro/LC_MESSAGES/python.po
+++ b/lang/python/ro/LC_MESSAGES/python.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-27 11:18+0200\n"
+"POT-Creation-Date: 2022-05-29 16:17+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Chele Ion , 2021\n"
 "Language-Team: Romanian (https://www.transifex.com/calamares/teams/20061/ro/)\n"
@@ -23,99 +23,89 @@ 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/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "Instalează pachetele."
-
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Se procesează pachetele (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Instalează un pachet."
-msgstr[1] "Se instalează %(num)d pachete."
-msgstr[2] "Se instalează %(num)d din pachete."
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Se elimină un pachet."
-msgstr[1] "Se elimină %(num)d pachet."
-msgstr[2] "Se elimină %(num)d de pachete."
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
 msgstr ""
 
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
-#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
-#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr ""
+
+#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
 msgid "Configuration Error"
 msgstr "Eroare de configurare"
 
-#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
-#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
-msgid "No root mount point is given for 
{!s}
 to use."
-msgstr "Nu este definită o partiţie rădăcină pentru 1{!s}1 ."
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr ""
-
-#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
-#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
+#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
+#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:395
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr "Nu sunt partiţii  definite ca  1{!s}1 ."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/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/unpackfs/main.py:34
@@ -182,169 +172,6 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr ""
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr ""
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py: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/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Job python fictiv."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Dummy python step {}"
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr ""
-
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr ""
-
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr ""
-
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr ""
-
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr ""
-
-#: src/modules/fstab/main.py:429
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/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/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr ""
-
 #: src/modules/displaymanager/main.py:524
 msgid "Cannot write KDM configuration file"
 msgstr ""
@@ -399,14 +226,187 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Configurare initramfs"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:401
+#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr "Nu este definită o partiţie rădăcină pentru 1{!s}1 ."
+
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr ""
+
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "Instalează pachetele."
+
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Se procesează pachetele (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Instalează un pachet."
+msgstr[1] "Se instalează %(num)d pachete."
+msgstr[2] "Se instalează %(num)d din pachete."
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Se elimină un pachet."
+msgstr[1] "Se elimină %(num)d pachet."
+msgstr[2] "Se elimină %(num)d de pachete."
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr ""
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
 
 #: src/modules/hwclock/main.py:26
 msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: 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 "Configurare initramfs"
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr ""
+
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Job python fictiv."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Dummy python step {}"
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/ru/LC_MESSAGES/python.po b/lang/python/ru/LC_MESSAGES/python.po
index 10fdbe702..c7ad00470 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: 2022-05-27 11:18+0200\n"
+"POT-Creation-Date: 2022-05-29 16:17+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: ZIzA, 2020\n"
 "Language-Team: Russian (https://www.transifex.com/calamares/teams/20061/ru/)\n"
@@ -22,102 +22,91 @@ 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/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "Установить пакеты."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Настройте GRUB."
 
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Обработка пакетов (%(count)d / %(total)d)"
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "Монтирование разделов."
 
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Установка одного пакета."
-msgstr[1] "Установка %(num)d пакетов."
-msgstr[2] "Установка %(num)d пакетов."
-msgstr[3] "Установка %(num)d пакетов."
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Удаление одного пакета."
-msgstr[1] "Удаление %(num)d пакетов."
-msgstr[2] "Удаление %(num)d пакетов."
-msgstr[3] "Удаление %(num)d пакетов."
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
 msgstr ""
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
 msgstr ""
 
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
 msgstr ""
 
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Сохранение настроек сети."
-
-#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
-#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
-#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
 msgid "Configuration Error"
 msgstr "Ошибка конфигурации"
 
-#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
-#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
-msgid "No root mount point is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr ""
-
-#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
-#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
+#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
+#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:395
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr "Не определены разделы для использования 
{!S}
."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: 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:69
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Код выхода {}"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Настройка службы OpenRC dmcrypt."
+#: 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/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -183,170 +172,6 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Настройка systemd сервисов"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Не могу изменить сервис"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"Вызов 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/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr ""
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Установить загрузчик."
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr "Настройка языка."
-
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr "Монтирование разделов."
-
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr ""
-
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr ""
-
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Настроить тему Plymouth"
-
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr "Запись fstab."
-
-#: src/modules/fstab/main.py:429
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr "Настройка служб OpenRC"
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr "Целевой сервис не существует."
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/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/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Настройте GRUB."
-
 #: src/modules/displaymanager/main.py:524
 msgid "Cannot write KDM configuration file"
 msgstr ""
@@ -401,14 +226,189 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Настройка initramfs."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:401
+#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Установка данных."
+
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr "Настройка служб OpenRC"
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr "Целевой сервис не существует."
+
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Настроить тему Plymouth"
+
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "Установить пакеты."
+
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Обработка пакетов (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Установка одного пакета."
+msgstr[1] "Установка %(num)d пакетов."
+msgstr[2] "Установка %(num)d пакетов."
+msgstr[3] "Установка %(num)d пакетов."
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Удаление одного пакета."
+msgstr[1] "Удаление %(num)d пакетов."
+msgstr[2] "Удаление %(num)d пакетов."
+msgstr[3] "Удаление %(num)d пакетов."
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Установить загрузчик."
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
 
 #: src/modules/hwclock/main.py:26
 msgid "Setting hardware clock."
 msgstr "Установка аппаратных часов."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-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:28
+msgid "Writing fstab."
+msgstr "Запись fstab."
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr ""
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr "Настройка языка."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Сохранение настроек сети."
diff --git a/lang/python/si/LC_MESSAGES/python.po b/lang/python/si/LC_MESSAGES/python.po
index 844eef117..267e23597 100644
--- a/lang/python/si/LC_MESSAGES/python.po
+++ b/lang/python/si/LC_MESSAGES/python.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-27 11:18+0200\n"
+"POT-Creation-Date: 2022-05-29 16:17+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Sandaruwan Samaraweera, 2022\n"
 "Language-Team: Sinhala (https://www.transifex.com/calamares/teams/20061/si/)\n"
@@ -22,104 +22,93 @@ msgstr ""
 "Language: si\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "ඇසුරුම් ස්ථාපනය කරන්න."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "GRUB වින්‍යාස කරන්න."
 
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "පැකේජ සැකසීම (%(count)d / %(total)d)"
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "කොටස් සවි කිරීම."
 
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "ඇසුරුමක් ස්ථාපනය වෙමින්."
-msgstr[1] "ඇසුරුම් %(num)d ක් ස්ථාපනය වෙමින්."
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr "zfs දත්ත කට්ටල සවිකිරීමේ අභ්‍යන්තර දෝෂයකි"
 
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "ඇසුරුමක් ඉවත් වෙමින්."
-msgstr[1] "ඇසුරුම් %(num)d ක් ඉවත් වෙමින්."
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr "zpool ආයාත කිරීමට අසමත් විය"
 
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr "පැකේජ කළමනාකරු දෝෂයකි"
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr "zpool අගුලු හැරීමට අසමත් විය"
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-"පැකේජ කළමනාකරුට යාවත්කාලීන සකස් කිරීමට නොහැකි විය. විධානය 
{!s}
 "
-"දෝෂ කේතය {!s} ලබා දුන්නේය."
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr "zfs සවිකිරීමේ ලක්ෂ්‍යය සැකසීමට අසමත් විය"
 
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-"පැකේජ කළමනාකරුට පද්ධතිය යාවත්කාලීන කළ නොහැකි විය. විධානය 
{!s}
 දෝෂ"
-" කේතය {!s} ලබා දුන්නේය."
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-"පැකේජ කළමනාකරුට ස්ථාපිත පද්ධතියට වෙනස්කම් සිදු කළ නොහැක. විධානය "
-"
{!s}
 දෝෂ කේතය {!s} ලබා දුන්නේය."
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "ජාල වින්‍යාසය සුරැකෙමින්."
-
-#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
-#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
-#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
 msgid "Configuration Error"
 msgstr "වින්‍යාස දෝෂය"
 
-#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
-#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
-msgid "No root mount point is given for 
{!s}
 to use."
-msgstr "{!s} සඳහා භාවිතා කිරීමට root mount point ලබා දී නොමැත."
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "mkinitcpio වින්‍යාස කරමින්."
-
-#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
-#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
+#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
+#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:395
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr "{!s} සඳහා භාවිතා කිරීමට කිසිදු කොටස් නිර්වචනය කර නොමැත."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "mkinitfs සමඟ initramfs නිර්මාණය කිරීම."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr "zfs සවිකිරීමේ දෝෂයකි"
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "ඉලක්කය මත mkinitfs ධාවනය කිරීමට අසමත් විය"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "systemd සේවා වින්‍යාස කරන්න"
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "පිටවීමේ කේතය වූයේ {}"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "සේවාව වෙනස් කළ නොහැක"
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "OpenRC dmcrypt සේවාව වින්‍යාස කරමින්."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"systemctl {arg!s} chroot වෙත ඇමතුමක් ලබා දුන් දෝෂ කේතය {num!s}."
+
+#: src/modules/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 ""
+"{name!s} ඒකකය සඳහා නොදන්නා systemd විධාන {command!s} සහ "
+"{suffix!s}."
 
 #: src/modules/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -187,179 +176,6 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr "ඉලක්ක පද්ධතියේ \"{}\" ගමනාන්තය නාමාවලියක් නොවේ"
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "systemd සේවා වින්‍යාස කරන්න"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "සේවාව වෙනස් කළ නොහැක"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"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 ""
-"{name!s} ඒකකය සඳහා නොදන්නා systemd විධාන {command!s} සහ "
-"{suffix!s}."
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "ඩමි python වැඩසටහන."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "ව්‍යාජ python පියවර {}"
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "bootloader ස්ථාපනය කරන්න."
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-"Grub ස්ථාපනය කිරීමට අපොහොසත් විය, ගෝලීය ආචයනය තුළ කොටස් අර්ථ දක්වා නොමැත"
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr "Bootloader ස්ථාපනය කිරීමේ දෝෂයකි"
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-"ඇරඹුම් කාරකය ස්ථාපනය කල නොහැක. ස්ථාපන විධානය 
{!s}
 දෝෂ කේතය {!s} "
-"ලබා දුන්නේය."
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr "ස්ථාන වින්‍යාස කිරීම."
-
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr "කොටස් සවි කිරීම."
-
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr "zfs දත්ත කට්ටල සවිකිරීමේ අභ්‍යන්තර දෝෂයකි"
-
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr "zpool ආයාත කිරීමට අසමත් විය"
-
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr "zpool අගුලු හැරීමට අසමත් විය"
-
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr "zfs සවිකිරීමේ ලක්ෂ්‍යය සැකසීමට අසමත් විය"
-
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr "zfs සවිකිරීමේ දෝෂයකි"
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Plymouth තේමාව වින්‍යාස කරන්න"
-
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr "fstab ලියමින්."
-
-#: src/modules/fstab/main.py:429
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-"භාවිතා කිරීමට 
{!s}
 සඳහා 
{!s}
 වින්‍යාසයක් ලබා දී නොමැත."
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr "OpenRC සේවා වින්‍යාස කරන්න"
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr "ධාවන මට්ටම {level!s} වෙත සේවාව {name!s} එක් කළ නොහැක."
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr "ධාවන මට්ටමේ {level!s} වෙතින් සේවාව {name!s} ඉවත් කළ නොහැක."
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-"{name!s} සේවාව සඳහා නොදන්නා සේවා-ක්‍රියාව {arg!s} ධාවන මට්ටමේ "
-"{level!s}."
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"rc-update {arg!s} chroot හි ඇමතුම {num!s} දෝෂ කේතය ලබා දුන්නේය."
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr "ඉලක්ක ධාවන මට්ටම නොපවතී"
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr "ධාවන මට්ටම {level!s} සඳහා මාර්ගය {path!s}, එය නොපවතී."
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr "ඉලක්ක සේවාව නොපවතී"
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr "සේවාව සඳහා {name!s} මාර්ගය {path!s}, එය නොපවතී."
-
-#: src/modules/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 "ඉලක්කය මත ඩ්‍රැකට් ධාවනය කිරීමට අපොහොසත් විය"
-
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "GRUB වින්‍යාස කරන්න."
-
 #: src/modules/displaymanager/main.py:524
 msgid "Cannot write KDM configuration file"
 msgstr "KDM වින්‍යාස ගොනුව ලිවිය නොහැක"
@@ -416,14 +232,198 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "සංදර්ශක කළමනාකරු වින්‍යාසය අසම්පූර්ණ විය"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "initramfs වින්‍යාස කිරීම."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "mkinitcpio වින්‍යාස කරමින්."
+
+#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:401
+#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr "{!s} සඳහා භාවිතා කිරීමට root mount point ලබා දී නොමැත."
+
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "දත්ත ස්ථාපනය වෙමින්."
+
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr "OpenRC සේවා වින්‍යාස කරන්න"
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr "ධාවන මට්ටම {level!s} වෙත සේවාව {name!s} එක් කළ නොහැක."
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr "ධාවන මට්ටමේ {level!s} වෙතින් සේවාව {name!s} ඉවත් කළ නොහැක."
+
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+"{name!s} සේවාව සඳහා නොදන්නා සේවා-ක්‍රියාව {arg!s} ධාවන මට්ටමේ "
+"{level!s}."
+
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"rc-update {arg!s} chroot හි ඇමතුම {num!s} දෝෂ කේතය ලබා දුන්නේය."
+
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr "ඉලක්ක ධාවන මට්ටම නොපවතී"
+
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr "ධාවන මට්ටම {level!s} සඳහා මාර්ගය {path!s}, එය නොපවතී."
+
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr "ඉලක්ක සේවාව නොපවතී"
+
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr "සේවාව සඳහා {name!s} මාර්ගය {path!s}, එය නොපවතී."
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Plymouth තේමාව වින්‍යාස කරන්න"
+
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "ඇසුරුම් ස්ථාපනය කරන්න."
+
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "පැකේජ සැකසීම (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "ඇසුරුමක් ස්ථාපනය වෙමින්."
+msgstr[1] "ඇසුරුම් %(num)d ක් ස්ථාපනය වෙමින්."
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "ඇසුරුමක් ඉවත් වෙමින්."
+msgstr[1] "ඇසුරුම් %(num)d ක් ඉවත් වෙමින්."
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr "පැකේජ කළමනාකරු දෝෂයකි"
+
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+"පැකේජ කළමනාකරුට යාවත්කාලීන සකස් කිරීමට නොහැකි විය. විධානය 
{!s}
 "
+"දෝෂ කේතය {!s} ලබා දුන්නේය."
+
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+"පැකේජ කළමනාකරුට පද්ධතිය යාවත්කාලීන කළ නොහැකි විය. විධානය 
{!s}
 දෝෂ"
+" කේතය {!s} ලබා දුන්නේය."
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+"පැකේජ කළමනාකරුට ස්ථාපිත පද්ධතියට වෙනස්කම් සිදු කළ නොහැක. විධානය "
+"
{!s}
 දෝෂ කේතය {!s} ලබා දුන්නේය."
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "bootloader ස්ථාපනය කරන්න."
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+"Grub ස්ථාපනය කිරීමට අපොහොසත් විය, ගෝලීය ආචයනය තුළ කොටස් අර්ථ දක්වා නොමැත"
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr "Bootloader ස්ථාපනය කිරීමේ දෝෂයකි"
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
+"ඇරඹුම් කාරකය ස්ථාපනය කල නොහැක. ස්ථාපන විධානය 
{!s}
 දෝෂ කේතය {!s} "
+"ලබා දුන්නේය."
 
 #: src/modules/hwclock/main.py:26
 msgid "Setting hardware clock."
 msgstr "දෘඩාංග ඔරලෝසුව සැකසෙමින්."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-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 "ඉලක්කය මත ඩ්‍රැකට් ධාවනය කිරීමට අපොහොසත් විය"
+
+#: 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:28
+msgid "Writing fstab."
+msgstr "fstab ලියමින්."
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
+"භාවිතා කිරීමට 
{!s}
 සඳහා 
{!s}
 වින්‍යාසයක් ලබා දී නොමැත."
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "ඩමි python වැඩසටහන."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "ව්‍යාජ python පියවර {}"
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr "ස්ථාන වින්‍යාස කිරීම."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "ජාල වින්‍යාසය සුරැකෙමින්."
diff --git a/lang/python/sk/LC_MESSAGES/python.po b/lang/python/sk/LC_MESSAGES/python.po
index b5747608f..d9d113213 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: 2022-05-27 11:18+0200\n"
+"POT-Creation-Date: 2022-05-29 16:17+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Dušan Kazik , 2020\n"
 "Language-Team: Slovak (https://www.transifex.com/calamares/teams/20061/sk/)\n"
@@ -21,102 +21,94 @@ 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/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "Inštalácia balíkov."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Konfigurácia zavádzača GRUB."
 
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Spracovávajú sa balíky (%(count)d / %(total)d)"
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "Pripájanie oddielov."
 
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Inštaluje sa jeden balík."
-msgstr[1] "Inštalujú sa %(num)d balíky."
-msgstr[2] "Inštaluje sa %(num)d balíkov."
-msgstr[3] "Inštaluje sa %(num)d balíkov."
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Odstraňuje sa jeden balík."
-msgstr[1] "Odstraňujú sa %(num)d balíky."
-msgstr[2] "Odstraňuje sa %(num)d balíkov."
-msgstr[3] "Odstraňuje sa %(num)d balíkov."
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
 msgstr ""
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
 msgstr ""
 
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
 msgstr ""
 
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Ukladanie sieťovej konfigurácie."
-
-#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
-#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
-#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
 msgid "Configuration Error"
 msgstr "Chyba konfigurácie"
 
-#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
-#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
-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/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Konfigurácia mkinitcpio."
-
-#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
-#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
+#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
+#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:395
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr "Nie sú určené žiadne oddiely na použitie pre 
{!s}
."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Konfigurácia služieb systemd"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Nedá sa upraviť služba"
+
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"Volanie systemctl {arg!s} in prostredí chroot vrátilo chybový "
+"kód {num!s}."
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py: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/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Kód skončenia bol {}"
+#: 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/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: 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/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -182,173 +174,6 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr "Cieľ \"{}\" v cieľovom systéme nie je adresárom"
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Konfigurácia služieb systemd"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Nedá sa upraviť služba"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"Volanie systemctl {arg!s} in prostredí chroot vrátilo chybový "
-"kód {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py: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/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Fiktívna úloha jazyka python."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Fiktívny krok {} jazyka python"
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Inštalácia zavádzača."
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr "Konfigurácia miestnych nastavení."
-
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr "Pripájanie oddielov."
-
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr ""
-
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr ""
-
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Konfigurácia motívu služby Plymouth"
-
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr "Zapisovanie fstab."
-
-#: src/modules/fstab/main.py:429
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr "Konfigurácia služieb OpenRC"
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr "Cieľová služba neexistuje"
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr "Cesta k službe {name!s} je {path!s}, ale neexistuje."
-
-#: src/modules/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/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Konfigurácia zavádzača GRUB."
-
 #: src/modules/displaymanager/main.py:524
 msgid "Cannot write KDM configuration file"
 msgstr "Nedá sa zapísať konfiguračný súbor správcu KDM"
@@ -403,14 +228,189 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "Konfigurácia správcu zobrazenia nebola úplná"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Konfigurácia initramfs."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Konfigurácia mkinitcpio."
+
+#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:401
+#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
+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/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Inštalácia údajov."
+
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr "Konfigurácia služieb OpenRC"
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr "Cieľová služba neexistuje"
+
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr "Cesta k službe {name!s} je {path!s}, ale neexistuje."
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Konfigurácia motívu služby Plymouth"
+
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "Inštalácia balíkov."
+
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Spracovávajú sa balíky (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Inštaluje sa jeden balík."
+msgstr[1] "Inštalujú sa %(num)d balíky."
+msgstr[2] "Inštaluje sa %(num)d balíkov."
+msgstr[3] "Inštaluje sa %(num)d balíkov."
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Odstraňuje sa jeden balík."
+msgstr[1] "Odstraňujú sa %(num)d balíky."
+msgstr[2] "Odstraňuje sa %(num)d balíkov."
+msgstr[3] "Odstraňuje sa %(num)d balíkov."
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Inštalácia zavádzača."
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
 
 #: src/modules/hwclock/main.py:26
 msgid "Setting hardware clock."
 msgstr "Nastavovanie hardvérových hodín."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Inštalácia údajov."
+#: 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:28
+msgid "Writing fstab."
+msgstr "Zapisovanie fstab."
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Fiktívna úloha jazyka python."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Fiktívny krok {} jazyka python"
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr "Konfigurácia miestnych nastavení."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Ukladanie sieťovej konfigurácie."
diff --git a/lang/python/sl/LC_MESSAGES/python.po b/lang/python/sl/LC_MESSAGES/python.po
index 8e3792933..f9402c8bc 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: 2022-05-27 11:18+0200\n"
+"POT-Creation-Date: 2022-05-29 16:17+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Slovenian (https://www.transifex.com/calamares/teams/20061/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -17,101 +17,89 @@ 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/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
 msgstr ""
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
 msgstr ""
 
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
 msgstr ""
 
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr ""
-
-#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
-#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
-#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
 msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
-#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
-msgid "No root mount point is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr ""
-
-#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
-#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
+#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
+#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:395
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/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/unpackfs/main.py:34
@@ -178,169 +166,6 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr ""
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr ""
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py: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/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr ""
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr ""
-
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr ""
-
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr ""
-
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr ""
-
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr ""
-
-#: src/modules/fstab/main.py:429
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/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/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr ""
-
 #: src/modules/displaymanager/main.py:524
 msgid "Cannot write KDM configuration file"
 msgstr ""
@@ -395,14 +220,189 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:401
+#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr ""
+
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr ""
+
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr ""
+
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr ""
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
 msgstr ""
 
 #: src/modules/hwclock/main.py:26
 msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: 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:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr ""
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/sq/LC_MESSAGES/python.po b/lang/python/sq/LC_MESSAGES/python.po
index 3be6c94f9..bb458ca6a 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: 2022-05-27 11:18+0200\n"
+"POT-Creation-Date: 2022-05-29 16:17+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Besnik Bleta , 2022\n"
 "Language-Team: Albanian (https://www.transifex.com/calamares/teams/20061/sq/)\n"
@@ -21,105 +21,94 @@ msgstr ""
 "Language: sq\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "Instalo paketa."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Formësoni GRUB-in."
 
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Po përpunohen paketat (%(count)d / %(total)d)"
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "Po montohen pjesë."
 
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Po instalohet një paketë."
-msgstr[1] "Po instalohen %(num)d paketa."
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr "Gabim i brendshëm gjatë montimit të grupeve zfs të të dhënave"
 
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Po hiqet një paketë."
-msgstr[1] "Po hiqen %(num)d paketa."
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr "S’u arrit të importohej zpool"
 
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr "Gabim Përgjegjësi Paketash"
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr "S’u arrit të shkyçej zpool"
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-"Përgjegjësi i paketave s’përgatiti dot përditësime. Urdhri 
{!s}
 u"
-" përgjigj me kod gabimi {!s}."
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr "S’u arrit të caktohej pikë montimi zfs"
 
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-"Përgjegjësi i paketave s’përditësoi dot sistemin. Urdhri 
{!s}
 u "
-"përgjigj me kod gabimi {!s}."
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-"Përgjegjësi i paketave s’bëri dot ndryshime te sistemi i instaluar. Urdhri "
-"
{!s}
 u përgjigj me kod gabimi {!s}."
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Po ruhet formësimi i rrjetit."
-
-#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
-#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
-#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
 msgid "Configuration Error"
 msgstr "Gabim Formësimi"
 
-#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
-#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
-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/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Po formësohet mkinitcpio."
-
-#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
-#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
+#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
+#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:395
 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/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Po krijohet initramfs me mkinitfs."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr "Gabim montimi zfs"
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "S’u arrit të xhirohej mkinitfs te objektivi"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Formësoni shërbime systemd"
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Kodi i daljes qe {}"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "S’modifikohet dot shërbimi"
 
-#: 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: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/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -188,185 +177,6 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr "Destinacioni \"{}\" te sistemi i synuar s’është drejtori"
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Formësoni shërbime systemd"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "S’modifikohet dot shërbimi"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"Thirrja systemctl {arg!s} në chroot u përgjigj me kod gabimi "
-"{num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py: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/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Akt python dummy."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Hap python {} dummy"
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Instalo ngarkues nisjesh."
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-"S'u arrit të instalohej grub, te depozita globale s’ka të përkufizuara pjesë"
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr "Gabim instalimi Ngarkuesi Nisësi"
-
-#: src/modules/bootloader/main.py:783
-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:31
-msgid "Configuring locales."
-msgstr "Po formësohen vendoret."
-
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr "Po montohen pjesë."
-
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr "Gabim i brendshëm gjatë montimit të grupeve zfs të të dhënave"
-
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr "S’u arrit të importohej zpool"
-
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr "S’u arrit të shkyçej zpool"
-
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr "S’u arrit të caktohej pikë montimi zfs"
-
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr "Gabim montimi zfs"
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Formësoni temën Plimuth"
-
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr "Po shkruhet fstab."
-
-#: src/modules/fstab/main.py:429
-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/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr "Formësoni shërbime OpenRC"
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr "S’shtohet dot shërbimi {name!s} te run-level {level!s}."
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr "S’hiqet dot shërbimi {name!s} nga run-level {level!s}."
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-"Service-action {arg!s} i panjohur për shërbimin {name!s} te "
-"run-level {level!s}."
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"Thirrje rc-update {arg!s} në chroot u përgjigj me kod gabimi "
-"{num!s}."
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr "Runlevel-i i synuar nuk ekziston"
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-"Shtegu për runlevel {level!s} është {path!s}, i cili nuk "
-"ekziston."
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr "Shërbimi i synuar nuk ekziston"
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-"Shtegu për shërbimin {name!s} është {path!s}, i cili nuk "
-"ekziston."
-
-#: src/modules/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/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Formësoni GRUB-in."
-
 #: src/modules/displaymanager/main.py:524
 msgid "Cannot write KDM configuration file"
 msgstr "S’shkruhet dot kartelë formësimi KDM"
@@ -423,14 +233,204 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "Formësimi i përgjegjësit të ekranit s’qe i plotë"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Po formësohet initramfs."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Po formësohet mkinitcpio."
+
+#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:401
+#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
+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/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Po instalohen të dhëna."
+
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr "Formësoni shërbime OpenRC"
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr "S’shtohet dot shërbimi {name!s} te run-level {level!s}."
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr "S’hiqet dot shërbimi {name!s} nga run-level {level!s}."
+
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+"Service-action {arg!s} i panjohur për shërbimin {name!s} te "
+"run-level {level!s}."
+
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"Thirrje rc-update {arg!s} në chroot u përgjigj me kod gabimi "
+"{num!s}."
+
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr "Runlevel-i i synuar nuk ekziston"
+
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+"Shtegu për runlevel {level!s} është {path!s}, i cili nuk "
+"ekziston."
+
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr "Shërbimi i synuar nuk ekziston"
+
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+"Shtegu për shërbimin {name!s} është {path!s}, i cili nuk "
+"ekziston."
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Formësoni temën Plimuth"
+
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "Instalo paketa."
+
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Po përpunohen paketat (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Po instalohet një paketë."
+msgstr[1] "Po instalohen %(num)d paketa."
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Po hiqet një paketë."
+msgstr[1] "Po hiqen %(num)d paketa."
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr "Gabim Përgjegjësi Paketash"
+
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+"Përgjegjësi i paketave s’përgatiti dot përditësime. Urdhri 
{!s}
 u"
+" përgjigj me kod gabimi {!s}."
+
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+"Përgjegjësi i paketave s’përditësoi dot sistemin. Urdhri 
{!s}
 u "
+"përgjigj me kod gabimi {!s}."
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+"Përgjegjësi i paketave s’bëri dot ndryshime te sistemi i instaluar. Urdhri "
+"
{!s}
 u përgjigj me kod gabimi {!s}."
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Instalo ngarkues nisjesh."
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+"S'u arrit të instalohej grub, te depozita globale s’ka të përkufizuara pjesë"
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr "Gabim instalimi Ngarkuesi Nisësi"
+
+#: src/modules/bootloader/main.py:783
+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/hwclock/main.py:26
 msgid "Setting hardware clock."
 msgstr "Po caktohet ora hardware."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Po instalohen të dhëna."
+#: 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:28
+msgid "Writing fstab."
+msgstr "Po shkruhet fstab."
+
+#: src/modules/fstab/main.py:429
+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/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Akt python dummy."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Hap python {} dummy"
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr "Po formësohen vendoret."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Po ruhet formësimi i rrjetit."
diff --git a/lang/python/sr/LC_MESSAGES/python.po b/lang/python/sr/LC_MESSAGES/python.po
index 606b71e62..c4d4480e0 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: 2022-05-27 11:18+0200\n"
+"POT-Creation-Date: 2022-05-29 16:17+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Slobodan Simić , 2020\n"
 "Language-Team: Serbian (https://www.transifex.com/calamares/teams/20061/sr/)\n"
@@ -21,99 +21,89 @@ 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/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Подеси ГРУБ"
+
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "Монтирање партиција."
+
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
 msgstr ""
 
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
 msgstr ""
 
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
 msgstr ""
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
 msgstr ""
 
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Упис поставе мреже."
-
-#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
-#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
-#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
 msgid "Configuration Error"
 msgstr "Грешка поставе"
 
-#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
-#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
-msgid "No root mount point is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr ""
-
-#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
-#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
+#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
+#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:395
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Подеси „systemd“ сервисе"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Не могу да мењам сервис"
+
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/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/unpackfs/main.py:34
@@ -180,169 +170,6 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Подеси „systemd“ сервисе"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Не могу да мењам сервис"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py: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/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr ""
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr "Подешавање локалитета."
-
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr "Монтирање партиција."
-
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr ""
-
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr ""
-
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr "Уписивање fstab."
-
-#: src/modules/fstab/main.py:429
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/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/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Подеси ГРУБ"
-
 #: src/modules/displaymanager/main.py:524
 msgid "Cannot write KDM configuration file"
 msgstr ""
@@ -397,14 +224,187 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:401
+#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Инсталирање података."
+
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr ""
+
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr ""
+
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr ""
+
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr ""
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
 msgstr ""
 
 #: src/modules/hwclock/main.py:26
 msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-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:28
+msgid "Writing fstab."
+msgstr "Уписивање fstab."
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr ""
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr "Подешавање локалитета."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Упис поставе мреже."
diff --git a/lang/python/sr@latin/LC_MESSAGES/python.po b/lang/python/sr@latin/LC_MESSAGES/python.po
index 804c3269f..9dad5fcc8 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: 2022-05-27 11:18+0200\n"
+"POT-Creation-Date: 2022-05-29 16:17+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Serbian (Latin) (https://www.transifex.com/calamares/teams/20061/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -17,99 +17,89 @@ 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/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
 msgstr ""
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
 msgstr ""
 
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
 msgstr ""
 
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr ""
-
-#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
-#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
-#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
 msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
-#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
-msgid "No root mount point is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr ""
-
-#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
-#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
+#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
+#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:395
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/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/unpackfs/main.py:34
@@ -176,169 +166,6 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr ""
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr ""
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py: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/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr ""
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr ""
-
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr ""
-
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr ""
-
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr ""
-
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr ""
-
-#: src/modules/fstab/main.py:429
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/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/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr ""
-
 #: src/modules/displaymanager/main.py:524
 msgid "Cannot write KDM configuration file"
 msgstr ""
@@ -393,14 +220,187 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:401
+#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr ""
+
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr ""
+
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr ""
+
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr ""
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
 msgstr ""
 
 #: src/modules/hwclock/main.py:26
 msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: 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:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr ""
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/sv/LC_MESSAGES/python.po b/lang/python/sv/LC_MESSAGES/python.po
index 560440a62..2756d98be 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: 2022-05-27 11:18+0200\n"
+"POT-Creation-Date: 2022-05-29 16:17+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Luna Jernberg , 2022\n"
 "Language-Team: Swedish (https://www.transifex.com/calamares/teams/20061/sv/)\n"
@@ -23,105 +23,94 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "Installera paket."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Konfigurera GRUB."
 
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Bearbetar paket (%(count)d / %(total)d)"
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "Monterar partitioner."
 
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Installerar ett paket."
-msgstr[1] "Installerar %(num)d paket."
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr "Internt fel vid montering av zfs datasets"
 
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Tar bort ett paket."
-msgstr[1] "Tar bort %(num)d paket."
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr "Misslyckades att importera zpool"
 
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr "Pakethanterare fel"
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr "Misslyckades att låsa upp zpool"
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-"Pakethanteraren kunde inte förbereda uppdateringar kommandot 
{!s}
"
-" returnerade felkod {!s}."
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr "Misslyckades att ställa in zfs monteringspunkt "
 
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-"Pakethanteraren kunde inte uppdatera systemet. kommandot 
{!s}
 "
-"returnerade felkod {!s}."
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-"Pakethanteraren kunde inte göra ändringar till det installerade systemet. "
-"kommandot 
{!s}
 returnerade felkod {!s}."
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Sparar nätverkskonfiguration."
-
-#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
-#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
-#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
 msgid "Configuration Error"
 msgstr "Konfigurationsfel"
 
-#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
-#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
-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/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Konfigurerar mkinitcpio."
-
-#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
-#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
+#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
+#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:395
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr "Inga partitioner är definerade för 
{!s}
 att använda."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Skapar initramfs med mkinitfs."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr "zfs monteringsfel"
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Misslyckades att köra mkinitfs på målet "
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Konfigurera systemd tjänster"
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Felkoden var {}"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Kunde inte modifiera tjänst"
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Konfigurerar OpenRC dmcrypt tjänst."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"Anrop till systemctl {arg!s}i chroot returnerade felkod "
+"{num!s}."
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py: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 "Kunde inte aktivera systemd timer {name!s}."
+
+#: 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/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -189,186 +178,6 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr "Destinationen \"{}\" på målsystemet är inte en katalog"
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Konfigurera systemd tjänster"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Kunde inte modifiera tjänst"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"Anrop till systemctl {arg!s}i chroot returnerade felkod "
-"{num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py: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 "Kunde inte aktivera systemd timer {name!s}."
-
-#: 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/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Exempel python jobb"
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Exempel python steg {}"
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Installera starthanterare."
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-"Det gick inte att installera grub, inga partitioner definierade i global "
-"lagring"
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr "Starthanterare installationsfel"
-
-#: src/modules/bootloader/main.py:783
-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:31
-msgid "Configuring locales."
-msgstr "Konfigurerar språkinställningar"
-
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr "Monterar partitioner."
-
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr "Internt fel vid montering av zfs datasets"
-
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr "Misslyckades att importera zpool"
-
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr "Misslyckades att låsa upp zpool"
-
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr "Misslyckades att ställa in zfs monteringspunkt "
-
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr "zfs monteringsfel"
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Konfigurera Plymouth tema"
-
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr "Skriver fstab."
-
-#: src/modules/fstab/main.py:429
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-"Ingen 
{!s}
 konfiguration är angiven för 
{!s}
 att "
-"använda. "
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr "Konfigurera OpenRC tjänster"
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr "Kan inte lägga till tjänsten {name!s} till körnivå {level!s}."
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr "Kan inte ta bort tjänsten {name!s} från körnivå {level!s}."
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-"Okänt tjänst-anrop {arg!s}för tjänsten {name!s} i körnivå "
-"{level!s}."
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"Anrop till rc-update {arg!s} i chroot returnerade felkod "
-"{num!s}."
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr "Begärd körnivå existerar inte"
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-"Sökvägen till körnivå {level!s} är {path!s}, som inte "
-"existerar."
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr "Begärd tjänst existerar inte"
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-"Sökvägen för tjänst {name!s} är {path!s}, som inte existerar."
-
-#: src/modules/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/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Konfigurera GRUB."
-
 #: src/modules/displaymanager/main.py:524
 msgid "Cannot write KDM configuration file"
 msgstr "Misslyckades med att skriva KDM konfigurationsfil"
@@ -425,14 +234,205 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "Konfiguration för displayhanteraren var inkomplett"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Konfigurerar initramfs."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Konfigurerar mkinitcpio."
+
+#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:401
+#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
+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/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Installerar data."
+
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr "Konfigurera OpenRC tjänster"
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr "Kan inte lägga till tjänsten {name!s} till körnivå {level!s}."
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr "Kan inte ta bort tjänsten {name!s} från körnivå {level!s}."
+
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+"Okänt tjänst-anrop {arg!s}för tjänsten {name!s} i körnivå "
+"{level!s}."
+
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"Anrop till rc-update {arg!s} i chroot returnerade felkod "
+"{num!s}."
+
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr "Begärd körnivå existerar inte"
+
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+"Sökvägen till körnivå {level!s} är {path!s}, som inte "
+"existerar."
+
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr "Begärd tjänst existerar inte"
+
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+"Sökvägen för tjänst {name!s} är {path!s}, som inte existerar."
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Konfigurera Plymouth tema"
+
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "Installera paket."
+
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Bearbetar paket (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Installerar ett paket."
+msgstr[1] "Installerar %(num)d paket."
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Tar bort ett paket."
+msgstr[1] "Tar bort %(num)d paket."
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr "Pakethanterare fel"
+
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+"Pakethanteraren kunde inte förbereda uppdateringar kommandot 
{!s}
"
+" returnerade felkod {!s}."
+
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+"Pakethanteraren kunde inte uppdatera systemet. kommandot 
{!s}
 "
+"returnerade felkod {!s}."
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+"Pakethanteraren kunde inte göra ändringar till det installerade systemet. "
+"kommandot 
{!s}
 returnerade felkod {!s}."
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Installera starthanterare."
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+"Det gick inte att installera grub, inga partitioner definierade i global "
+"lagring"
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr "Starthanterare installationsfel"
+
+#: src/modules/bootloader/main.py:783
+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/hwclock/main.py:26
 msgid "Setting hardware clock."
 msgstr "Ställer hårdvaruklockan."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Installerar data."
+#: 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:28
+msgid "Writing fstab."
+msgstr "Skriver fstab."
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
+"Ingen 
{!s}
 konfiguration är angiven för 
{!s}
 att "
+"använda. "
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Exempel python jobb"
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Exempel python steg {}"
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr "Konfigurerar språkinställningar"
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Sparar nätverkskonfiguration."
diff --git a/lang/python/ta_IN/LC_MESSAGES/python.po b/lang/python/ta_IN/LC_MESSAGES/python.po
index c66526df3..a2533ed34 100644
--- a/lang/python/ta_IN/LC_MESSAGES/python.po
+++ b/lang/python/ta_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: 2022-05-27 11:18+0200\n"
+"POT-Creation-Date: 2022-05-29 16:17+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Tamil (India) (https://www.transifex.com/calamares/teams/20061/ta_IN/)\n"
 "MIME-Version: 1.0\n"
@@ -17,97 +17,89 @@ msgstr ""
 "Language: ta_IN\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
 msgstr ""
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
 msgstr ""
 
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
 msgstr ""
 
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr ""
-
-#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
-#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
-#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
 msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
-#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
-msgid "No root mount point is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr ""
-
-#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
-#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
+#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
+#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:395
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/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/unpackfs/main.py:34
@@ -174,169 +166,6 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr ""
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr ""
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py: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/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr ""
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr ""
-
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr ""
-
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr ""
-
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr ""
-
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr ""
-
-#: src/modules/fstab/main.py:429
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/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/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr ""
-
 #: src/modules/displaymanager/main.py:524
 msgid "Cannot write KDM configuration file"
 msgstr ""
@@ -391,14 +220,185 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:401
+#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr ""
+
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr ""
+
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr ""
+
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr ""
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
 msgstr ""
 
 #: src/modules/hwclock/main.py:26
 msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: 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:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr ""
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/te/LC_MESSAGES/python.po b/lang/python/te/LC_MESSAGES/python.po
index 2586f68c1..c77fc0462 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: 2022-05-27 11:18+0200\n"
+"POT-Creation-Date: 2022-05-29 16:17+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Telugu (https://www.transifex.com/calamares/teams/20061/te/)\n"
 "MIME-Version: 1.0\n"
@@ -17,97 +17,89 @@ msgstr ""
 "Language: te\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
 msgstr ""
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
 msgstr ""
 
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
 msgstr ""
 
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr ""
-
-#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
-#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
-#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
 msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
-#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
-msgid "No root mount point is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr ""
-
-#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
-#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
+#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
+#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:395
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/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/unpackfs/main.py:34
@@ -174,169 +166,6 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr ""
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr ""
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py: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/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr ""
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr ""
-
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr ""
-
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr ""
-
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr ""
-
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr ""
-
-#: src/modules/fstab/main.py:429
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/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/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr ""
-
 #: src/modules/displaymanager/main.py:524
 msgid "Cannot write KDM configuration file"
 msgstr ""
@@ -391,14 +220,185 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:401
+#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr ""
+
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr ""
+
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr ""
+
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr ""
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
 msgstr ""
 
 #: src/modules/hwclock/main.py:26
 msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: 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:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr ""
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/tg/LC_MESSAGES/python.po b/lang/python/tg/LC_MESSAGES/python.po
index 9d979414c..04912fcd8 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: 2022-05-27 11:18+0200\n"
+"POT-Creation-Date: 2022-05-29 16:17+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Victor Ibragimov , 2020\n"
 "Language-Team: Tajik (https://www.transifex.com/calamares/teams/20061/tg/)\n"
@@ -21,98 +21,94 @@ msgstr ""
 "Language: tg\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "Насбкунии қуттиҳо."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Танзимоти GRUB."
 
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Коргузории қуттиҳо (%(count)d / %(total)d)"
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "Васлкунии қисмҳои диск."
 
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Насбкунии як баста."
-msgstr[1] "Насбкунии %(num)d баста."
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Тозакунии як баста"
-msgstr[1] "Тозакунии %(num)d баста."
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
 msgstr ""
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
 msgstr ""
 
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
 msgstr ""
 
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Нигоҳдории танзимоти шабака."
-
-#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
-#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
-#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
 msgid "Configuration Error"
 msgstr "Хатои танзимкунӣ"
 
-#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
-#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
-msgid "No root mount point is given for 
{!s}
 to use."
-msgstr "Нуқтаи васли реша (root) барои истифодаи 
{!s}
 дода нашуд."
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Танзимкунии mkinitcpio."
-
-#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
-#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
+#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
+#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:395
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr "Ягон қисми диск барои истифодаи 
{!s}
 муайян карда нашуд."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Эҷодкунии initramfs бо mkinitfs."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "mkinitfs дар низоми интихобшуда иҷро нашуд"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Танзимоти хидматҳои systemd"
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Рамзи барориш: {}"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Хидмат тағйир дода намешавад"
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Танзимкунии хидмати OpenRC dmcrypt."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"Дархости systemctl {arg!s} дар chroot рамзи хатои {num!s}-ро ба"
+" вуҷуд овард."
+
+#: src/modules/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/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -178,181 +174,6 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr "Ҷойи таъиноти \"{}\" дар низоми интихобшуда феҳрист намебошад"
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Танзимоти хидматҳои systemd"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Хидмат тағйир дода намешавад"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"Дархости 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/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Вазифаи амсилаи python."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Қадами амсилаи python {}"
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Насбкунии боркунандаи роҳандозӣ."
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr "Танзимкунии маҳаллигардониҳо."
-
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr "Васлкунии қисмҳои диск."
-
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr ""
-
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr ""
-
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Танзимоти мавзӯи Plymouth"
-
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr "Сабткунии fstab."
-
-#: src/modules/fstab/main.py:429
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr "Танзимоти хидматҳои OpenRC"
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr "Хидмати {name!s} барои run-level {level!s} илова карда намешавад."
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr "Хидмати {name!s} аз run-level {level!s} тоза карда намешавад."
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-"Хидмати амалии {arg!s} барои хидмати {name!s} дар run-level "
-"{level!s} номаълум аст."
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"Дархости rc-update {arg!s} дар chroot рамзи хатои {num!s}-ро ба"
-" вуҷуд овард."
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr "runlevel-и интихобшуда вуҷуд надорад"
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-"Масир барои runlevel {level!s} аз {path!s} иборат аст, аммо он "
-"вуҷуд надорад."
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr "Хидмати интихобшуда вуҷуд надорад"
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-"Масир барои хидмати {name!s} аз {path!s} иборат аст, аммо он "
-"вуҷуд надорад."
-
-#: src/modules/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/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Танзимоти GRUB."
-
 #: src/modules/displaymanager/main.py:524
 msgid "Cannot write KDM configuration file"
 msgstr "Файли танзимии KDM сабт карда намешавад"
@@ -409,14 +230,193 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "Раванди танзимкунии мудири намоиш ба анҷом нарасид"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Танзимкунии initramfs."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Танзимкунии mkinitcpio."
+
+#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:401
+#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr "Нуқтаи васли реша (root) барои истифодаи 
{!s}
 дода нашуд."
+
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Насбкунии иттилоот."
+
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr "Танзимоти хидматҳои OpenRC"
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr "Хидмати {name!s} барои run-level {level!s} илова карда намешавад."
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr "Хидмати {name!s} аз run-level {level!s} тоза карда намешавад."
+
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+"Хидмати амалии {arg!s} барои хидмати {name!s} дар run-level "
+"{level!s} номаълум аст."
+
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"Дархости rc-update {arg!s} дар chroot рамзи хатои {num!s}-ро ба"
+" вуҷуд овард."
+
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr "runlevel-и интихобшуда вуҷуд надорад"
+
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+"Масир барои runlevel {level!s} аз {path!s} иборат аст, аммо он "
+"вуҷуд надорад."
+
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr "Хидмати интихобшуда вуҷуд надорад"
+
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+"Масир барои хидмати {name!s} аз {path!s} иборат аст, аммо он "
+"вуҷуд надорад."
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Танзимоти мавзӯи Plymouth"
+
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "Насбкунии қуттиҳо."
+
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Коргузории қуттиҳо (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Насбкунии як баста."
+msgstr[1] "Насбкунии %(num)d баста."
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Тозакунии як баста"
+msgstr[1] "Тозакунии %(num)d баста."
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Насбкунии боркунандаи роҳандозӣ."
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
 
 #: src/modules/hwclock/main.py:26
 msgid "Setting hardware clock."
 msgstr "Танзимкунии соати сахтафзор."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-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:28
+msgid "Writing fstab."
+msgstr "Сабткунии fstab."
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Вазифаи амсилаи python."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Қадами амсилаи python {}"
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr "Танзимкунии маҳаллигардониҳо."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Нигоҳдории танзимоти шабака."
diff --git a/lang/python/th/LC_MESSAGES/python.po b/lang/python/th/LC_MESSAGES/python.po
index bb7f4bc58..395c481f2 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: 2022-05-27 11:18+0200\n"
+"POT-Creation-Date: 2022-05-29 16:17+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Thai (https://www.transifex.com/calamares/teams/20061/th/)\n"
 "MIME-Version: 1.0\n"
@@ -17,95 +17,89 @@ msgstr ""
 "Language: th\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
 msgstr ""
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
 msgstr ""
 
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
 msgstr ""
 
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr ""
-
-#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
-#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
-#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
 msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
-#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
-msgid "No root mount point is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr ""
-
-#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
-#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
+#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
+#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:395
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/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/unpackfs/main.py:34
@@ -172,169 +166,6 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr ""
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr ""
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py: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/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr ""
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr ""
-
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr ""
-
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr ""
-
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr ""
-
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr ""
-
-#: src/modules/fstab/main.py:429
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/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/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr ""
-
 #: src/modules/displaymanager/main.py:524
 msgid "Cannot write KDM configuration file"
 msgstr ""
@@ -389,14 +220,183 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:401
+#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr ""
+
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr ""
+
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr ""
+
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr ""
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
 msgstr ""
 
 #: src/modules/hwclock/main.py:26
 msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: 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:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr ""
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/tr_TR/LC_MESSAGES/python.po b/lang/python/tr_TR/LC_MESSAGES/python.po
index e6d7191fb..6470301c1 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: 2022-05-27 11:18+0200\n"
+"POT-Creation-Date: 2022-05-29 16:17+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Demiray Muhterem , 2022\n"
 "Language-Team: Turkish (Turkey) (https://www.transifex.com/calamares/teams/20061/tr_TR/)\n"
@@ -22,104 +22,94 @@ msgstr ""
 "Language: tr_TR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "Paketleri yükle"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "GRUB'u yapılandır."
 
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Paketler işleniyor (%(count)d / %(total)d)"
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "Disk bölümlemeleri bağlanıyor."
 
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "%(num)d paket yükleniyor"
-msgstr[1] "%(num)d paket yükleniyor"
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr "Dahili bağlama hatası zfs veri kümeleri"
 
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "%(num)d paket kaldırılıyor."
-msgstr[1] "%(num)d paket kaldırılıyor."
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr "zpool içe aktarılamadı"
 
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr "Paket Yöneticisi hatası"
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr "zpool kilidi açılamadı"
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-"Paket yöneticisi güncellemeleri hazırlayamadı. 
{!s}
 komutu {!s} "
-"hata kodunu döndürdü."
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr "zfs bağlama noktası ayarlanamadı"
 
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-"Paket yöneticisi sistemi güncelleyemedi. 
{!s}
 komutu {!s} hata "
-"kodunu döndürdü."
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-"Paket yöneticisi kurulu sistemde değişiklik yapamadı. 
{!s}
 komutu"
-" {!s} hata kodunu döndürdü."
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Ağ yapılandırması kaydediliyor."
-
-#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
-#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
-#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
 msgid "Configuration Error"
 msgstr "Yapılandırma Hatası"
 
-#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
-#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
-msgid "No root mount point is given for 
{!s}
 to use."
-msgstr "
{!s}
 kullanması için kök bağlama noktası verilmedi."
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Mkinitcpio yapılandırılıyor."
-
-#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
-#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
+#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
+#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:395
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr "
{!s}
 kullanması için hiçbir bölüm tanımlanmadı."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Mkinitfs ile initramfs oluşturuluyor."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr "zfs bağlama hatası"
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Hedefte mkinitfs çalıştırılamadı"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Systemd hizmetlerini yapılandır"
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Çıkış kodu {} idi"
+#: 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/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "OpenRC dmcrypt hizmeti yapılandırılıyor."
+#: 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 "{name!s} sistem zamanlayıcısı etkinleştirilemiyor."
+
+#: 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/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -186,181 +176,6 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr "Hedef sistemdeki \"{}\" hedefi bir dizin değil"
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Systemd hizmetlerini yapılandır"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Hizmet değiştirilemiyor"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"systemctl {arg!s} chroot çağrısında hata kodu döndürüldü "
-"{num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py: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 "{name!s} sistem zamanlayıcısı etkinleştirilemiyor."
-
-#: 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/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Dummy python job."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Dummy python step {}"
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Önyükleyici kuruluyor"
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr "Grub yüklenemedi, genel depolamada tanımlı bölüm yok"
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr "Önyükleyici yükleme hatası"
-
-#: src/modules/bootloader/main.py:783
-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:31
-msgid "Configuring locales."
-msgstr "Sistem yerelleri yapılandırılıyor."
-
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr "Disk bölümlemeleri bağlanıyor."
-
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr "Dahili bağlama hatası zfs veri kümeleri"
-
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr "zpool içe aktarılamadı"
-
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr "zpool kilidi açılamadı"
-
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr "zfs bağlama noktası ayarlanamadı"
-
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr "zfs bağlama hatası"
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Plymouth temasını yapılandır"
-
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr "Fstab dosyasına yazılıyor."
-
-#: src/modules/fstab/main.py:429
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-"
{!s}
'nin kullanması için 
{!s}
 yapılandırması "
-"verilmemiştir."
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr " OpenRC servislerini yapılandır"
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr "{name!s} hizmeti, {level!s} çalışma düzeyine ekleyemiyor."
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr "{name!s} hizmeti {level!s} çalışma düzeyinden kaldırılamıyor."
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-"Çalışma düzeyinde {level!s} hizmetinde {name!s} servisi için bilinmeyen "
-"hizmet eylemi {arg!s}."
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-" rc-update {arg!s} çağrısında chroot {num!s} hata kodunu "
-"döndürdü."
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr "Hedef çalışma seviyesi mevcut değil"
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr "Runlevel  {level!s} yolu, mevcut olmayan {path!s} 'dir."
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr "Hedef hizmet mevcut değil"
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr "{name!s} hizmetinin yolu {path!s}, ki mevcut değil."
-
-#: 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/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "GRUB'u yapılandır."
-
 #: src/modules/displaymanager/main.py:524
 msgid "Cannot write KDM configuration file"
 msgstr "KDM yapılandırma dosyası yazılamıyor"
@@ -417,14 +232,199 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "Ekran yöneticisi yapılandırma işi tamamlanamadı"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Initramfs yapılandırılıyor."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Mkinitcpio yapılandırılıyor."
+
+#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:401
+#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr "
{!s}
 kullanması için kök bağlama noktası verilmedi."
+
+#: 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"
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr "{name!s} hizmeti, {level!s} çalışma düzeyine ekleyemiyor."
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr "{name!s} hizmeti {level!s} çalışma düzeyinden kaldırılamıyor."
+
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+"Çalışma düzeyinde {level!s} hizmetinde {name!s} servisi için bilinmeyen "
+"hizmet eylemi {arg!s}."
+
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+" rc-update {arg!s} çağrısında chroot {num!s} hata kodunu "
+"döndürdü."
+
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr "Hedef çalışma seviyesi mevcut değil"
+
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr "Runlevel  {level!s} yolu, mevcut olmayan {path!s} 'dir."
+
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr "Hedef hizmet mevcut değil"
+
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr "{name!s} hizmetinin yolu {path!s}, ki mevcut değil."
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Plymouth temasını yapılandır"
+
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "Paketleri yükle"
+
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Paketler işleniyor (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "%(num)d paket yükleniyor"
+msgstr[1] "%(num)d paket yükleniyor"
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "%(num)d paket kaldırılıyor."
+msgstr[1] "%(num)d paket kaldırılıyor."
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr "Paket Yöneticisi hatası"
+
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+"Paket yöneticisi güncellemeleri hazırlayamadı. 
{!s}
 komutu {!s} "
+"hata kodunu döndürdü."
+
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+"Paket yöneticisi sistemi güncelleyemedi. 
{!s}
 komutu {!s} hata "
+"kodunu döndürdü."
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+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/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr "Grub yüklenemedi, genel depolamada tanımlı bölüm yok"
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr "Önyükleyici yükleme hatası"
+
+#: src/modules/bootloader/main.py:783
+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/hwclock/main.py:26
 msgid "Setting hardware clock."
 msgstr "Donanım saati ayarlanıyor."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Veri yükleniyor."
+#: 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:28
+msgid "Writing fstab."
+msgstr "Fstab dosyasına yazılıyor."
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
+"
{!s}
'nin kullanması için 
{!s}
 yapılandırması "
+"verilmemiştir."
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Dummy python job."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Dummy python step {}"
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr "Sistem yerelleri yapılandırılıyor."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Ağ yapılandırması kaydediliyor."
diff --git a/lang/python/uk/LC_MESSAGES/python.po b/lang/python/uk/LC_MESSAGES/python.po
index a42d98710..255c33a48 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: 2022-05-27 11:18+0200\n"
+"POT-Creation-Date: 2022-05-29 16:17+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Yuri Chornoivan , 2022\n"
 "Language-Team: Ukrainian (https://www.transifex.com/calamares/teams/20061/uk/)\n"
@@ -23,109 +23,94 @@ 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/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "Встановити пакети."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Налаштовування GRUB."
 
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Обробляємо пакунки (%(count)d з %(total)d)"
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "Монтування розділів."
 
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Встановлюємо %(num)d пакунок."
-msgstr[1] "Встановлюємо %(num)d пакунки."
-msgstr[2] "Встановлюємо %(num)d пакунків."
-msgstr[3] "Встановлюємо один пакунок."
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr "Внутрішня помилка під час монтування наборів даних zfs"
 
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Вилучаємо %(num)d пакунок."
-msgstr[1] "Вилучаємо %(num)d пакунки."
-msgstr[2] "Вилучаємо %(num)d пакунків."
-msgstr[3] "Вилучаємо один пакунок."
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr "Не вдалося імпортувати zpool"
 
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr "Помилка засобу керування пакунками"
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr "Не вдалося розблокувати zpool"
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr ""
-"Засобу керування пакунками не вдалося приготувати оновлення. Програмою "
-"
{!s}
 повернуто код помилки {!s}."
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr "Не вдалося встановити точку монтування zfs"
 
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr ""
-"Засобу керування пакунками не вдалося оновити систему. Програмою "
-"
{!s}
 повернуто код помилки {!s}."
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr ""
-"Засобу керування пакунками не вдалося внести зміну до встановленої системи. "
-"Програмою 
{!s}
 повернуто код помилки {!s}."
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Зберігаємо налаштування мережі."
-
-#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
-#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
-#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
 msgid "Configuration Error"
 msgstr "Помилка налаштовування"
 
-#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
-#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
-msgid "No root mount point is given for 
{!s}
 to use."
-msgstr ""
-"Не вказано кореневої точки монтування для використання у 
{!s}
."
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Налаштовуємо mkinitcpio."
-
-#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
-#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
+#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
+#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:395
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr "Не визначено розділів для використання 
{!s}
."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Створення initramfs за допомогою mkinitfs."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr "Помилка монтування zfs"
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Не вдалося виконати mkinitfs над призначенням"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Налаштуйте служби systemd"
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Код виходу — {}"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Не вдалося змінити службу"
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Налаштовуємо службу dmcrypt OpenRC."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"Внаслідок виклику systemctl {arg!s} у chroot було повернуто "
+"повідомлення з кодом помилки {num! s}."
+
+#: src/modules/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/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -194,186 +179,6 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr "Призначення «{}» у цільовій системі не є каталогом"
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Налаштуйте служби systemd"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Не вдалося змінити службу"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"Внаслідок виклику 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/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Фіктивне завдання python."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Фіктивний крок python {}"
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Встановити завантажувач."
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-"Не вдалося встановити grub — на загальному сховищі даних не визначено "
-"розділів"
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr "Помилка встановлення завантажувача"
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-"Не вдалося встановити завантажувач. Програмою для встановлення "
-"
{!s}
 повернуто код помилки {!s}."
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr "Налаштовуємо локалі."
-
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr "Монтування розділів."
-
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr "Внутрішня помилка під час монтування наборів даних zfs"
-
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr "Не вдалося імпортувати zpool"
-
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr "Не вдалося розблокувати zpool"
-
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr "Не вдалося встановити точку монтування zfs"
-
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr "Помилка монтування zfs"
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Налаштувати тему Plymouth"
-
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr "Записуємо fstab."
-
-#: src/modules/fstab/main.py:429
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-"Не надано налаштувань 
{!s}
 для використання у 
{!s}
."
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr "Налаштувати служби OpenRC"
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr "Не вдалося додати службу {name!s} до рівня запуску {level!s}."
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr "Не вдалося вилучити службу {name!s} з рівня запуску {level!s}."
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-"Невідома дія зі службою {arg!s} для служби {name!s} на рівні "
-"запуску {level!s}."
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"Унаслідок виконання виклику rc-update {arg!s} chroot повернуто "
-"повідомлення про помилку із кодом {num!s}."
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr "Шляху до рівня запуску не існує"
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-"Шляхом до рівня запуску {level!s} вказано {path!s}. Такого "
-"шляху не існує."
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr "Служби призначення не існує"
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-"Шляхом до служби {name!s} вказано {path!s}. Такого шляху не "
-"існує."
-
-#: src/modules/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/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Налаштовування GRUB."
-
 #: src/modules/displaymanager/main.py:524
 msgid "Cannot write KDM configuration file"
 msgstr "Не вдалося записати файл налаштувань KDM"
@@ -430,14 +235,209 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "Налаштування засобу керування дисплеєм є неповними"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Налаштовуємо initramfs."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Налаштовуємо mkinitcpio."
+
+#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:401
+#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+"Не вказано кореневої точки монтування для використання у 
{!s}
."
+
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Встановлюємо дані."
+
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr "Налаштувати служби OpenRC"
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr "Не вдалося додати службу {name!s} до рівня запуску {level!s}."
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr "Не вдалося вилучити службу {name!s} з рівня запуску {level!s}."
+
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+"Невідома дія зі службою {arg!s} для служби {name!s} на рівні "
+"запуску {level!s}."
+
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"Унаслідок виконання виклику rc-update {arg!s} chroot повернуто "
+"повідомлення про помилку із кодом {num!s}."
+
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr "Шляху до рівня запуску не існує"
+
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+"Шляхом до рівня запуску {level!s} вказано {path!s}. Такого "
+"шляху не існує."
+
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr "Служби призначення не існує"
+
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+"Шляхом до служби {name!s} вказано {path!s}. Такого шляху не "
+"існує."
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Налаштувати тему Plymouth"
+
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "Встановити пакети."
+
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Обробляємо пакунки (%(count)d з %(total)d)"
+
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Встановлюємо %(num)d пакунок."
+msgstr[1] "Встановлюємо %(num)d пакунки."
+msgstr[2] "Встановлюємо %(num)d пакунків."
+msgstr[3] "Встановлюємо один пакунок."
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Вилучаємо %(num)d пакунок."
+msgstr[1] "Вилучаємо %(num)d пакунки."
+msgstr[2] "Вилучаємо %(num)d пакунків."
+msgstr[3] "Вилучаємо один пакунок."
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr "Помилка засобу керування пакунками"
+
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+"Засобу керування пакунками не вдалося приготувати оновлення. Програмою "
+"
{!s}
 повернуто код помилки {!s}."
+
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+"Засобу керування пакунками не вдалося оновити систему. Програмою "
+"
{!s}
 повернуто код помилки {!s}."
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+"Засобу керування пакунками не вдалося внести зміну до встановленої системи. "
+"Програмою 
{!s}
 повернуто код помилки {!s}."
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Встановити завантажувач."
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+"Не вдалося встановити grub — на загальному сховищі даних не визначено "
+"розділів"
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr "Помилка встановлення завантажувача"
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
+"Не вдалося встановити завантажувач. Програмою для встановлення "
+"
{!s}
 повернуто код помилки {!s}."
 
 #: src/modules/hwclock/main.py:26
 msgid "Setting hardware clock."
 msgstr "Встановлюємо значення для апаратного годинника."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-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:28
+msgid "Writing fstab."
+msgstr "Записуємо fstab."
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
+"Не надано налаштувань 
{!s}
 для використання у 
{!s}
."
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Фіктивне завдання python."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Фіктивний крок python {}"
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr "Налаштовуємо локалі."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Зберігаємо налаштування мережі."
diff --git a/lang/python/ur/LC_MESSAGES/python.po b/lang/python/ur/LC_MESSAGES/python.po
index c9c16f8ac..26e3db7fb 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: 2022-05-27 11:18+0200\n"
+"POT-Creation-Date: 2022-05-29 16:17+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Urdu (https://www.transifex.com/calamares/teams/20061/ur/)\n"
 "MIME-Version: 1.0\n"
@@ -17,97 +17,89 @@ msgstr ""
 "Language: ur\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
 msgstr ""
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
 msgstr ""
 
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
 msgstr ""
 
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr ""
-
-#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
-#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
-#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
 msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
-#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
-msgid "No root mount point is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr ""
-
-#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
-#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
+#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
+#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:395
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/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/unpackfs/main.py:34
@@ -174,169 +166,6 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr ""
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr ""
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py: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/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr ""
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr ""
-
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr ""
-
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr ""
-
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr ""
-
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr ""
-
-#: src/modules/fstab/main.py:429
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/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/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr ""
-
 #: src/modules/displaymanager/main.py:524
 msgid "Cannot write KDM configuration file"
 msgstr ""
@@ -391,14 +220,185 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:401
+#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr ""
+
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr ""
+
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr ""
+
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr ""
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
 msgstr ""
 
 #: src/modules/hwclock/main.py:26
 msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: 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:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr ""
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/vi/LC_MESSAGES/python.po b/lang/python/vi/LC_MESSAGES/python.po
index 78dcbfd22..7f32565c9 100644
--- a/lang/python/vi/LC_MESSAGES/python.po
+++ b/lang/python/vi/LC_MESSAGES/python.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-27 11:18+0200\n"
+"POT-Creation-Date: 2022-05-29 16:17+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: th1nhhdk , 2021\n"
 "Language-Team: Vietnamese (https://www.transifex.com/calamares/teams/20061/vi/)\n"
@@ -22,96 +22,93 @@ msgstr ""
 "Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "Đang cài đặt các gói ứng dụng."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Cấu hình GRUB"
 
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Đang xử lý gói (%(count)d / %(total)d)"
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "Đang gắn kết các phân vùng."
 
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Đang cài đặt %(num)d gói ứng dụng."
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Đang gỡ bỏ %(num)d gói ứng dụng."
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
 msgstr ""
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
 msgstr ""
 
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
 msgstr ""
 
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Đang lưu cấu hình mạng."
-
-#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
-#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
-#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
 msgid "Configuration Error"
 msgstr "Lỗi cấu hình"
 
-#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
-#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
-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/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Đang cấu hình mkinitcpio."
-
-#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
-#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
+#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
+#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:395
 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/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Đang tạo initramfs bằng mkinitfs."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr ""
 
-#: 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/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Cấu hình các dịch vụ systemd"
 
-#: 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/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/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: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/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -177,182 +174,6 @@ msgstr ""
 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/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Cấu hình các dịch vụ systemd"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Không thể sửa đổi dịch vụ"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"systemctl {arg!s} trong môi trường chroot trả về lỗi {num!s}."
-
-#: src/modules/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/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Ví dụ công việc python."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Ví dụ python bước {}"
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Đang cài đặt bộ khởi động."
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr "Lỗi cài đặt trình khởi động(bootloader)"
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-"Trình khởi động(bootloader) không thể được cài đặt. Lệnh cài đặt "
-"
{!s}
đã trả mã lỗi {!s}."
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr "Đang cấu hình ngôn ngữ."
-
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr "Đang gắn kết các phân vùng."
-
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr ""
-
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr ""
-
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Cấu hình giao diện Plymouth"
-
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr "Đang viết vào fstab."
-
-#: src/modules/fstab/main.py:429
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr "Cấu hình dịch vụ OpenRC"
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr "Không thể thêm dịch vụ {name!s} vào run-level {level!s}."
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr "Không thể loại bỏ dịch vụ {name!s} từ run-level {level!s}."
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-"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:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"Lệnh rc-update {arg!s} trong môi trường chroot trả về lỗi "
-"{num!s}."
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr "Nhóm dịch vụ khởi động không tồn tại"
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-"Đường dẫn cho runlevel {level!s} là {path!s}, nhưng không tồn "
-"tại."
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr "Nhóm dịch vụ không tồn tại"
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-"Đường dẫn cho dịch vụ {name!s} là {path!s}, nhưng không tồn "
-"tại."
-
-#: 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/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Cấu hình GRUB"
-
 #: src/modules/displaymanager/main.py:524
 msgid "Cannot write KDM configuration file"
 msgstr "Không thể ghi vào tập tin cấu hình KDM"
@@ -410,14 +231,193 @@ 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/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Đang cấu hình initramfs."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Đang cấu hình mkinitcpio."
+
+#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:401
+#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
+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/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"
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr "Không thể thêm dịch vụ {name!s} vào run-level {level!s}."
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr "Không thể loại bỏ dịch vụ {name!s} từ run-level {level!s}."
+
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+"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:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"Lệnh rc-update {arg!s} trong môi trường chroot trả về lỗi "
+"{num!s}."
+
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr "Nhóm dịch vụ khởi động không tồn tại"
+
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+"Đường dẫn cho runlevel {level!s} là {path!s}, nhưng không tồn "
+"tại."
+
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr "Nhóm dịch vụ không tồn tại"
+
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+"Đường dẫn cho dịch vụ {name!s} là {path!s}, nhưng không tồn "
+"tại."
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Cấu hình giao diện Plymouth"
+
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "Đang cài đặt các gói ứng dụng."
+
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Đang xử lý gói (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Đang cài đặt %(num)d gói ứng dụng."
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Đang gỡ bỏ %(num)d gói ứng dụng."
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Đang cài đặt bộ khởi động."
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr "Lỗi cài đặt trình khởi động(bootloader)"
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr ""
+"Trình khởi động(bootloader) không thể được cài đặt. Lệnh cài đặt "
+"
{!s}
đã trả mã lỗi {!s}."
 
 #: src/modules/hwclock/main.py:26
 msgid "Setting hardware clock."
 msgstr "Đang thiết lập đồng hồ máy tính."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Đang cài đặt dữ liệu."
+#: 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:28
+msgid "Writing fstab."
+msgstr "Đang viết vào fstab."
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Ví dụ công việc python."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Ví dụ python bước {}"
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr "Đang cấu hình ngôn ngữ."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Đang lưu cấu hình mạng."
diff --git a/lang/python/zh/LC_MESSAGES/python.po b/lang/python/zh/LC_MESSAGES/python.po
index 5294ee686..51492fb24 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: 2022-05-27 11:18+0200\n"
+"POT-Creation-Date: 2022-05-29 16:17+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Chinese (https://www.transifex.com/calamares/teams/20061/zh/)\n"
 "MIME-Version: 1.0\n"
@@ -17,95 +17,89 @@ msgstr ""
 "Language: zh\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
 msgstr ""
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
 msgstr ""
 
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
 msgstr ""
 
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr ""
-
-#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
-#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
-#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
 msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
-#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
-msgid "No root mount point is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr ""
-
-#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
-#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
+#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
+#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:395
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/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/unpackfs/main.py:34
@@ -172,169 +166,6 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr ""
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr ""
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py: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/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr ""
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr ""
-
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr ""
-
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr ""
-
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr ""
-
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr ""
-
-#: src/modules/fstab/main.py:429
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/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/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr ""
-
 #: src/modules/displaymanager/main.py:524
 msgid "Cannot write KDM configuration file"
 msgstr ""
@@ -389,14 +220,183 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:401
+#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr ""
+
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr ""
+
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr ""
+
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr ""
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
 msgstr ""
 
 #: src/modules/hwclock/main.py:26
 msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: 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:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr ""
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/zh_CN/LC_MESSAGES/python.po b/lang/python/zh_CN/LC_MESSAGES/python.po
index cbed0f87b..49e6323b2 100644
--- a/lang/python/zh_CN/LC_MESSAGES/python.po
+++ b/lang/python/zh_CN/LC_MESSAGES/python.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-27 11:18+0200\n"
+"POT-Creation-Date: 2022-05-29 16:17+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: 玉堂白鹤 , 2022\n"
 "Language-Team: Chinese (China) (https://www.transifex.com/calamares/teams/20061/zh_CN/)\n"
@@ -26,96 +26,92 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "安装软件包。"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "配置 GRUB."
 
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "软件包处理中（%(count)d/%(total)d）"
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "挂载分区。"
 
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "安装%(num)d软件包。"
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr "装载 zfs 数据集时出现内部错误"
 
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "移除%(num)d软件包。"
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr "导入 zpool 失败"
 
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr "软件包管理器错误"
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr "解锁 zpool 失败"
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr "软件包管理器无法准备更新。命令
{!s}
返回错误代码{!s}。"
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr "设置 zfs 挂载点失败"
 
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr "软件包管理器无法更新系统。命令
{!s}
返回错误代码{!s}。"
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr "软件包管理器无法对已安装的系统进行更改。命令
{!s}
返回错误代码{!s}。"
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "正在保存网络配置。"
-
-#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
-#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
-#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
 msgid "Configuration Error"
 msgstr "配置错误"
 
-#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
-#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
-msgid "No root mount point is given for 
{!s}
 to use."
-msgstr " 未设置 
{!s}
 要使用的根挂载点。"
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "配置 mkinitcpio."
-
-#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
-#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
+#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
+#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:395
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr "没有分配分区给 
{!s}
。"
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "正在用 mkinitfs 创建initramfs。"
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr "zfs 挂载出错"
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "无法在目标中运行 mkinitfs"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "配置 systemd 服务"
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "退出码是 {}"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "无法修改服务"
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "配置 OpenRC dmcrypt 服务。"
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr "chroot 中的 systemctl {arg!s} 命令返回错误 {num!s}."
+
+#: src/modules/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} 和 {name!s}  单元前缀 "
+"{suffix!s}."
 
 #: src/modules/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -181,171 +177,6 @@ msgstr "寻找 unsquashfs 失败，请确定您已安装 squashfs-tools 软体
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr "目标系统中的 \"{}\" 不是一个目录"
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "配置 systemd 服务"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "无法修改服务"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr "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 计时器 {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} 和 {name!s}  单元前缀 "
-"{suffix!s}."
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "占位 Python 任务。"
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "占位 Python 步骤 {}"
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "安装启动加载器。"
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr "无法安装 grub，全局存储中未定义分区"
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr "启动加载器安装出错"
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr "无法安装启动加载器。安装命令
{!s}
返回错误代码 {!s}。"
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr "正在进行本地化配置。"
-
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr "挂载分区。"
-
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr "装载 zfs 数据集时出现内部错误"
-
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr "导入 zpool 失败"
-
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr "解锁 zpool 失败"
-
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr "设置 zfs 挂载点失败"
-
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr "zfs 挂载出错"
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "配置 Plymouth 主题"
-
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr "正在写入 fstab。"
-
-#: src/modules/fstab/main.py:429
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr "无 
{!s}
 配置可供 
{!s}
 使用。"
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr "配置 OpenRC 服务。"
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr "无法将服务 {name!s} 加入 {level!s} 运行级别."
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr "无法从 {level!s} 运行级别中删除服务 {name!s}。"
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr "未知的服务动作 {arg!s}，服务名: {name!s}，运行级别: {level!s}."
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr "chroot 中运行的 rc-update {arg!s} 返回错误 {num!s}."
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr "目标运行级别不存在。"
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr "运行级别 {level!s} 所在目录 {path!s} 不存在。"
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr "目标服务不存在"
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr "服务 {name!s} 的路径 {path!s} 不存在。"
-
-#: src/modules/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/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "配置 GRUB."
-
 #: src/modules/displaymanager/main.py:524
 msgid "Cannot write KDM configuration file"
 msgstr "无法写入 KDM 配置文件"
@@ -400,14 +231,183 @@ msgstr "globalstorage 和 displaymanager.conf 配置文件中都没有配置显
 msgid "Display manager configuration was incomplete"
 msgstr "显示管理器配置不完全"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "正在配置初始内存文件系统。"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "配置 mkinitcpio."
+
+#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:401
+#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr " 未设置 
{!s}
 要使用的根挂载点。"
+
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "安装数据."
+
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr "配置 OpenRC 服务。"
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr "无法将服务 {name!s} 加入 {level!s} 运行级别."
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr "无法从 {level!s} 运行级别中删除服务 {name!s}。"
+
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr "未知的服务动作 {arg!s}，服务名: {name!s}，运行级别: {level!s}."
+
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr "chroot 中运行的 rc-update {arg!s} 返回错误 {num!s}."
+
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr "目标运行级别不存在。"
+
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr "运行级别 {level!s} 所在目录 {path!s} 不存在。"
+
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr "目标服务不存在"
+
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr "服务 {name!s} 的路径 {path!s} 不存在。"
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "配置 Plymouth 主题"
+
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "安装软件包。"
+
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "软件包处理中（%(count)d/%(total)d）"
+
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "安装%(num)d软件包。"
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "移除%(num)d软件包。"
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr "软件包管理器错误"
+
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr "软件包管理器无法准备更新。命令
{!s}
返回错误代码{!s}。"
+
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr "软件包管理器无法更新系统。命令
{!s}
返回错误代码{!s}。"
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr "软件包管理器无法对已安装的系统进行更改。命令
{!s}
返回错误代码{!s}。"
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "安装启动加载器。"
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr "无法安装 grub，全局存储中未定义分区"
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr "启动加载器安装出错"
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr "无法安装启动加载器。安装命令
{!s}
返回错误代码 {!s}。"
 
 #: src/modules/hwclock/main.py:26
 msgid "Setting hardware clock."
 msgstr "设置硬件时钟。"
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-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:28
+msgid "Writing fstab."
+msgstr "正在写入 fstab。"
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr "无 
{!s}
 配置可供 
{!s}
 使用。"
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "占位 Python 任务。"
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "占位 Python 步骤 {}"
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr "正在进行本地化配置。"
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "正在保存网络配置。"
diff --git a/lang/python/zh_HK/LC_MESSAGES/python.po b/lang/python/zh_HK/LC_MESSAGES/python.po
index 2a37dd296..767ebd4c0 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: 2022-05-27 11:18+0200\n"
+"POT-Creation-Date: 2022-05-29 16:17+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Chinese (Hong Kong) (https://www.transifex.com/calamares/teams/20061/zh_HK/)\n"
 "MIME-Version: 1.0\n"
@@ -17,95 +17,89 @@ msgstr ""
 "Language: zh_HK\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
 msgstr ""
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
 msgstr ""
 
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
 msgstr ""
 
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr ""
-
-#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
-#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
-#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
 msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
-#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
-msgid "No root mount point is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr ""
-
-#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
-#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
+#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
+#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:395
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/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/unpackfs/main.py:34
@@ -172,169 +166,6 @@ msgstr ""
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr ""
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr ""
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py: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/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr ""
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr ""
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr ""
-
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr ""
-
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr ""
-
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr ""
-
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr ""
-
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr ""
-
-#: src/modules/fstab/main.py:429
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/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/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr ""
-
 #: src/modules/displaymanager/main.py:524
 msgid "Cannot write KDM configuration file"
 msgstr ""
@@ -389,14 +220,183 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:401
+#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr ""
+
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr ""
+
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr ""
+
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr ""
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr ""
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
 msgstr ""
 
 #: src/modules/hwclock/main.py:26
 msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: 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:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr ""
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/zh_TW/LC_MESSAGES/python.po b/lang/python/zh_TW/LC_MESSAGES/python.po
index 5f536f8a1..23bb08649 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: 2022-05-27 11:18+0200\n"
+"POT-Creation-Date: 2022-05-29 16:17+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: 黃柏諺 , 2022\n"
 "Language-Team: Chinese (Taiwan) (https://www.transifex.com/calamares/teams/20061/zh_TW/)\n"
@@ -22,96 +22,92 @@ msgstr ""
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
-#: src/modules/packages/main.py:75
-msgid "Install packages."
-msgstr "安裝軟體包。"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "設定 GRUB。"
 
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "正在處理軟體包 (%(count)d / %(total)d)"
+#: src/modules/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "正在掛載分割區。"
 
-#: src/modules/packages/main.py:68
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "正在安裝 %(num)d 軟體包。"
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr "掛載 zfs 資料集時發生內部錯誤"
 
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "正在移除 %(num)d 軟體包。"
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr "匯入 zpool 失敗"
 
-#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
-#: src/modules/packages/main.py:765
-msgid "Package Manager error"
-msgstr "軟體包管理程式錯誤"
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr "解鎖 zpool 失敗"
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command 
{!s}
 "
-"returned error code {!s}."
-msgstr "軟體包管理程式無法準備更新。指令 
{!s}
 回傳了錯誤碼 {!s}。"
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr "設定 zfs 掛載點失敗"
 
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command 
{!s}
"
-" returned error code {!s}."
-msgstr "軟體包管理程式無法更新系統。指令 
{!s}
 回傳了錯誤碼 {!s}。"
-
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
{!s}
 returned error code {!s}."
-msgstr "軟體包管理程式無法對已安裝的系統做出變更。指令 
{!s}
 回傳了錯誤碼 {!s}。"
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "正在儲存網路設定。"
-
-#: src/modules/networkcfg/main.py:105 src/modules/initcpiocfg/main.py:235
-#: src/modules/initcpiocfg/main.py:239 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/localecfg/main.py:140
-#: src/modules/mount/main.py:229 src/modules/fstab/main.py:394
-#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/mount/main.py:229 src/modules/initcpiocfg/main.py:235
+#: src/modules/initcpiocfg/main.py:239 src/modules/rawfs/main.py:164
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:394
+#: src/modules/fstab/main.py:400 src/modules/fstab/main.py:428
+#: src/modules/localecfg/main.py:140 src/modules/networkcfg/main.py:105
 msgid "Configuration Error"
 msgstr "設定錯誤"
 
-#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
-#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/localecfg/main.py:141
-#: src/modules/fstab/main.py:401 src/modules/initramfscfg/main.py:90
-msgid "No root mount point is given for 
{!s}
 to use."
-msgstr "沒有給定的根掛載點 
{!s}
 以供使用。"
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "正在設定 mkinitcpio。"
-
-#: src/modules/initcpiocfg/main.py:236 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/mount/main.py:230 src/modules/fstab/main.py:395
-#: src/modules/initramfscfg/main.py:86 src/modules/rawfs/main.py:165
+#: src/modules/mount/main.py:230 src/modules/initcpiocfg/main.py:236
+#: src/modules/rawfs/main.py:165 src/modules/initramfscfg/main.py:86
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:395
 msgid "No partitions are defined for 
{!s}
 to use."
 msgstr "沒有分割區被定義為 
{!s}
 以供使用。"
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "正在使用 mkinitfs 建立 initramfs。"
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr "zfs 掛載錯誤"
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "在目標上執行 mkinitfs 失敗"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "設定 systemd 服務"
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "結束碼為 {}"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "無法修改服務"
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "正在設定 OpenRC dmcrypt 服務。"
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr "在 chroot 中呼叫的 systemctl {arg!s} 回傳了錯誤代碼 {num!s}。"
+
+#: src/modules/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/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -177,171 +173,6 @@ msgstr "尋找 unsquashfs 失敗，請確定您已安裝 squashfs-tools 軟體
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr "目標系統中的目的地 \"{}\" 不是目錄"
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "設定 systemd 服務"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "無法修改服務"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr "在 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/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "假的 python 工作。"
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "假的 python step {}"
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "安裝開機載入程式。"
-
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr "安裝 grub 失敗，全域儲存空間中未定義分割區"
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr "開機載入程式安裝錯誤"
-
-#: src/modules/bootloader/main.py:783
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
{!s}
 returned error code {!s}."
-msgstr "無法安裝開機載入程式。安裝指令 
{!s}
 回傳了錯誤碼 {!s}。"
-
-#: src/modules/localecfg/main.py:31
-msgid "Configuring locales."
-msgstr "正在設定語系。"
-
-#: src/modules/mount/main.py:42
-msgid "Mounting partitions."
-msgstr "正在掛載分割區。"
-
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
-msgstr "掛載 zfs 資料集時發生內部錯誤"
-
-#: src/modules/mount/main.py:100
-msgid "Failed to import zpool"
-msgstr "匯入 zpool 失敗"
-
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr "解鎖 zpool 失敗"
-
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr "設定 zfs 掛載點失敗"
-
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr "zfs 掛載錯誤"
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "設定 Plymouth 主題"
-
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr "正在寫入 fstab。"
-
-#: src/modules/fstab/main.py:429
-msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
-msgstr "無 
{!s}
 設定可供 
{!s}
 使用。"
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr "設定 OpenRC 服務"
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr "無法新增服務 {name!s} 到執行層級 {level!s}。"
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr "無法移除服務 {name!s} 從執行層級 {level!s}。"
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr "未知的服務動作 {arg!s} 給服務 {name!s} 在執行層級 {level!s}。"
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr "在 chroot 中呼叫的 rc-update {arg!s} 回傳了錯誤代碼 {num!s}。"
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr "目標執行層級不存在"
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr "執行層級 {level!s} 的路徑為 {path!s}，不存在。"
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr "目標服務不存在"
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr "服務 {name!s} 的路徑為 {path!s}，不存在。"
-
-#: src/modules/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/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "設定 GRUB。"
-
 #: src/modules/displaymanager/main.py:524
 msgid "Cannot write KDM configuration file"
 msgstr "無法寫入 KDM 設定檔"
@@ -396,14 +227,183 @@ msgstr "顯示管理器清單為空或在 globalstorage 與 displaymanager.conf
 msgid "Display manager configuration was incomplete"
 msgstr "顯示管理器設定不完整"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "正在設定 initramfs。"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "正在設定 mkinitcpio。"
+
+#: src/modules/initcpiocfg/main.py:240 src/modules/initramfscfg/main.py:90
+#: src/modules/openrcdmcryptcfg/main.py:77 src/modules/fstab/main.py:401
+#: src/modules/localecfg/main.py:141 src/modules/networkcfg/main.py:106
+msgid "No root mount point is given for 
{!s}
 to use."
+msgstr "沒有給定的根掛載點 
{!s}
 以供使用。"
+
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "正在安裝資料。"
+
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr "設定 OpenRC 服務"
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr "無法新增服務 {name!s} 到執行層級 {level!s}。"
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr "無法移除服務 {name!s} 從執行層級 {level!s}。"
+
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr "未知的服務動作 {arg!s} 給服務 {name!s} 在執行層級 {level!s}。"
+
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr "在 chroot 中呼叫的 rc-update {arg!s} 回傳了錯誤代碼 {num!s}。"
+
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr "目標執行層級不存在"
+
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr "執行層級 {level!s} 的路徑為 {path!s}，不存在。"
+
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr "目標服務不存在"
+
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr "服務 {name!s} 的路徑為 {path!s}，不存在。"
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "設定 Plymouth 主題"
+
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "安裝軟體包。"
+
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "正在處理軟體包 (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "正在安裝 %(num)d 軟體包。"
+
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "正在移除 %(num)d 軟體包。"
+
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr "軟體包管理程式錯誤"
+
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command 
{!s}
 "
+"returned error code {!s}."
+msgstr "軟體包管理程式無法準備更新。指令 
{!s}
 回傳了錯誤碼 {!s}。"
+
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command 
{!s}
"
+" returned error code {!s}."
+msgstr "軟體包管理程式無法更新系統。指令 
{!s}
 回傳了錯誤碼 {!s}。"
+
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
{!s}
 returned error code {!s}."
+msgstr "軟體包管理程式無法對已安裝的系統做出變更。指令 
{!s}
 回傳了錯誤碼 {!s}。"
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "安裝開機載入程式。"
+
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr "安裝 grub 失敗，全域儲存空間中未定義分割區"
+
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr "開機載入程式安裝錯誤"
+
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
{!s}
 returned error code {!s}."
+msgstr "無法安裝開機載入程式。安裝指令 
{!s}
 回傳了錯誤碼 {!s}。"
 
 #: src/modules/hwclock/main.py:26
 msgid "Setting hardware clock."
 msgstr "正在設定硬體時鐘。"
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-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:28
+msgid "Writing fstab."
+msgstr "正在寫入 fstab。"
+
+#: src/modules/fstab/main.py:429
+msgid "No 
{!s}
 configuration is given for 
{!s}
 to use."
+msgstr "無 
{!s}
 設定可供 
{!s}
 使用。"
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "假的 python 工作。"
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "假的 python step {}"
+
+#: src/modules/localecfg/main.py:31
+msgid "Configuring locales."
+msgstr "正在設定語系。"
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "正在儲存網路設定。"