From 13153df48416b9bd03eb79b3132cbe4a1a5a22ed Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sun, 29 May 2022 17:13:02 +0200 Subject: [PATCH 01/91] Changes: post-release housekeeping --- CHANGES-3.2 | 15 +++++++++++++++ CMakeLists.txt | 4 +++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/CHANGES-3.2 b/CHANGES-3.2 index 13b806b26..b897c1b35 100644 --- a/CHANGES-3.2 +++ b/CHANGES-3.2 @@ -7,6 +7,21 @@ contributors are listed. Note that Calamares does not have a historical changelog -- this log starts with version 3.2.0. The release notes on the website will have to do for older versions. + +> Note that the 3.2 series is now in LTS / bug-fix-only mode. + +# 3.2.60 (unreleased) # + +This release contains contributions from (alphabetically by first name): + - No external contributors yet + +## Core ## + - No core changes yet + +## Modules ## + - No module changes yet + + # 3.2.59 (2022-05-29) # This release contains contributions from (alphabetically by first name): diff --git a/CMakeLists.txt b/CMakeLists.txt index d006faaf0..bd70fdb43 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,10 +41,12 @@ # TODO:3.3: Require CMake 3.12 cmake_minimum_required( VERSION 3.3 FATAL_ERROR ) project( CALAMARES - VERSION 3.2.59 + VERSION 3.2.60 LANGUAGES C CXX ) +# Leave this as "Release mode", since 3.2 is in LTS / bugfix-only state, +# and should always be releaseable. set( CALAMARES_VERSION_RC 0 ) # Set to 0 during release cycle, 1 during development if( CALAMARES_VERSION_RC EQUAL 1 AND CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR ) message( FATAL_ERROR "Do not build development versions in the source-directory." ) From e6960ceec1f4745290dd0f26e74a1fa90372af6c Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 3 Jun 2022 12:08:09 +0200 Subject: [PATCH 02/91] [calamares] Restore text on debug- and about-buttons --- src/calamares/CalamaresWindow.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/calamares/CalamaresWindow.cpp b/src/calamares/CalamaresWindow.cpp index 50abb776e..9e3578ea9 100644 --- a/src/calamares/CalamaresWindow.cpp +++ b/src/calamares/CalamaresWindow.cpp @@ -144,6 +144,8 @@ getWidgetSidebar( Calamares::DebugWindowManager* debug, 2 * QSize( defaultFontHeight, defaultFontHeight ) ) ); CALAMARES_RETRANSLATE_FOR( aboutDialog, + aboutDialog->setText( + QCoreApplication::translate( CalamaresWindow::staticMetaObject.className(), "About" ) ); aboutDialog->setToolTip( QCoreApplication::translate( CalamaresWindow::staticMetaObject.className(), "Show information about Calamares" ) ); ); extraButtons->addWidget( aboutDialog ); @@ -158,6 +160,8 @@ getWidgetSidebar( Calamares::DebugWindowManager* debug, debugWindowBtn->setIcon( CalamaresUtils::defaultPixmap( CalamaresUtils::Bugs, CalamaresUtils::Original, 2 * QSize( defaultFontHeight, defaultFontHeight ) ) ); CALAMARES_RETRANSLATE_FOR( debugWindowBtn, + debugWindowBtn->setText( QCoreApplication::translate( + CalamaresWindow::staticMetaObject.className(), "Debug" ) ); debugWindowBtn->setToolTip( QCoreApplication::translate( CalamaresWindow::staticMetaObject.className(), "Show debug information" ) ); ); extraButtons->addWidget( debugWindowBtn ); From 8b44eef002de8eb854c5d5d5daed9de48cf56edd Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 3 Jun 2022 12:08:41 +0200 Subject: [PATCH 03/91] [calamares] Make naming consistent between 'special' buttons --- src/calamares/CalamaresWindow.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/calamares/CalamaresWindow.cpp b/src/calamares/CalamaresWindow.cpp index 9e3578ea9..c79e17d58 100644 --- a/src/calamares/CalamaresWindow.cpp +++ b/src/calamares/CalamaresWindow.cpp @@ -138,7 +138,7 @@ getWidgetSidebar( Calamares::DebugWindowManager* debug, if ( /* About-Calamares Button enabled */ true ) { QPushButton* aboutDialog = new QPushButton; - aboutDialog->setObjectName( "aboutDialogButton" ); + aboutDialog->setObjectName( "aboutButton" ); aboutDialog->setIcon( CalamaresUtils::defaultPixmap( CalamaresUtils::Information, CalamaresUtils::Original, 2 * QSize( defaultFontHeight, defaultFontHeight ) ) ); From 700f2a6af36e1fca82539f0907dc568acf954f1b Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sat, 11 Jun 2022 00:30:32 +0200 Subject: [PATCH 04/91] [fstab] Warn when the mount options end up weird Cherry-picked from 3.3, but only half of it applies. --- src/modules/fstab/main.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/modules/fstab/main.py b/src/modules/fstab/main.py index fc0649e2a..1fd1d695a 100755 --- a/src/modules/fstab/main.py +++ b/src/modules/fstab/main.py @@ -425,6 +425,7 @@ def run(): # We rely on mount_options having a default; if there wasn't one, # bail out with a meaningful error. if not mount_options: + libcalamares.utils.warning("No mount options defined, {!s} partitions".format(len(partitions))) return (_("Configuration Error"), _("No 
{!s}
configuration is given for 
{!s}
to use.") .format("mountOptions", "fstab")) From 8461571fbdf0fb6bfeb93194f0331b4584738d31 Mon Sep 17 00:00:00 2001 From: demmm Date: Mon, 13 Jun 2022 11:04:00 +0200 Subject: [PATCH 05/91] [bootloader] bootLoader GS is always empty for EFI with https://github.com/calamares/calamares/commit/e15e57600e3df46ea2a14fff6a807fa354553ae1#diff-91818b0ce02fc61c3ff4b136101ee5f632a3a1febc46632dcd1dc4dc4ddc8594L801 the bootloader module will never run for EFI systems. Option to select to install or not install a bootloader is only visible on BIOS systems at this point. Go back to only using bootLoader value for BIOS systems. This fixes https://github.com/calamares/calamares/issues/1990 --- src/modules/bootloader/main.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/modules/bootloader/main.py b/src/modules/bootloader/main.py index cc22746dd..dd4b41823 100644 --- a/src/modules/bootloader/main.py +++ b/src/modules/bootloader/main.py @@ -798,12 +798,8 @@ def run(): fw_type = libcalamares.globalstorage.value("firmwareType") - if libcalamares.globalstorage.value("bootLoader") is None: - # Don't want a bootloader, but do log that this has an effect: - if fw_type != "efi": - libcalamares.utils.warning( "Non-EFI system, and no bootloader is set." ) - else: - libcalamares.utils.warning( "EFI system, and no bootloader is set." ) + if (libcalamares.globalstorage.value("bootLoader") is None and fw_type != "efi"): + libcalamares.utils.warning( "Non-EFI system, and no bootloader is set." ) return None partitions = libcalamares.globalstorage.value("partitions") From 2696bd5b447874663be2b5191364d2740be24cdd Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 14 Jun 2022 11:33:43 +0200 Subject: [PATCH 06/91] CI: update action references to pull in the right packages for nightly build --- .github/workflows/nightly-debian.yml | 4 ++-- .github/workflows/nightly-opensuse.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/nightly-debian.yml b/.github/workflows/nightly-debian.yml index f7c232569..87cf5118e 100644 --- a/.github/workflows/nightly-debian.yml +++ b/.github/workflows/nightly-debian.yml @@ -1,4 +1,4 @@ -name: nightly-debian-10 +name: nightly-debian-11 on: schedule: @@ -22,7 +22,7 @@ jobs: options: --tmpfs /build:rw --user 0:0 steps: - name: "prepare env" - uses: calamares/actions/prepare-debian@v4 + uses: calamares/actions/prepare-debian@v5 - name: "prepare source" uses: calamares/actions/generic-checkout@v4 - name: "build" diff --git a/.github/workflows/nightly-opensuse.yml b/.github/workflows/nightly-opensuse.yml index 34a90b392..469632f0a 100644 --- a/.github/workflows/nightly-opensuse.yml +++ b/.github/workflows/nightly-opensuse.yml @@ -22,7 +22,7 @@ jobs: options: --tmpfs /build:rw --user 0:0 steps: - name: "prepare env" - uses: calamares/actions/prepare-opensuse@v4 + uses: calamares/actions/prepare-opensuse@0947b82b55adbb1055018d706da46eb70f8bcce5 - name: "prepare source" uses: calamares/actions/generic-checkout@v4 - name: "build" From 0809dc65ec5f210558cd4047ecf468e50126341f Mon Sep 17 00:00:00 2001 From: Calamares CI Date: Tue, 14 Jun 2022 13:32:16 +0200 Subject: [PATCH 07/91] i18n: [calamares] Automatic merge of Transifex translations --- lang/calamares_ar.ts | 63 +++++------- lang/calamares_as.ts | 63 +++++------- lang/calamares_ast.ts | 63 +++++------- lang/calamares_az.ts | 75 ++++++-------- lang/calamares_az_AZ.ts | 79 +++++++-------- lang/calamares_be.ts | 63 +++++------- lang/calamares_bg.ts | 63 +++++------- lang/calamares_bn.ts | 63 +++++------- lang/calamares_ca.ts | 65 +++++------- lang/calamares_ca@valencia.ts | 63 +++++------- lang/calamares_cs_CZ.ts | 63 +++++------- lang/calamares_da.ts | 63 +++++------- lang/calamares_de.ts | 63 +++++------- lang/calamares_el.ts | 63 +++++------- lang/calamares_en.ts | 6 +- lang/calamares_en_GB.ts | 63 +++++------- lang/calamares_eo.ts | 61 +++++------- lang/calamares_es.ts | 63 +++++------- lang/calamares_es_MX.ts | 63 +++++------- lang/calamares_es_PR.ts | 61 +++++------- lang/calamares_et.ts | 63 +++++------- lang/calamares_eu.ts | 63 +++++------- lang/calamares_fa.ts | 63 +++++------- lang/calamares_fi_FI.ts | 73 ++++++-------- lang/calamares_fr.ts | 181 ++++++++++++++++------------------ lang/calamares_fur.ts | 63 +++++------- lang/calamares_gl.ts | 63 +++++------- lang/calamares_gu.ts | 61 +++++------- lang/calamares_he.ts | 63 +++++------- lang/calamares_hi.ts | 63 +++++------- lang/calamares_hr.ts | 73 ++++++-------- lang/calamares_hu.ts | 63 +++++------- lang/calamares_id.ts | 63 +++++------- lang/calamares_ie.ts | 61 +++++------- lang/calamares_is.ts | 63 +++++------- lang/calamares_it_IT.ts | 65 +++++------- lang/calamares_ja-Hira.ts | 61 +++++------- lang/calamares_ja.ts | 73 ++++++-------- lang/calamares_kk.ts | 61 +++++------- lang/calamares_kn.ts | 61 +++++------- lang/calamares_ko.ts | 73 ++++++-------- lang/calamares_lo.ts | 61 +++++------- lang/calamares_lt.ts | 63 +++++------- lang/calamares_lv.ts | 61 +++++------- lang/calamares_mk.ts | 61 +++++------- lang/calamares_ml.ts | 63 +++++------- lang/calamares_mr.ts | 63 +++++------- lang/calamares_nb.ts | 63 +++++------- lang/calamares_ne_NP.ts | 61 +++++------- lang/calamares_nl.ts | 63 +++++------- lang/calamares_oc.ts | 63 +++++------- lang/calamares_pl.ts | 63 +++++------- lang/calamares_pt_BR.ts | 73 ++++++-------- lang/calamares_pt_PT.ts | 65 +++++------- lang/calamares_ro.ts | 63 +++++------- lang/calamares_ru.ts | 83 +++++++--------- lang/calamares_si.ts | 63 +++++------- lang/calamares_sk.ts | 63 +++++------- lang/calamares_sl.ts | 61 +++++------- lang/calamares_sq.ts | 63 +++++------- lang/calamares_sr.ts | 61 +++++------- lang/calamares_sr@latin.ts | 61 +++++------- lang/calamares_sv.ts | 63 +++++------- lang/calamares_ta_IN.ts | 61 +++++------- lang/calamares_te.ts | 61 +++++------- lang/calamares_tg.ts | 64 +++++------- lang/calamares_th.ts | 63 +++++------- lang/calamares_tr_TR.ts | 73 ++++++-------- lang/calamares_uk.ts | 63 +++++------- lang/calamares_ur.ts | 61 +++++------- lang/calamares_vi.ts | 63 +++++------- lang/calamares_zh.ts | 61 +++++------- lang/calamares_zh_CN.ts | 63 +++++------- lang/calamares_zh_HK.ts | 61 +++++------- lang/calamares_zh_TW.ts | 73 ++++++-------- 75 files changed, 1956 insertions(+), 2917 deletions(-) diff --git a/lang/calamares_ar.ts b/lang/calamares_ar.ts index 7d12a26b4..dddf401e6 100644 --- a/lang/calamares_ar.ts +++ b/lang/calamares_ar.ts @@ -156,7 +156,7 @@ - + Debug information معلومات التّنقيح @@ -511,12 +511,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer %1 المثبت @@ -1461,7 +1461,7 @@ The installer will quit and all changes will be lost. - Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition. @@ -4054,61 +4054,56 @@ Output: - &About - &حول - - - Open donations website - + &Donate - + Open help and support website - + &Support &الدعم - + Open issues and bug-tracking website - + &Known issues &مشاكل معروفة - + Open release notes website - + &Release notes &ملاحظات الإصدار - + %1 support %1 الدعم - + About %1 setup - + About %1 installer حول 1% المثبت @@ -4173,20 +4168,17 @@ Output: - - about - - - Back - - - calamares-sidebar - - Show debug information - أظهر معلومات التّنقيح + + About + + + + + Debug + التدقيق @@ -4523,26 +4515,21 @@ Output: - About - - - - Support - + Known issues - + Release notes - + Donate diff --git a/lang/calamares_as.ts b/lang/calamares_as.ts index da7b42ec0..522894af4 100644 --- a/lang/calamares_as.ts +++ b/lang/calamares_as.ts @@ -156,7 +156,7 @@ ৱিজেত্ ত্ৰি - + Debug information ডিবাগ তথ্য @@ -503,12 +503,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program %1 চেত্ আপ প্ৰোগ্ৰেম - + %1 Installer %1 ইনস্তলাৰ @@ -1453,7 +1453,7 @@ The installer will quit and all changes will be lost. - Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition. @@ -4016,61 +4016,56 @@ Output: - &About - সম্পর্কে (&A) - - - Open donations website দান কৰা ৱেবচাইট খোলক - + &Donate দান কৰক (&D) - + Open help and support website সহায়ক ৱেবচাইট খোলক - + &Support সহায় (&S) - + Open issues and bug-tracking website সমস্যা আৰু ক্ৰুটি অনুসৰণৰ ৱেবচাইট খোলক - + &Known issues জ্ঞাত সমস্যা (&K) - + Open release notes website মুক্তি টোকাৰ ৱেবচাইট খোলক - + &Release notes মুক্তি টোকা (&R) - + %1 support %1 সহায় - + About %1 setup %1 চেত্ আপ প্ৰগ্ৰামৰ বিষয়ে - + About %1 installer %1 ইনস্তলাৰৰ বিষয়ে @@ -4135,20 +4130,17 @@ Output: - - about - - - Back - পাছলৈ - - calamares-sidebar - - Show debug information - দিবাগ তথ্য দেখাওক + + About + সম্পর্কে + + + + Debug + @@ -4489,26 +4481,21 @@ Output: - About - সম্পর্কে - - - Support সহায় - + Known issues জ্ঞাত সমস্যা - + Release notes মুক্তি টোকা - + Donate দান কৰক diff --git a/lang/calamares_ast.ts b/lang/calamares_ast.ts index 1a510b3f5..86ced11f3 100644 --- a/lang/calamares_ast.ts +++ b/lang/calamares_ast.ts @@ -156,7 +156,7 @@ - + Debug information Información de la depuración @@ -503,12 +503,12 @@ L'instalador va colar y van perdese tolos cambeos. CalamaresWindow - + %1 Setup Program Programa de configuración de %1 - + %1 Installer Instalador de %1 @@ -1453,7 +1453,7 @@ L'instalador va colar y van perdese tolos cambeos. - Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition. @@ -4016,61 +4016,56 @@ Salida: - &About - &Tocante a - - - Open donations website - + &Donate - + Open help and support website - + &Support &Sofitu - + Open issues and bug-tracking website - + &Known issues &Problemes conocíos - + Open release notes website - + &Release notes Notes de &llanzamientu - + %1 support Sofitu de %1 - + About %1 setup Tocante a la configuración de %1 - + About %1 installer Tocante al instalador de %1 @@ -4135,20 +4130,17 @@ Salida: - - about - - - Back - - - calamares-sidebar - - Show debug information - Amosar la depuración + + About + + + + + Debug + @@ -4485,26 +4477,21 @@ Salida: - About - - - - Support - + Known issues Problemes conocíos - + Release notes Notes del llanzamientu - + Donate diff --git a/lang/calamares_az.ts b/lang/calamares_az.ts index 3954fdcef..45e5d6c90 100644 --- a/lang/calamares_az.ts +++ b/lang/calamares_az.ts @@ -6,18 +6,18 @@ <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> - + %3 <strong><br/><br/> üçün <h1>%1</h1> </strong>%2<br/> Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - + <a href="https://calamares.io/team/"> Calamares komandası</a>na və <a href="https://www.transifex.com/calamares/calamares/">Calamares tərcüməçilər komandası</a>na təşəkkürlər. <br/><br/><a href="https://calamares.io/">Calamres-in inkişafı<br/> <a href="http://www.blue-systems.com/">Blue Sytems</a> Azad proqram təminatı tərəfindən dəstəklənir. Copyright %1-%2 %3 &lt;%4&gt;<br/> Copyright year-year Name <email-address> - + Müəllif Hüquqları %1-%2 %3 &lt;%4&gt; <br/> @@ -156,7 +156,7 @@ Vidjetlər ağacı - + Debug information Sazlama məlumatları @@ -292,7 +292,7 @@ (%n second(s)) (%n saniyə(lər)) - (%n saniyə(lər)) + (%n saniyə) @@ -507,12 +507,12 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. CalamaresWindow - + %1 Setup Program %1 Quraşdırıcı proqram - + %1 Installer %1 Quraşdırıcı @@ -1453,12 +1453,12 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. Passphrase for existing partition - + Mövcud bölmə üçün şifrəli ifadə - Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. - + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition. + %1 bölmənin şifrəsi verilmiş şifrəli ifadə ilə açıla bilmədi. <br/><br/>Bölməyə düzəliş edin və düzgün şifrəli ifadə daxil edin və ya silin və yeni şifrələnmiş bölmə yaradın. @@ -4023,61 +4023,56 @@ Output: - &About - H&aqqında - - - Open donations website Maddi dəstək üçün veb səhifəsi - + &Donate Ma&ddi dəstək - + Open help and support website Kömək və dəstək veb səhifəsi - + &Support Də&stək - + Open issues and bug-tracking website Problemlər və xəta izləmə veb səhifəsi - + &Known issues &Məlum problemlər - + Open release notes website Buraxılış haqqında qeydlər veb səhifəsi - + &Release notes Bu&raxılış haqqında qeydlər - + %1 support %1 dəstəyi - + About %1 setup %1 quraşdırması haqqında - + About %1 installer %1 quraşdırıcısı haqqında @@ -4142,20 +4137,17 @@ Output: Çıxışda: - - about - - - Back - Geriyə - - calamares-sidebar - - Show debug information - Sazlama məlumatlarını göstərmək + + About + Haqqında + + + + Debug + Sazlama @@ -4520,26 +4512,21 @@ Output: - About - Haqqında - - - Support Dəstək - + Known issues Məlum problemlər - + Release notes Buraxılış qeydləri - + Donate Maddi dəstək diff --git a/lang/calamares_az_AZ.ts b/lang/calamares_az_AZ.ts index 98b3dbb2c..7949ea4a8 100644 --- a/lang/calamares_az_AZ.ts +++ b/lang/calamares_az_AZ.ts @@ -6,18 +6,18 @@ <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> - + %3 <strong><br/><br/> üçün <h1>%1</h1> </strong>%2<br/> Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - + <a href="https://calamares.io/team/"> Calamares komandası</a>na və <a href="https://www.transifex.com/calamares/calamares/">Calamares tərcüməçilər komandası</a>na təşəkkürlər. <br/><br/><a href="https://calamares.io/">Calamres-in inkişafı<br/> <a href="http://www.blue-systems.com/">Blue Sytems</a> Azad proqram təminatı tərəfindən dəstəklənir. Copyright %1-%2 %3 &lt;%4&gt;<br/> Copyright year-year Name <email-address> - + Müəllif Hüquqları %1-%2 %3 &lt;%4&gt; <br/> @@ -51,7 +51,7 @@ Master Boot Record of %1 - %1 ƏsasÖnyükləyici Qeydi + %1 Əsas önyükləyici qeydi @@ -156,7 +156,7 @@ Vidjetlər ağacı - + Debug information Sazlama məlumatları @@ -292,7 +292,7 @@ (%n second(s)) (%n saniyə(lər)) - (%n saniyə(lər)) + (%n saniyə) @@ -507,12 +507,12 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. CalamaresWindow - + %1 Setup Program %1 Quraşdırıcı proqram - + %1 Installer %1 Quraşdırıcı @@ -1408,7 +1408,7 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. Format - Formatlamaq + Formatlansın @@ -1453,12 +1453,12 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. Passphrase for existing partition - + Mövcud bölmə üçün şifrəli ifadə - Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. - + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition. + %1 bölmənin şifrəsi verilmiş şifrəli ifadə ilə açıla bilmədi. <br/><br/>Bölməyə düzəliş edin və düzgün şifrəli ifadə daxil edin və ya silin və yeni şifrələnmiş bölmə yaradın. @@ -4023,61 +4023,56 @@ Output: - &About - H&aqqında - - - Open donations website Maddi dəstək üçün veb səhifəsi - + &Donate Ma&ddi dəstək - + Open help and support website Kömək və dəstək veb səhifəsi - + &Support Də&stək - + Open issues and bug-tracking website Problemlər və xəta izləmə veb səhifəsi - + &Known issues &Məlum problemlər - + Open release notes website Buraxılış haqqında qeydlər veb səhifəsi - + &Release notes Bu&raxılış haqqında qeydlər - + %1 support %1 dəstəyi - + About %1 setup %1 quraşdırması haqqında - + About %1 installer %1 quraşdırıcısı haqqında @@ -4142,20 +4137,17 @@ Output: Çıxışda: - - about - - - Back - Geriyə - - calamares-sidebar - - Show debug information - Sazlama məlumatlarını göstərmək + + About + Haqqında + + + + Debug + Sazlama @@ -4520,26 +4512,21 @@ Output: - About - Haqqında - - - Support Dəstək - + Known issues Məlum problemlər - + Release notes Buraxılış qeydləri - + Donate Maddi dəstək diff --git a/lang/calamares_be.ts b/lang/calamares_be.ts index ceade48f3..6eaa90eca 100644 --- a/lang/calamares_be.ts +++ b/lang/calamares_be.ts @@ -156,7 +156,7 @@ Дрэва віджэтаў - + Debug information Адладачная інфармацыя @@ -505,12 +505,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program Праграма ўсталёўкі %1 - + %1 Installer Праграма ўсталёўкі %1 @@ -1455,7 +1455,7 @@ The installer will quit and all changes will be lost. - Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition. @@ -4038,61 +4038,56 @@ Output: - &About - &Пра праграму - - - Open donations website Адкрыць старонку ахвяраванняў - + &Donate &Ахвяраваць - + Open help and support website Адкрыць старонку з даведкай - + &Support &Падтрымка - + Open issues and bug-tracking website Адкрыць старонку трэкера хібаў - + &Known issues &Вядомыя праблемы - + Open release notes website Адкрыць старонку нататак да выпуску - + &Release notes &Нататкі да выпуску - + %1 support падтрымка %1 - + About %1 setup Пра ўсталёўку %1 - + About %1 installer Пра %1 @@ -4157,20 +4152,17 @@ Output: - - about - - - Back - Назад - - calamares-sidebar - - Show debug information - Паказаць адладачную інфармацыю + + About + Пра праграму + + + + Debug + @@ -4532,26 +4524,21 @@ Output: - About - Пра праграму - - - Support Падтрымка - + Known issues Вядомыя праблемы - + Release notes Нататкі да выпуску - + Donate Ахвяраваць diff --git a/lang/calamares_bg.ts b/lang/calamares_bg.ts index 56dd18d6e..a3a4804c5 100644 --- a/lang/calamares_bg.ts +++ b/lang/calamares_bg.ts @@ -156,7 +156,7 @@ - + Debug information Информация за отстраняване на грешки @@ -502,12 +502,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer %1 Инсталатор @@ -1453,7 +1453,7 @@ The installer will quit and all changes will be lost. - Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition. @@ -4012,61 +4012,56 @@ Output: - &About - &Относно - - - Open donations website - + &Donate - + Open help and support website - + &Support &Поддръжка - + Open issues and bug-tracking website - + &Known issues &Съществуващи проблеми - + Open release notes website - + &Release notes &Бележки по изданието - + %1 support %1 поддръжка - + About %1 setup - + About %1 installer Относно инсталатор %1 @@ -4131,20 +4126,17 @@ Output: - - about - - - Back - - - calamares-sidebar - - Show debug information - Покажи информация за отстраняване на грешки + + About + + + + + Debug + Отстраняване на грешки @@ -4481,26 +4473,21 @@ Output: - About - - - - Support - + Known issues - + Release notes - + Donate diff --git a/lang/calamares_bn.ts b/lang/calamares_bn.ts index 0e4db5869..9f08c3813 100644 --- a/lang/calamares_bn.ts +++ b/lang/calamares_bn.ts @@ -156,7 +156,7 @@ - + Debug information তথ্য ডিবাগ করুন @@ -502,12 +502,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer %1 ইনস্টল @@ -1452,7 +1452,7 @@ The installer will quit and all changes will be lost. - Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition. @@ -4009,61 +4009,56 @@ Output: - &About - এবংসম্পর্কে - - - Open donations website - + &Donate - + Open help and support website - + &Support এবংসহায়তা - + Open issues and bug-tracking website - + &Known issues এবংপরিচিত বিষয়গুলো - + Open release notes website - + &Release notes এবংনোট প্রকাশ করুন - + %1 support %1 সহায়তা - + About %1 setup - + About %1 installer %1 ইনস্টলার সম্পর্কে @@ -4128,20 +4123,17 @@ Output: - - about - - - Back - - - calamares-sidebar - - Show debug information - ডিবাগ তথ্য দেখান + + About + + + + + Debug + @@ -4478,26 +4470,21 @@ Output: - About - - - - Support - + Known issues - + Release notes - + Donate diff --git a/lang/calamares_ca.ts b/lang/calamares_ca.ts index a6597868a..a569aee90 100644 --- a/lang/calamares_ca.ts +++ b/lang/calamares_ca.ts @@ -156,7 +156,7 @@ Arbre de ginys - + Debug information Informació de depuració @@ -507,12 +507,12 @@ L'instal·lador es tancarà i tots els canvis es perdran. CalamaresWindow - + %1 Setup Program Programa de configuració %1 - + %1 Installer Instal·lador de %1 @@ -1457,8 +1457,8 @@ L'instal·lador es tancarà i tots els canvis es perdran. - Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. - La partició %1 no s'ha pogut desencriptar amb la frase de contrasenya proporcionada. <br/><br/> Torneu a editar la partició i proporcioneu la contrasenya correcta o suprimiu-la i creeu una partició encriptada nova. + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition. + La partició %1 no s'ha pogut desencriptar amb la contrasenya proporcionada. <br/><br/> Torneu a editar la partició i proporcioneu la contrasenya correcta, o suprimiu-la i creeu una partició encriptada nova. @@ -4022,61 +4022,56 @@ La configuració pot continuar, però algunes característiques podrien estar in - &About - &Quant a - - - Open donations website Obre el lloc web per a les donacions - + &Donate Feu una &donació - + Open help and support website Obre el lloc web per a l'ajuda i el suport - + &Support &Suport - + Open issues and bug-tracking website Obre el lloc web de problemes i de seguiment d'errors - + &Known issues &Problemes coneguts - + Open release notes website Obre el lloc web de les notes de la versió - + &Release notes &Notes de la versió - + %1 support %1 suport - + About %1 setup Quant a la configuració de %1 - + About %1 installer Quant a l'instal·lador %1 @@ -4141,20 +4136,17 @@ La configuració pot continuar, però algunes característiques podrien estar in La sortida ha estat la següent: - - about - - - Back - Enrere - - calamares-sidebar - - Show debug information - Informació de depuració + + About + Quant a + + + + Debug + Depuració @@ -4519,26 +4511,21 @@ Opció predeterminada. - About - Quant a - - - Support Suport - + Known issues Problemes coneguts - + Release notes Notes de la versió - + Donate Feu una donació diff --git a/lang/calamares_ca@valencia.ts b/lang/calamares_ca@valencia.ts index cfa1bc7e1..890995de7 100644 --- a/lang/calamares_ca@valencia.ts +++ b/lang/calamares_ca@valencia.ts @@ -156,7 +156,7 @@ Arbre d'elements - + Debug information Informació de depuració @@ -503,12 +503,12 @@ L'instal·lador es tancarà i tots els canvis es perdran. CalamaresWindow - + %1 Setup Program Programa de configuració %1 - + %1 Installer Instal·lador de %1 @@ -1453,7 +1453,7 @@ L'instal·lador es tancarà i tots els canvis es perdran. - Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition. @@ -4018,61 +4018,56 @@ La configuració pot continuar, però és possible que algunes característiques - &About - &Quant a - - - Open donations website Obri el lloc web per als donatius - + &Donate Feu un &donatiu - + Open help and support website Obri el lloc web per a l'ajuda i el suport - + &Support &Suport - + Open issues and bug-tracking website Obri el lloc web de problemes i de seguiment d'errors - + &Known issues &Incidències conegudes - + Open release notes website Obri el lloc web de les notes de la versió - + &Release notes &Notes de la versió - + %1 support %1 soport - + About %1 setup Quant a la configuració de %1 - + About %1 installer Sobre %1 instal·lador @@ -4137,20 +4132,17 @@ La configuració pot continuar, però és possible que algunes característiques - - about - - - Back - Arrere - - calamares-sidebar - - Show debug information - Mostra la informació de depuració + + About + Quant a + + + + Debug + @@ -4511,26 +4503,21 @@ La configuració pot continuar, però és possible que algunes característiques - About - Quant a - - - Support Suport - + Known issues Incidències conegudes - + Release notes Notes de la versió - + Donate Feu un donatiu diff --git a/lang/calamares_cs_CZ.ts b/lang/calamares_cs_CZ.ts index 3d0effe36..8e03b527a 100644 --- a/lang/calamares_cs_CZ.ts +++ b/lang/calamares_cs_CZ.ts @@ -156,7 +156,7 @@ Strom ovládacích prvků - + Debug information Ladící informace @@ -511,12 +511,12 @@ Instalační program bude ukončen a všechny změny ztraceny. CalamaresWindow - + %1 Setup Program Instalátor %1 - + %1 Installer Instalátor %1 @@ -1461,7 +1461,7 @@ Instalační program bude ukončen a všechny změny ztraceny. - Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition. @@ -4044,61 +4044,56 @@ Výstup: - &About - &O projektu - - - Open donations website Otevřít webovou stránku po poskytnutí daru - + &Donate &Darovat - + Open help and support website Otevřít webovou stránku s nápovědou a podporou - + &Support &Podpora - + Open issues and bug-tracking website Otevřít webovou stránku se správou hlášení problémů - + &Known issues &Známé problémy - + Open release notes website Otevřít webovou stránku s poznámkami k vydání - + &Release notes &Poznámky k vydání - + %1 support %1 podpora - + About %1 setup O nastavování %1 - + About %1 installer O instalátoru %1. @@ -4163,20 +4158,17 @@ Výstup: Výstup byl: - - about - - - Back - Zpět - - calamares-sidebar - - Show debug information - Zobrazit ladící informace + + About + O projektu + + + + Debug + Ladění @@ -4541,26 +4533,21 @@ Výstup: - About - O projektu - - - Support Podpora - + Known issues Známé problémy - + Release notes Poznámky k vydání - + Donate Podpořit vývoj darem diff --git a/lang/calamares_da.ts b/lang/calamares_da.ts index 3a893935b..926fca66f 100644 --- a/lang/calamares_da.ts +++ b/lang/calamares_da.ts @@ -156,7 +156,7 @@ Widgettræ - + Debug information Fejlretningsinformation @@ -503,12 +503,12 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt. CalamaresWindow - + %1 Setup Program %1-opsætningsprogram - + %1 Installer %1-installationsprogram @@ -1453,7 +1453,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt. - Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition. @@ -4019,61 +4019,56 @@ setting - &About - &Om - - - Open donations website Åbn websted for donationer - + &Donate &Donér - + Open help and support website Åbn websted for hjælp og support - + &Support &Support - + Open issues and bug-tracking website Åbn websted for issues og bug-tracking - + &Known issues &Kendte problemer - + Open release notes website Åbn websted med udgivelsesnoter - + &Release notes &Udgivelsesnoter - + %1 support %1 support - + About %1 setup Om %1-opsætningen - + About %1 installer Om %1-installationsprogrammet @@ -4138,20 +4133,17 @@ setting - - about - - - Back - Tilbage - - calamares-sidebar - - Show debug information - Vis fejlretningsinformation + + About + Om + + + + Debug + Fejlfinde @@ -4512,26 +4504,21 @@ setting - About - Om - - - Support Support - + Known issues Kendte problemer - + Release notes Udgivelsesnoter - + Donate Donér diff --git a/lang/calamares_de.ts b/lang/calamares_de.ts index 1fba578c4..a6b385bd3 100644 --- a/lang/calamares_de.ts +++ b/lang/calamares_de.ts @@ -156,7 +156,7 @@ Widget-Baum - + Debug information Debug-Information @@ -507,12 +507,12 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. CalamaresWindow - + %1 Setup Program %1 Installationsprogramm - + %1 Installer %1 Installationsprogramm @@ -1458,7 +1458,7 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. - Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition. @@ -4023,61 +4023,56 @@ Ausgabe: - &About - &Über - - - Open donations website Öffne Spenden-Website - + &Donate Spen&den - + Open help and support website Webseite für Hilfe und Support aufrufen - + &Support &Unterstützung - + Open issues and bug-tracking website Webseite für das Melden von Fehlern aufrufen - + &Known issues &Bekannte Probleme - + Open release notes website Webseite für Versionshinweise aufrufen - + &Release notes &Veröffentlichungshinweise - + %1 support Unterstützung für %1 - + About %1 setup Über das Installationsprogramm %1 - + About %1 installer Über das %1 Installationsprogramm @@ -4142,20 +4137,17 @@ Ausgabe: Die Ausgabe war: - - about - - - Back - Zurück - - calamares-sidebar - - Show debug information - Informationen zur Fehlersuche anzeigen + + About + Über + + + + Debug + Beheben von Fehlern @@ -4519,26 +4511,21 @@ Ausgabe: - About - Über - - - Support Unterstützung - + Known issues Bekannte Probleme - + Release notes Veröffentlichungshinweise - + Donate Spenden diff --git a/lang/calamares_el.ts b/lang/calamares_el.ts index c4598ac31..c3b08c5d8 100644 --- a/lang/calamares_el.ts +++ b/lang/calamares_el.ts @@ -156,7 +156,7 @@ - + Debug information Πληροφορίες αποσφαλμάτωσης @@ -502,12 +502,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer Εφαρμογή εγκατάστασης του %1 @@ -1452,7 +1452,7 @@ The installer will quit and all changes will be lost. - Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition. @@ -4009,61 +4009,56 @@ Output: - &About - Σ&χετικά με - - - Open donations website - + &Donate - + Open help and support website - + &Support &Υποστήριξη - + Open issues and bug-tracking website - + &Known issues &Γνωστά προβλήματα - + Open release notes website - + &Release notes Ση&μειώσεις έκδοσης - + %1 support Υποστήριξη %1 - + About %1 setup - + About %1 installer Σχετικά με το πρόγραμμα εγκατάστασης %1 @@ -4128,20 +4123,17 @@ Output: - - about - - - Back - - - calamares-sidebar - - Show debug information - Εμφάνιση πληροφοριών απασφαλμάτωσης + + About + + + + + Debug + Debug @@ -4478,26 +4470,21 @@ Output: - About - - - - Support - + Known issues - + Release notes - + Donate diff --git a/lang/calamares_en.ts b/lang/calamares_en.ts index ab6245471..11db39095 100644 --- a/lang/calamares_en.ts +++ b/lang/calamares_en.ts @@ -1458,7 +1458,7 @@ The installer will quit and all changes will be lost. Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition. - + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition. @@ -4141,12 +4141,12 @@ Output: About - About + About Debug - + Debug diff --git a/lang/calamares_en_GB.ts b/lang/calamares_en_GB.ts index e4bea73d6..bada0d3fd 100644 --- a/lang/calamares_en_GB.ts +++ b/lang/calamares_en_GB.ts @@ -156,7 +156,7 @@ - + Debug information Debug information @@ -502,12 +502,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer %1 Installer @@ -1452,7 +1452,7 @@ The installer will quit and all changes will be lost. - Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition. @@ -4012,61 +4012,56 @@ Output: - &About - &About - - - Open donations website - + &Donate - + Open help and support website - + &Support &Support - + Open issues and bug-tracking website - + &Known issues &Known issues - + Open release notes website - + &Release notes &Release notes - + %1 support %1 support - + About %1 setup - + About %1 installer About %1 installer @@ -4131,20 +4126,17 @@ Output: - - about - - - Back - - - calamares-sidebar - - Show debug information - Show debug information + + About + + + + + Debug + Debug @@ -4481,26 +4473,21 @@ Output: - About - - - - Support - + Known issues - + Release notes - + Donate diff --git a/lang/calamares_eo.ts b/lang/calamares_eo.ts index 42889ddff..5c8d8574b 100644 --- a/lang/calamares_eo.ts +++ b/lang/calamares_eo.ts @@ -156,7 +156,7 @@ KromprogrametArbo - + Debug information Sencimiga Informaĵo @@ -506,12 +506,12 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos. CalamaresWindow - + %1 Setup Program - + %1 Installer %1 Instalilo @@ -1456,7 +1456,7 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos. - Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition. @@ -4013,61 +4013,56 @@ Output: - &About - - - - Open donations website - + &Donate - + Open help and support website - + &Support - + Open issues and bug-tracking website - + &Known issues - + Open release notes website - + &Release notes - + %1 support - + About %1 setup - + About %1 installer @@ -4132,19 +4127,16 @@ Output: - - about - - - Back - - - calamares-sidebar - - Show debug information + + About + + + + + Debug @@ -4482,26 +4474,21 @@ Output: - About - - - - Support - + Known issues - + Release notes - + Donate diff --git a/lang/calamares_es.ts b/lang/calamares_es.ts index 5169765a9..60959b887 100644 --- a/lang/calamares_es.ts +++ b/lang/calamares_es.ts @@ -156,7 +156,7 @@ Árbol de «widgets» - + Debug information Información de depuración @@ -509,12 +509,12 @@ El instalador se cerrará y todos tus cambios se perderán. CalamaresWindow - + %1 Setup Program Programa de configuración de %1 - + %1 Installer Instalador de %1 @@ -1459,7 +1459,7 @@ El instalador se cerrará y todos tus cambios se perderán. - Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition. @@ -4033,61 +4033,56 @@ Información de salida: - &About - &Acerca de - - - Open donations website Abrir la página web de donaciones - + &Donate &Donar - + Open help and support website Abrir el sitio web de ayuda y soporte - + &Support &Ayuda - + Open issues and bug-tracking website Sitio web de problemas y mejoras - + &Known issues &Problemas conocidos - + Open release notes website Abrir la web con las notas de lanzamiento - + &Release notes &Notas de publicación - + %1 support %1 ayuda - + About %1 setup Acerca del configurador de %1 - + About %1 installer Acerca del instalador %1 @@ -4152,20 +4147,17 @@ Información de salida: El programa ha devuelto: - - about - - - Back - Atrás - - calamares-sidebar - - Show debug information - Ver la información de depuración. + + About + Acerca de + + + + Debug + Depurar @@ -4531,26 +4523,21 @@ Información de salida: - About - Acerca de - - - Support Soporte - + Known issues Problemas conocidos - + Release notes Notas de lanzamiento - + Donate Donar diff --git a/lang/calamares_es_MX.ts b/lang/calamares_es_MX.ts index c00cc0acc..0dd159f41 100644 --- a/lang/calamares_es_MX.ts +++ b/lang/calamares_es_MX.ts @@ -156,7 +156,7 @@ - + Debug information Información de depuración @@ -505,12 +505,12 @@ El instalador terminará y se perderán todos los cambios. CalamaresWindow - + %1 Setup Program %1 Programa de instalación - + %1 Installer %1 Instalador @@ -1456,7 +1456,7 @@ El instalador terminará y se perderán todos los cambios. - Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition. @@ -4026,61 +4026,56 @@ Salida - &About - &Acerca de - - - Open donations website - + &Donate - + Open help and support website - + &Support &Soporte - + Open issues and bug-tracking website - + &Known issues &Problemas Conocidos - + Open release notes website - + &Release notes &Notas de lanzamiento - + %1 support %1 Soporte - + About %1 setup Acerca de la configuración %1 - + About %1 installer Acerca del instalador %1 @@ -4145,20 +4140,17 @@ Salida - - about - - - Back - - - calamares-sidebar - - Show debug information - Mostrar información de depuración + + About + + + + + Debug + Depurar @@ -4495,26 +4487,21 @@ Salida - About - - - - Support - + Known issues - + Release notes - + Donate diff --git a/lang/calamares_es_PR.ts b/lang/calamares_es_PR.ts index 9ab27d204..7114d184f 100644 --- a/lang/calamares_es_PR.ts +++ b/lang/calamares_es_PR.ts @@ -156,7 +156,7 @@ - + Debug information Información de depuración @@ -503,12 +503,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer @@ -1453,7 +1453,7 @@ The installer will quit and all changes will be lost. - Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition. @@ -4019,61 +4019,56 @@ Output: - &About - - - - Open donations website - + &Donate - + Open help and support website - + &Support - + Open issues and bug-tracking website - + &Known issues - + Open release notes website - + &Release notes - + %1 support - + About %1 setup - + About %1 installer @@ -4138,19 +4133,16 @@ Output: - - about - - - Back - - - calamares-sidebar - - Show debug information + + About + + + + + Debug @@ -4488,26 +4480,21 @@ Output: - About - - - - Support - + Known issues - + Release notes - + Donate diff --git a/lang/calamares_et.ts b/lang/calamares_et.ts index b141288be..8a510d374 100644 --- a/lang/calamares_et.ts +++ b/lang/calamares_et.ts @@ -156,7 +156,7 @@ - + Debug information Silumisteave @@ -502,12 +502,12 @@ Paigaldaja sulgub ning kõik muutused kaovad. CalamaresWindow - + %1 Setup Program - + %1 Installer %1 paigaldaja @@ -1452,7 +1452,7 @@ Paigaldaja sulgub ning kõik muutused kaovad. - Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition. @@ -4012,61 +4012,56 @@ Väljund: - &About - &Teave - - - Open donations website - + &Donate - + Open help and support website - + &Support &Tugi - + Open issues and bug-tracking website - + &Known issues &Teadaolevad vead - + Open release notes website - + &Release notes &Väljalaskemärkmed - + %1 support %1 tugi - + About %1 setup - + About %1 installer Teave %1 paigaldaja kohta @@ -4131,20 +4126,17 @@ Väljund: - - about - - - Back - - - calamares-sidebar - - Show debug information - Kuva silumisteavet + + About + + + + + Debug + Silu @@ -4481,26 +4473,21 @@ Väljund: - About - - - - Support - + Known issues - + Release notes - + Donate diff --git a/lang/calamares_eu.ts b/lang/calamares_eu.ts index d73a6f353..f694415d4 100644 --- a/lang/calamares_eu.ts +++ b/lang/calamares_eu.ts @@ -156,7 +156,7 @@ - + Debug information Arazte informazioa @@ -502,12 +502,12 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira. CalamaresWindow - + %1 Setup Program - + %1 Installer %1 Instalatzailea @@ -1452,7 +1452,7 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira. - Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition. @@ -4011,61 +4011,56 @@ Irteera: - &About - Honi &buruz - - - Open donations website - + &Donate - + Open help and support website - + &Support &Laguntza - + Open issues and bug-tracking website - + &Known issues &Arazo ezagunak - + Open release notes website - + &Release notes - + %1 support %1 euskarria - + About %1 setup - + About %1 installer %1 instalatzaileari buruz @@ -4130,20 +4125,17 @@ Irteera: - - about - - - Back - Atzera - - calamares-sidebar - - Show debug information - Erakutsi arazte informazioa + + About + Honi buruz + + + + Debug + @@ -4480,26 +4472,21 @@ Irteera: - About - Honi buruz - - - Support - + Known issues - + Release notes - + Donate Egin dohaintza diff --git a/lang/calamares_fa.ts b/lang/calamares_fa.ts index 11b5749af..3cb8b1b11 100644 --- a/lang/calamares_fa.ts +++ b/lang/calamares_fa.ts @@ -156,7 +156,7 @@ درخت ابزارک‌ها - + Debug information اطّلاعات اشکال‌زدایی @@ -507,12 +507,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program %1 برنامه راه‌اندازی - + %1 Installer نصب‌کنندهٔ %1 @@ -1457,7 +1457,7 @@ The installer will quit and all changes will be lost. - Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition. @@ -4017,61 +4017,56 @@ Output: - &About - &درباره - - - Open donations website گشودن پایگاه وب اعانه‌ها - + &Donate ا&عانه - + Open help and support website گشودن پایگاه وب راهنمایی و پشتیبانی - + &Support &پشتیبانی - + Open issues and bug-tracking website گشودن پایگاه وب ردیاب مشکل - + &Known issues &مشکلات شناخته‌شده - + Open release notes website گشودن پاگاه وب یادداشت‌های انتشار - + &Release notes &یادداشت‌های انتشار - + %1 support پشتیبانی %1 - + About %1 setup دربارهٔ برپاسازی %1 - + About %1 installer دربارهٔ نصب‌کنندهٔ %1 @@ -4136,20 +4131,17 @@ Output: - - about - - - Back - بازگشت - - calamares-sidebar - - Show debug information - نمایش اطّلاعات اشکال‌زدایی + + About + درباره + + + + Debug + @@ -4494,26 +4486,21 @@ Output: - About - درباره - - - Support پشتیبانی - + Known issues اشکالات شناخته‌شده - + Release notes یادداشت‌های انتشار - + Donate اعانه diff --git a/lang/calamares_fi_FI.ts b/lang/calamares_fi_FI.ts index bd0062c39..43a97f6ed 100644 --- a/lang/calamares_fi_FI.ts +++ b/lang/calamares_fi_FI.ts @@ -6,18 +6,18 @@ <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> - + <h1>%1</h1><br/><strong>%2<br/> on %3</strong><br/><br/> Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - + Kiitos <a href="https://calamares.io/team/">Calamares tiimille </a> ja <a href="https://www.transifex.com/calamares/calamares/">Calamares kääntäjätiimille</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> kehitystä sponsoroi <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. Copyright %1-%2 %3 &lt;%4&gt;<br/> Copyright year-year Name <email-address> - + Copyright %1-%2 %3 &lt;%4&gt;<br/> @@ -156,7 +156,7 @@ Widgettipuu - + Debug information Vianetsinnän tiedot @@ -507,12 +507,12 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat. CalamaresWindow - + %1 Setup Program %1-asennusohjelma - + %1 Installer %1-asentaja @@ -1454,12 +1454,12 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä. Passphrase for existing partition - + Olemassa olevan osion salasana - Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. - + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition. + Osion %1 salausta ei voitu purkaa annetulla salasanalla. <br/><br/>Muokkaa osiota antamalla oikea salasana tai poista ja luo uusi salattu osio. @@ -4023,61 +4023,56 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä.</ - &About - &Tietoa - - - Open donations website Avaa lahjoitussivusto - + &Donate &Lahjoita - + Open help and support website Avaa ohje- ja tukisivusto - + &Support &Tuki - + Open issues and bug-tracking website Avaa ongelmia käsittelevä verkkosivusto - + &Known issues &Tunnetut ongelmat - + Open release notes website Avaa julkaisutietojen verkkosivusto - + &Release notes &Julkaisutiedot - + %1 support %1 tuki - + About %1 setup Tietoja %1 asetuksista - + About %1 installer Tietoa %1-asennusohjelmasta @@ -4142,20 +4137,17 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä.</ Tulos oli: - - about - - - Back - Takaisin - - calamares-sidebar - - Show debug information - Näytä virheenkorjaustiedot + + About + Tietoa + + + + Debug + Virheiden etsintä @@ -4520,26 +4512,21 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä.</ - About - Tietoa - - - Support Tuki - + Known issues Tunnetut ongelmat - + Release notes Julkaisutiedot - + Donate Lahjoita diff --git a/lang/calamares_fr.ts b/lang/calamares_fr.ts index 5cb79bb5d..4b33133af 100644 --- a/lang/calamares_fr.ts +++ b/lang/calamares_fr.ts @@ -6,18 +6,18 @@ <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> - + <h1>%1</h1><br/><strong>%2<br/>pour %3</strong><br/><br/> Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - + Merci à <a href="https://calamares.io/team/">l'équipe de Calamares</a> et à <a href="https://www.transifex.com/calamares/calamares/">l'équipe de traducteurs de Calamares</a>.<br/><br/>Le développement de <a href="https://calamares.io/">Calamares</a> est sponsorisé par<br/><a href="http://www.blue-systems.com/"> Blue Systems</a> - Liberating Software. Copyright %1-%2 %3 &lt;%4&gt;<br/> Copyright year-year Name <email-address> - + Copyright %1-%2 %3 &lt;%4&gt;1<br/> @@ -156,7 +156,7 @@ Arbre de widget - + Debug information Informations de dépannage @@ -509,12 +509,12 @@ L'installateur se fermera et les changements seront perdus. CalamaresWindow - + %1 Setup Program Programme de configuration de %1 - + %1 Installer Installateur %1 @@ -524,7 +524,7 @@ L'installateur se fermera et les changements seront perdus. Set filesystem label on %1. - + Définir l'étiquette du système de fichiers sur %1. @@ -705,27 +705,27 @@ L'installateur se fermera et les changements seront perdus. Successfully unmounted %1. - + Démontage réussi de %1. Successfully disabled swap %1. - + Le swap %1 a été désactivé avec succès. Successfully cleared swap %1. - + Le swap %1 a été effacé avec succès. Successfully closed mapper device %1. - + Le périphérique mappeur %1 a été fermé avec succès. Successfully disabled volume group %1. - + Le groupe de volumes %1 a été désactivé avec succès. @@ -990,12 +990,12 @@ L'installateur se fermera et les changements seront perdus. Install option: <strong>%1</strong> - + Option d'installation : <strong>%1</strong> None - + Aucun @@ -1046,7 +1046,7 @@ L'installateur se fermera et les changements seront perdus. Primar&y - + Primair&e @@ -1076,12 +1076,12 @@ L'installateur se fermera et les changements seront perdus. Label for the filesystem - + Étiquette pour le système de fichiers FS Label: - + Étiquette FS : @@ -1111,7 +1111,7 @@ L'installateur se fermera et les changements seront perdus. Mountpoint must start with a <tt>/</tt>. - + Le point de montage doit commencer par un <tt>/</tt>. @@ -1400,7 +1400,7 @@ L'installateur se fermera et les changements seront perdus. Con&tent: - + Con&tenu : @@ -1445,22 +1445,22 @@ L'installateur se fermera et les changements seront perdus. Label for the filesystem - + Étiquette pour le système de fichiers FS Label: - + Étiquette FS : Passphrase for existing partition - + Mot de passe pour la partition existante - Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. - + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition. + La partition %1 n'a pas pu être déchiffrée avec la phrase secrète donnée. <br/><br/>Modifier à nouveau la partition et indiquer la phrase secrète correcte ou supprimer et créer une nouvelle partition chiffrée. @@ -1478,7 +1478,7 @@ L'installateur se fermera et les changements seront perdus. Your system does not seem to support encryption well enough to encrypt the entire system. You may enable encryption, but performance may suffer. - + Votre système ne semble pas prendre en charge le chiffrement suffisamment bien pour chiffrer l'ensemble du système. Vous pouvez activer le chiffrement, mais les performances peuvent en souffrir. @@ -1502,7 +1502,7 @@ L'installateur se fermera et les changements seront perdus. Details: - + Détails : @@ -1854,17 +1854,17 @@ L'installateur se fermera et les changements seront perdus. No target system available. - + Aucun système cible disponible. No rootMountPoint is set. - + Aucun point de montage racine n'est défini. No configFilePath is set. - + Aucun chemin de fichier de configuration n'est défini. @@ -2246,7 +2246,7 @@ L'installateur se fermera et les changements seront perdus. Select your preferred Region, or use the default settings. - + Sélectionner votre région préférée ou utiliser les paramètres par défaut. @@ -2787,7 +2787,7 @@ L'installateur se fermera et les changements seront perdus. File System Label - + Libellé du système de fichiers @@ -2893,17 +2893,17 @@ L'installateur se fermera et les changements seront perdus. Unsafe partition actions are enabled. - + Les actions de partition non sécurisées sont activées. Partitioning is configured to <b>always</b> fail. - + Le partitionnement est configuré pour <b>toujours</b> échouer. No partitions will be changed. - + Aucune partition ne sera modifiée. @@ -2923,37 +2923,37 @@ L'installateur se fermera et les changements seront perdus. EFI system partition configured incorrectly - + Partition système EFI mal configurée An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem. - + Une partition système EFI est nécessaire pour démarrer %1.<br/><br/>Pour configurer une partition système EFI, revenir en arrière et sélectionner ou créer un système de fichiers approprié. The filesystem must be mounted on <strong>%1</strong>. - + Le système de fichiers doit être monté sur <strong>%1</strong>. The filesystem must have type FAT32. - + Le système de fichiers doit avoir le type FAT32. The filesystem must be at least %1 MiB in size. - + Le système de fichiers doit avoir une taille d'au moins %1 Mio. The filesystem must have flag <strong>%1</strong> set. - + Le système de fichiers doit avoir l'indicateur <strong>%1</strong> défini. You can continue without setting up an EFI system partition but your system may fail to start. - + Vous pouvez continuer sans configurer de partition système EFI, mais votre système risque de ne pas démarrer. @@ -2963,7 +2963,7 @@ L'installateur se fermera et les changements seront perdus. A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>%2</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. - + Une table de partition GPT est la meilleure option pour tous les systèmes. Ce programme d'installation prend également en charge une telle configuration pour les systèmes BIOS. <br/><br/>Pour configurer une table de partition GPT sur le BIOS, (si ce n'est déjà fait), revenir en arrière et définir la table de partition sur GPT, puis créer une partition non formatée de 8 Mo avec l'indicateur <strong>%2</strong> activé.<br/><br/>Une partition non formatée de 8 Mo est nécessaire pour démarrer %1 sur un système BIOS avec GPT. @@ -3914,12 +3914,12 @@ Sortie No target system available. - + Aucun système cible disponible. No rootMountPoint is set. - + Aucun point de montage racine n'est défini. @@ -4034,61 +4034,56 @@ Sortie - &About - &À propos - - - Open donations website Ouvrir le site web de dons - + &Donate &Donner - + Open help and support website Ouvrir le site web d'aide et support - + &Support &Support - + Open issues and bug-tracking website Ouvrir les issues et le site de suivi de bugs - + &Known issues &Problèmes connus - + Open release notes website Ouvrir le site des notes de publication - + &Release notes &Notes de publication - + %1 support Support de %1 - + About %1 setup À propos de la configuration de %1 - + About %1 installer À propos de l'installateur %1 @@ -4114,12 +4109,12 @@ Sortie Create ZFS pools and datasets - + Créer des pools et des jeux de données ZFS Failed to create zpool on - + Impossible de créer zpool sur @@ -4129,44 +4124,41 @@ Sortie No partitions are available for ZFS. - + Aucune partition n'est disponible pour ZFS. Internal data missing - + Données internes manquantes Failed to create zpool - + Impossible de créer zpool Failed to create dataset - + Échec de la création de l'ensemble de données The output was: - - - - - about - - - Back - Retour + La sortie était : calamares-sidebar - - Show debug information - Afficher les informations de dépannage + + About + À propos + + + + Debug + Débug @@ -4212,17 +4204,18 @@ Sortie %1 has been installed on your computer.<br/> You may now restart your device. - + %1 a été installé sur votre ordinateur.<br/> + Vous pouvez maintenant redémarrer votre appareil. Close - + Fermer Restart - + Redémarrer @@ -4252,7 +4245,7 @@ Sortie To activate keyboard preview, select a layout. - + Pour activer l'aperçu du clavier, sélectionner une disposition. @@ -4299,37 +4292,38 @@ Sortie LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/> Default option. - + LibreOffice est une suite bureautique puissante et gratuite, utilisée par des millions de personnes dans le monde. Il comprend plusieurs applications qui en font la suite bureautique libre et open source la plus polyvalente du marché.<br/> + Option par défaut. LibreOffice - + LibreOffice If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives. - + Si vous ne souhaitez pas installer de suite bureautique, sélectionner simplement Aucune suite bureautique. Vous pouvez toujours en ajouter un (ou plusieurs) plus tard sur votre système installé au fur et à mesure que le besoin se fait sentir. No Office Suite - + Pas de suite bureautique Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support. It will be just a desktop, file browser, package manager, text editor and simple web-browser. - + Créer une installation de bureau minimale, supprimer toutes les applications supplémentaires et décider plus tard de ce que vous souhaitez ajouter à votre système. Exemples de ce qui ne sera pas sur une telle installation, il n'y aura pas de suite Office, pas de lecteurs multimédias, pas de visionneuse d'images ou de support d'impression. Ce ne sera qu'un bureau, un navigateur de fichiers, un gestionnaire de packages, un éditeur de texte et un simple navigateur Web. Minimal Install - + Installation minimale Please select an option for your install, or use the default: LibreOffice included. - + Veuillez sélectionner une option pour votre installation, ou utiliser la valeur par défaut : LibreOffice inclus. @@ -4529,26 +4523,21 @@ Sortie - About - À propos - - - Support Support - + Known issues Problèmes connus - + Release notes Notes de version - + Donate Faites un don diff --git a/lang/calamares_fur.ts b/lang/calamares_fur.ts index 9ee3148b0..8cb96ec32 100644 --- a/lang/calamares_fur.ts +++ b/lang/calamares_fur.ts @@ -156,7 +156,7 @@ Arbul dai widget - + Debug information Informazions di debug @@ -503,12 +503,12 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.< CalamaresWindow - + %1 Setup Program Program di configurazion di %1 - + %1 Installer Program di instalazion di %1 @@ -1453,7 +1453,7 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.< - Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition. @@ -4018,61 +4018,56 @@ Output: - &About - &Informazions - - - Open donations website Vierç il sît web pes donazions - + &Donate &Done - + Open help and support website Vierç il sît web pal jutori e pal supuart - + &Support &Supuart - + Open issues and bug-tracking website Vierç il sît web sui problemis e lis segnalazions/indizis sui erôrs - + &Known issues &Problemis cognossûts - + Open release notes website Vierç il sît web des notis di publicazion - + &Release notes &Notis di publicazion - + %1 support Supuart di %1 - + About %1 setup Informazions su la configurazion di %1 - + About %1 installer Informazion su la instalazion di %1 @@ -4137,20 +4132,17 @@ Output: - - about - - - Back - Indaûr - - calamares-sidebar - - Show debug information - Mostre informazions di debug + + About + Informazions + + + + Debug + @@ -4511,26 +4503,21 @@ Output: - About - Informazions - - - Support Supuart - + Known issues Problemis cognossûts - + Release notes Notis di publicazion - + Donate Done diff --git a/lang/calamares_gl.ts b/lang/calamares_gl.ts index 01daf0ad2..d3e9af666 100644 --- a/lang/calamares_gl.ts +++ b/lang/calamares_gl.ts @@ -157,7 +157,7 @@ - + Debug information Informe de depuración de erros. @@ -503,12 +503,12 @@ O instalador pecharase e perderanse todos os cambios. CalamaresWindow - + %1 Setup Program - + %1 Installer Instalador de %1 @@ -1453,7 +1453,7 @@ O instalador pecharase e perderanse todos os cambios. - Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition. @@ -4013,61 +4013,56 @@ Saída: - &About - &Acerca de - - - Open donations website - + &Donate - + Open help and support website - + &Support &Axuda - + Open issues and bug-tracking website - + &Known issues &Problemas coñecidos - + Open release notes website - + &Release notes &Notas de publicación - + %1 support %1 axuda - + About %1 setup - + About %1 installer Acerca do instalador %1 @@ -4132,20 +4127,17 @@ Saída: - - about - - - Back - - - calamares-sidebar - - Show debug information - Mostrar informes de depuración + + About + + + + + Debug + @@ -4482,26 +4474,21 @@ Saída: - About - - - - Support - + Known issues - + Release notes - + Donate diff --git a/lang/calamares_gu.ts b/lang/calamares_gu.ts index d166f6655..f793c18e9 100644 --- a/lang/calamares_gu.ts +++ b/lang/calamares_gu.ts @@ -156,7 +156,7 @@ - + Debug information @@ -501,12 +501,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer @@ -1451,7 +1451,7 @@ The installer will quit and all changes will be lost. - Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition. @@ -4008,61 +4008,56 @@ Output: - &About - - - - Open donations website - + &Donate - + Open help and support website - + &Support - + Open issues and bug-tracking website - + &Known issues - + Open release notes website - + &Release notes - + %1 support - + About %1 setup - + About %1 installer @@ -4127,19 +4122,16 @@ Output: - - about - - - Back - - - calamares-sidebar - - Show debug information + + About + + + + + Debug @@ -4477,26 +4469,21 @@ Output: - About - - - - Support - + Known issues - + Release notes - + Donate diff --git a/lang/calamares_he.ts b/lang/calamares_he.ts index 8d247a41b..e0a741b5b 100644 --- a/lang/calamares_he.ts +++ b/lang/calamares_he.ts @@ -156,7 +156,7 @@ עץ וידג׳טים - + Debug information מידע על ניפוי שגיאות @@ -511,12 +511,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program תכנית התקנת %1 - + %1 Installer אשף התקנת %1 @@ -1461,7 +1461,7 @@ The installer will quit and all changes will be lost. - Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition. לא ניתן לפענח את המחיצה %1 עם מילת הצופן שסופקה.<br/><br/>יש לערוך את המחיצה שוב ולספק את מילת הצופן הנכונה או למחוק וליצור מחיצה מוצפנת חדשה. @@ -4044,61 +4044,56 @@ Output: - &About - על &אודות - - - Open donations website פתיחת אתר התרומות - + &Donate &תרומה - + Open help and support website פתיחת אתר העזרה והתמיכה - + &Support &תמיכה - + Open issues and bug-tracking website פתיחת אתר התקלות והמעקב אחר באגים - + &Known issues &בעיות נפוצות - + Open release notes website פתיחת האתר עם הערות המהדורה - + &Release notes ה&ערות מהדורה - + %1 support תמיכה ב־%1 - + About %1 setup על אודות התקנת %1 - + About %1 installer על אודות התקנת %1 @@ -4163,20 +4158,17 @@ Output: הפלט היה: - - about - - - Back - חזרה - - calamares-sidebar - - Show debug information - הצגת מידע ניפוי שגיאות + + About + על אודות + + + + Debug + ניפוי שגיאות @@ -4541,26 +4533,21 @@ Output: - About - על אודות - - - Support תמיכה - + Known issues בעיות נפוצות - + Release notes הערות מהדורה - + Donate תרומה diff --git a/lang/calamares_hi.ts b/lang/calamares_hi.ts index ebe9d431d..2e61ae443 100644 --- a/lang/calamares_hi.ts +++ b/lang/calamares_hi.ts @@ -156,7 +156,7 @@ विजेट ट्री - + Debug information डीबग संबंधी जानकारी @@ -507,12 +507,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program %1 सेटअप प्रोग्राम - + %1 Installer %1 इंस्टॉलर @@ -1457,7 +1457,7 @@ The installer will quit and all changes will be lost. - Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition. @@ -4022,61 +4022,56 @@ Output: - &About - बारे में (&A) - - - Open donations website दान हेतु वेबसाइट खोलें - + &Donate दान करें (&D) - + Open help and support website सहायता हेतु वेबसाइट खोलें - + &Support सहायता (&S) - + Open issues and bug-tracking website समस्या व त्रुति निगरानी की वेबसाइट खोलें - + &Known issues ज्ञात समस्याएँ (&K) - + Open release notes website प्रकाशन नोट्स हेतु वेबसाइट खोलें - + &Release notes रिलीज़ नोट्स (&R) - + %1 support %1 सहायता - + About %1 setup %1 सेटअप के बारे में - + About %1 installer %1 इंस्टॉलर के बारे में @@ -4141,20 +4136,17 @@ Output: यह आउटपुट था : - - about - - - Back - वापस - - calamares-sidebar - - Show debug information - डीबग संबंधी जानकारी दिखाएँ + + About + बारे में + + + + Debug + @@ -4519,26 +4511,21 @@ Output: - About - बारे में - - - Support सहायता - + Known issues ज्ञात समस्याएँ - + Release notes रिलीज़ नोट्स - + Donate दान करें diff --git a/lang/calamares_hr.ts b/lang/calamares_hr.ts index 8a9ae8d55..905f95d15 100644 --- a/lang/calamares_hr.ts +++ b/lang/calamares_hr.ts @@ -6,18 +6,18 @@ <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> - + <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/> Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - + Hvala <a href="https://calamares.io/team/">Calamares timu</a> i <a href="https://www.transifex.com/calamares/calamares/">Calamares timu za prevođenje</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> sponzorira<br/><a href="http://www.blue-systems.com/"> Blue Systems</a> - Liberating Software. Copyright %1-%2 %3 &lt;%4&gt;<br/> Copyright year-year Name <email-address> - + Copyright %1-%2 %3 &lt;%4&gt;<br/> @@ -156,7 +156,7 @@ Stablo widgeta - + Debug information Debug informacija @@ -509,12 +509,12 @@ Instalacijski program će izaći i sve promjene će biti izgubljene. CalamaresWindow - + %1 Setup Program %1 instalacijski program - + %1 Installer %1 Instalacijski program @@ -1455,12 +1455,12 @@ Instalacijski program će izaći i sve promjene će biti izgubljene. Passphrase for existing partition - + Šifra za postojeću particiju - Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. - + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition. + Particija %1 nije se mogla dešifrirati s danom šifrom. <br/><br/>Ponovno uredite particiju i dajte ispravnu šifru ili izbrišite i kreirajte novu šifriranu particiju. @@ -4033,61 +4033,56 @@ Postavljanje se može nastaviti, ali neke će značajke možda biti onemogućene - &About - &O programu - - - Open donations website Otvorite web mjesto za donacije - + &Donate &Doniraj - + Open help and support website Otvorite web mjesto za pomoć i podršku - + &Support &Podrška - + Open issues and bug-tracking website Otvorene web mjesto za praćenje bugova i poteškoća - + &Known issues &Poznati problemi - + Open release notes website Otvorite web mjesto s bilješkama izdanja - + &Release notes &Napomene o izdanju - + %1 support %1 podrška - + About %1 setup O %1 instalacijskom programu - + About %1 installer O %1 instalacijskom programu @@ -4152,20 +4147,17 @@ Postavljanje se može nastaviti, ali neke će značajke možda biti onemogućene Izlaz je bio: - - about - - - Back - Natrag - - calamares-sidebar - - Show debug information - Prikaži debug informaciju + + About + O programu + + + + Debug + Uklanjanje grešaka @@ -4529,26 +4521,21 @@ Postavke regije utječu na format brojeva i datuma. Trenutne postavke su <str - About - O programu - - - Support Podrška - + Known issues Poznati problemi - + Release notes Bilješke o izdanju - + Donate Doniraj diff --git a/lang/calamares_hu.ts b/lang/calamares_hu.ts index 833b47e04..835df7d78 100644 --- a/lang/calamares_hu.ts +++ b/lang/calamares_hu.ts @@ -156,7 +156,7 @@ Modul- fa - + Debug information Hibakeresési információk @@ -503,12 +503,12 @@ Minden változtatás elveszik, ha kilépsz a telepítőből. CalamaresWindow - + %1 Setup Program %1 Program telepítése - + %1 Installer %1 Telepítő @@ -1454,7 +1454,7 @@ Telepítés nem folytatható. <a href="#details">Részletek...</a> - Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition. @@ -4015,61 +4015,56 @@ Calamares hiba %1. - &About - &Névjegy - - - Open donations website - + &Donate - + Open help and support website - + &Support &Támogatás - + Open issues and bug-tracking website - + &Known issues &Ismert hibák - + Open release notes website - + &Release notes &Kiadási megjegyzések - + %1 support %1 támogatás - + About %1 setup A %1 telepítőről. - + About %1 installer A %1 telepítőről @@ -4134,20 +4129,17 @@ Calamares hiba %1. - - about - - - Back - - - calamares-sidebar - - Show debug information - Hibakeresési információk mutatása + + About + + + + + Debug + Hibakeresés @@ -4484,26 +4476,21 @@ Calamares hiba %1. - About - - - - Support - + Known issues - + Release notes - + Donate diff --git a/lang/calamares_id.ts b/lang/calamares_id.ts index 0deba5826..676de374e 100644 --- a/lang/calamares_id.ts +++ b/lang/calamares_id.ts @@ -156,7 +156,7 @@ - + Debug information Informasi debug @@ -500,12 +500,12 @@ Instalasi akan ditutup dan semua perubahan akan hilang. CalamaresWindow - + %1 Setup Program - + %1 Installer Installer %1 @@ -1451,7 +1451,7 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan. - Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition. @@ -4002,61 +4002,56 @@ Keluaran: - &About - &Tentang - - - Open donations website - + &Donate - + Open help and support website - + &Support &Dukungan - + Open issues and bug-tracking website - + &Known issues &Isu-isu yang diketahui - + Open release notes website - + &Release notes &Catatan rilis - + %1 support Dukungan %1 - + About %1 setup - + About %1 installer Tentang installer %1 @@ -4121,20 +4116,17 @@ Keluaran: - - about - - - Back - - - calamares-sidebar - - Show debug information - Tampilkan informasi debug + + About + + + + + Debug + Debug @@ -4471,26 +4463,21 @@ Keluaran: - About - - - - Support - + Known issues - + Release notes - + Donate diff --git a/lang/calamares_ie.ts b/lang/calamares_ie.ts index 161f152d7..b7d08ce7e 100644 --- a/lang/calamares_ie.ts +++ b/lang/calamares_ie.ts @@ -156,7 +156,7 @@ - + Debug information @@ -501,12 +501,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program Configiration de %1 - + %1 Installer Installator de %1 @@ -1451,7 +1451,7 @@ The installer will quit and all changes will be lost. - Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition. @@ -4008,61 +4008,56 @@ Output: - &About - &Pri - - - Open donations website Aperter li website por donationes - + &Donate &Donar - + Open help and support website Aperter li website de auxilie e suporte - + &Support &Suporte - + Open issues and bug-tracking website Aperter li website de control de defectes - + &Known issues &Conosset problemas - + Open release notes website Aperter li website con notes por ti-ci version - + &Release notes &Notes del version - + %1 support Suporte de %1 - + About %1 setup Pri li configurator de %1 - + About %1 installer Pri li installator de %1 @@ -4127,19 +4122,16 @@ Output: - - about - - - Back - Retro - - calamares-sidebar - - Show debug information + + About + Pri + + + + Debug @@ -4477,26 +4469,21 @@ Output: - About - Pri - - - Support Suporte - + Known issues Conosset problemas - + Release notes Notes del version - + Donate Donar diff --git a/lang/calamares_is.ts b/lang/calamares_is.ts index 1686617a9..451cb1a04 100644 --- a/lang/calamares_is.ts +++ b/lang/calamares_is.ts @@ -156,7 +156,7 @@ Greinar viðmótshluta - + Debug information Villuleitarupplýsingar @@ -502,12 +502,12 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. CalamaresWindow - + %1 Setup Program - + %1 Installer %1 uppsetningarforrit @@ -1452,7 +1452,7 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. - Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition. @@ -4009,61 +4009,56 @@ Output: - &About - &Um - - - Open donations website - + &Donate Styr&kja - + Open help and support website - + &Support &Stuðningur - + Open issues and bug-tracking website - + &Known issues &Þekktir gallar - + Open release notes website Opna vefsvæði með upplýsingum um útgáfuna - + &Release notes &Um útgáfu - + %1 support %1 stuðningur - + About %1 setup Um %1 uppsetninguna - + About %1 installer Um %1 uppsetningarforrrit @@ -4128,20 +4123,17 @@ Output: - - about - - - Back - - - calamares-sidebar - - Show debug information - Birta villuleitarupplýsingar + + About + + + + + Debug + @@ -4478,26 +4470,21 @@ Output: - About - - - - Support - + Known issues - + Release notes - + Donate diff --git a/lang/calamares_it_IT.ts b/lang/calamares_it_IT.ts index e6aa3f65c..f49e78b43 100644 --- a/lang/calamares_it_IT.ts +++ b/lang/calamares_it_IT.ts @@ -11,7 +11,7 @@ Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - + Grazie al <a href="https://calamares.io/team/">team di Calamares</a> e ai <a href="https://www.transifex.com/calamares/calamares/">traduttori di Calamares</a>.<br/><br/><a href="https://calamares.io/">Lo sviluppo di Calamares</a>e' sponsorizzato da<br/><a href="http://www.blue-systems.com/">Blue Systems e </a>Liberating Software @@ -156,7 +156,7 @@ Albero dei Widget - + Debug information Informazioni di debug @@ -504,12 +504,12 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse CalamaresWindow - + %1 Setup Program %1 Programma d'installazione - + %1 Installer %1 Programma di installazione @@ -1454,7 +1454,7 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse - Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition. @@ -4023,61 +4023,56 @@ Output: - &About - &Informazioni su - - - Open donations website Apri il sito web per le donazioni - + &Donate &Donazioni - + Open help and support website Apri il sito web per l'aiuto ed il supporto - + &Support &Supporto - + Open issues and bug-tracking website Apri il sito per la gestione di problemi e bug - + &Known issues &Problemi conosciuti - + Open release notes website Apri il sito web delle note di rilascio - + &Release notes &Note di rilascio - + %1 support supporto %1 - + About %1 setup Informazioni sul sistema di configurazione %1 - + About %1 installer Informazioni sul programma di installazione %1 @@ -4142,20 +4137,17 @@ Output: - - about - - - Back - Indietro - - calamares-sidebar - - Show debug information - Mostra le informazioni di debug + + About + Informazioni su + + + + Debug + Debug @@ -4514,26 +4506,21 @@ Output: - About - Informazioni su - - - Support Supporto - + Known issues Problemi conosciuti - + Release notes Note di rilascio - + Donate Donazioni diff --git a/lang/calamares_ja-Hira.ts b/lang/calamares_ja-Hira.ts index 10dd88794..50326192b 100644 --- a/lang/calamares_ja-Hira.ts +++ b/lang/calamares_ja-Hira.ts @@ -156,7 +156,7 @@ - + Debug information @@ -499,12 +499,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer @@ -1449,7 +1449,7 @@ The installer will quit and all changes will be lost. - Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition. @@ -3997,61 +3997,56 @@ Output: - &About - - - - Open donations website - + &Donate - + Open help and support website - + &Support - + Open issues and bug-tracking website - + &Known issues - + Open release notes website - + &Release notes - + %1 support - + About %1 setup - + About %1 installer @@ -4116,19 +4111,16 @@ Output: - - about - - - Back - - - calamares-sidebar - - Show debug information + + About + + + + + Debug @@ -4466,26 +4458,21 @@ Output: - About - - - - Support - + Known issues - + Release notes - + Donate diff --git a/lang/calamares_ja.ts b/lang/calamares_ja.ts index 375fe8834..21034d5f0 100644 --- a/lang/calamares_ja.ts +++ b/lang/calamares_ja.ts @@ -6,18 +6,18 @@ <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> - + <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - + <a href="https://calamares.io/team/">Calamares チーム</a>と <a href="https://www.transifex.com/calamares/calamares/">Calamares 翻訳チーム</a>に感謝します。 <br/><br/><a href="https://calamares.io/">Calamares</a> の開発は、<br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software が後援しています。 Copyright %1-%2 %3 &lt;%4&gt;<br/> Copyright year-year Name <email-address> - + Copyright %1-%2 %3 &lt;%4&gt;<br/> @@ -156,7 +156,7 @@ ウィジェットツリー - + Debug information デバッグ情報 @@ -505,12 +505,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program %1 セットアッププログラム - + %1 Installer %1 インストーラー @@ -1452,12 +1452,12 @@ The installer will quit and all changes will be lost. Passphrase for existing partition - + 既存のパーティションのパスフレーズ - Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. - + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition. + 指定したパスフレーズでパーティション %1 を復号化できませんでした。<br/><br/>パーティションを再度編集して正しいパスフレーズを指定するか、削除して新しい暗号化パーティションを作成してください。 @@ -4013,61 +4013,56 @@ Output: - &About - 説明 (&A) - - - Open donations website 寄付サイトを開く - + &Donate 寄付する(&D) - + Open help and support website サポートサイトを開く - + &Support サポート (&S) - + Open issues and bug-tracking website issue 及び bug-track のサイトを開く - + &Known issues 既知の問題 (&K) - + Open release notes website リリースノートのウェブサイトを開く - + &Release notes リリースノート (&R) - + %1 support %1 サポート - + About %1 setup %1 セットアップについて - + About %1 installer %1 インストーラーについて @@ -4132,20 +4127,17 @@ Output: 出力は次のとおり: - - about - - - Back - 戻る - - calamares-sidebar - - Show debug information - デバッグ情報を表示 + + About + About + + + + Debug + デバッグ @@ -4510,26 +4502,21 @@ Output: - About - About - - - Support サポート - + Known issues 既知の問題点 - + Release notes リリースノート - + Donate 寄付 diff --git a/lang/calamares_kk.ts b/lang/calamares_kk.ts index 703fd73ab..31382cb8e 100644 --- a/lang/calamares_kk.ts +++ b/lang/calamares_kk.ts @@ -156,7 +156,7 @@ - + Debug information Жөндеу ақпараты @@ -501,12 +501,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer @@ -1451,7 +1451,7 @@ The installer will quit and all changes will be lost. - Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition. @@ -4008,61 +4008,56 @@ Output: - &About - - - - Open donations website - + &Donate - + Open help and support website - + &Support - + Open issues and bug-tracking website - + &Known issues - + Open release notes website - + &Release notes - + %1 support %1 қолдауы - + About %1 setup - + About %1 installer @@ -4127,19 +4122,16 @@ Output: - - about - - - Back - - - calamares-sidebar - - Show debug information + + About + + + + + Debug @@ -4477,26 +4469,21 @@ Output: - About - - - - Support - + Known issues - + Release notes - + Donate diff --git a/lang/calamares_kn.ts b/lang/calamares_kn.ts index 68c4b64c9..0e2621e89 100644 --- a/lang/calamares_kn.ts +++ b/lang/calamares_kn.ts @@ -156,7 +156,7 @@ - + Debug information @@ -501,12 +501,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer @@ -1451,7 +1451,7 @@ The installer will quit and all changes will be lost. - Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition. @@ -4008,61 +4008,56 @@ Output: - &About - - - - Open donations website - + &Donate - + Open help and support website - + &Support - + Open issues and bug-tracking website - + &Known issues - + Open release notes website - + &Release notes - + %1 support - + About %1 setup - + About %1 installer @@ -4127,19 +4122,16 @@ Output: - - about - - - Back - - - calamares-sidebar - - Show debug information + + About + + + + + Debug @@ -4477,26 +4469,21 @@ Output: - About - - - - Support - + Known issues - + Release notes - + Donate diff --git a/lang/calamares_ko.ts b/lang/calamares_ko.ts index d042111ed..1c341d941 100644 --- a/lang/calamares_ko.ts +++ b/lang/calamares_ko.ts @@ -6,18 +6,18 @@ <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> - + <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - + <a href="https://calamares.io/team/">Calamares 팀</a>과 <a href="https://www.transifex.com/calamares/calamares/">Calamares 번역팀</a>에게 감사드립니다.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. Copyright %1-%2 %3 &lt;%4&gt;<br/> Copyright year-year Name <email-address> - + Copyright %1-%2 %3 &lt;%4&gt;<br/> @@ -156,7 +156,7 @@ 위젯 트리 - + Debug information 디버그 정보 @@ -505,12 +505,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program %1 설치 프로그램 - + %1 Installer %1 설치 관리자 @@ -1451,12 +1451,12 @@ The installer will quit and all changes will be lost. Passphrase for existing partition - + 기존 파티션의 암호 구문 - Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. - + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition. + %1 파티션을 지정된 암호 구문으로 해독할 수 없습니다.<br/><br/>파티션을 다시 편집하고 올바른 암호를 지정하거나 암호화된 파티션을 삭제하고 새로 만듭니다. @@ -4011,61 +4011,56 @@ Output: - &About - 정보 (&A) - - - Open donations website 기부 웹 사이트열기 - + &Donate 기부(&D) - + Open help and support website 도움말 및 지원 웹 사이트 열기 - + &Support 지원 (&S) - + Open issues and bug-tracking website 문제 및 버그 추적 웹 사이트 열기 - + &Known issues 알려진 문제점 (&K) - + Open release notes website 릴리스 노트 웹 사이트 열기 - + &Release notes 출시 정보 (&R) - + %1 support %1 지원 - + About %1 setup %1 설치 정보 - + About %1 installer %1 설치 관리자에 대하여 @@ -4130,20 +4125,17 @@ Output: 출력은 다음과 같음: - - about - - - Back - 뒤로 - - calamares-sidebar - - Show debug information - 디버그 정보 보기 + + About + Calamares에 대하여 + + + + Debug + 디버그 @@ -4508,26 +4500,21 @@ Output: - About - Calamares에 대하여 - - - Support 지원 - + Known issues 알려진 이슈들 - + Release notes 릴리즈 노트 - + Donate 기부 diff --git a/lang/calamares_lo.ts b/lang/calamares_lo.ts index 87f090046..f50a5a36f 100644 --- a/lang/calamares_lo.ts +++ b/lang/calamares_lo.ts @@ -156,7 +156,7 @@ - + Debug information @@ -499,12 +499,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer @@ -1449,7 +1449,7 @@ The installer will quit and all changes will be lost. - Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition. @@ -3997,61 +3997,56 @@ Output: - &About - - - - Open donations website - + &Donate - + Open help and support website - + &Support - + Open issues and bug-tracking website - + &Known issues - + Open release notes website - + &Release notes - + %1 support - + About %1 setup - + About %1 installer @@ -4116,19 +4111,16 @@ Output: - - about - - - Back - - - calamares-sidebar - - Show debug information + + About + + + + + Debug @@ -4466,26 +4458,21 @@ Output: - About - - - - Support - + Known issues - + Release notes - + Donate diff --git a/lang/calamares_lt.ts b/lang/calamares_lt.ts index 57dc84476..b8f755783 100644 --- a/lang/calamares_lt.ts +++ b/lang/calamares_lt.ts @@ -156,7 +156,7 @@ Valdiklių medis - + Debug information Derinimo informacija @@ -511,12 +511,12 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. CalamaresWindow - + %1 Setup Program %1 sąrankos programa - + %1 Installer %1 diegimo programa @@ -1461,7 +1461,7 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. - Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition. Nepavyko iššifruoti %1 skaidinio, naudojant pateiktą slaptafrazę.<br/><br/>Taisykite skaidinį dar kartą ir nurodykite teisingą slaptafrazę arba ištrinkite šį ir sukurkite naują šifruotą skaidinį. @@ -4044,61 +4044,56 @@ Išvestis: - &About - &Apie - - - Open donations website Atverti paaukojimų internetinę svetainę - + &Donate &Paaukoti - + Open help and support website Atverti pagalbos ir palaikymo internetinę svetainę - + &Support &Palaikymas - + Open issues and bug-tracking website Atverti strigčių ir klaidų sekimo internetinę svetainę - + &Known issues Ž&inomos problemos - + Open release notes website Atverti laidos informacijos internetinę svetainę - + &Release notes Lai&dos informacija - + %1 support %1 palaikymas - + About %1 setup Apie %1 sąranką - + About %1 installer Apie %1 diegimo programą @@ -4163,20 +4158,17 @@ Išvestis: Išvestis buvo tokia: - - about - - - Back - Atgal - - calamares-sidebar - - Show debug information - Rodyti derinimo informaciją + + About + Apie + + + + Debug + Derinti @@ -4541,26 +4533,21 @@ Išvestis: - About - Apie - - - Support Palaikymas - + Known issues Žinomos problemos - + Release notes Laidos informacija - + Donate Paaukoti diff --git a/lang/calamares_lv.ts b/lang/calamares_lv.ts index 55606c4bc..d228e56bf 100644 --- a/lang/calamares_lv.ts +++ b/lang/calamares_lv.ts @@ -156,7 +156,7 @@ - + Debug information @@ -503,12 +503,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer @@ -1453,7 +1453,7 @@ The installer will quit and all changes will be lost. - Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition. @@ -4019,61 +4019,56 @@ Output: - &About - - - - Open donations website - + &Donate - + Open help and support website - + &Support - + Open issues and bug-tracking website - + &Known issues - + Open release notes website - + &Release notes - + %1 support - + About %1 setup - + About %1 installer @@ -4138,19 +4133,16 @@ Output: - - about - - - Back - - - calamares-sidebar - - Show debug information + + About + + + + + Debug @@ -4488,26 +4480,21 @@ Output: - About - - - - Support - + Known issues - + Release notes - + Donate diff --git a/lang/calamares_mk.ts b/lang/calamares_mk.ts index 30c0cfa27..1b304f41b 100644 --- a/lang/calamares_mk.ts +++ b/lang/calamares_mk.ts @@ -156,7 +156,7 @@ - + Debug information @@ -501,12 +501,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer @@ -1451,7 +1451,7 @@ The installer will quit and all changes will be lost. - Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition. @@ -4008,61 +4008,56 @@ Output: - &About - - - - Open donations website - + &Donate - + Open help and support website - + &Support - + Open issues and bug-tracking website - + &Known issues - + Open release notes website - + &Release notes - + %1 support - + About %1 setup - + About %1 installer @@ -4127,19 +4122,16 @@ Output: - - about - - - Back - - - calamares-sidebar - - Show debug information + + About + + + + + Debug @@ -4477,26 +4469,21 @@ Output: - About - - - - Support - + Known issues - + Release notes - + Donate diff --git a/lang/calamares_ml.ts b/lang/calamares_ml.ts index fbd5ba644..cab3a0840 100644 --- a/lang/calamares_ml.ts +++ b/lang/calamares_ml.ts @@ -156,7 +156,7 @@ വിഡ്ജറ്റ് ട്രീ - + Debug information ഡീബഗ് വിവരങ്ങൾ @@ -503,12 +503,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program %1 സജ്ജീകരണപ്രയോഗം - + %1 Installer %1 ഇൻസ്റ്റാളർ @@ -1453,7 +1453,7 @@ The installer will quit and all changes will be lost. - Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition. @@ -4013,61 +4013,56 @@ Output: - &About - വിവരം (&A) - - - Open donations website സംഭാവനകളുടെ വെബ്സൈറ്റ് തുറക്കുക - + &Donate &സംഭാവന ചെയ്യുക - + Open help and support website സഹായ പിന്തുണ വെബ്സൈറ്റ് തുറക്കുക - + &Support പിന്തുണ (&S) - + Open issues and bug-tracking website പ്രശനങ്ങൾ,ബഗ്ഗ്‌ ട്രാക്കിംഗ് വെബ്സൈറ്റ് തുറക്കുക - + &Known issues ഇതിനകം അറിയാവുന്ന പ്രശ്നങ്ങൾ (&K) - + Open release notes website പ്രകാശന കുറിപ്പുകളുടെ വെബ്സൈറ്റ് തുറക്കുക - + &Release notes പ്രകാശന കുറിപ്പുകൾ (&R) - + %1 support %1 പിന്തുണ - + About %1 setup %1 സജ്ജീകരണത്തെക്കുറിച്ച് - + About %1 installer %1 ഇൻസ്റ്റാളറിനെ കുറിച്ച് @@ -4132,20 +4127,17 @@ Output: - - about - - - Back - പുറകോട്ട് - - calamares-sidebar - - Show debug information - ഡീബഗ് വിവരങ്ങൾ കാണിക്കുക + + About + വിവരം + + + + Debug + @@ -4482,26 +4474,21 @@ Output: - About - വിവരം - - - Support സഹായം - + Known issues അറിയാവുന്ന പ്രശ്നങ്ങൾ - + Release notes പ്രകാശനക്കുറിപ്പുകൾ - + Donate സംഭാവന diff --git a/lang/calamares_mr.ts b/lang/calamares_mr.ts index 64ed5c815..fed837c18 100644 --- a/lang/calamares_mr.ts +++ b/lang/calamares_mr.ts @@ -156,7 +156,7 @@ - + Debug information दोषमार्जन माहिती @@ -501,12 +501,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer %1 अधिष्ठापक @@ -1451,7 +1451,7 @@ The installer will quit and all changes will be lost. - Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition. @@ -4008,61 +4008,56 @@ Output: - &About - &विषयी - - - Open donations website - + &Donate - + Open help and support website - + &Support %1 पाठबळ - + Open issues and bug-tracking website - + &Known issues &ज्ञात त्रुटी - + Open release notes website - + &Release notes &प्रकाशन टिपा - + %1 support %1 पाठबळ - + About %1 setup - + About %1 installer %1 अधिष्ठापक बद्दल @@ -4127,20 +4122,17 @@ Output: - - about - - - Back - - - calamares-sidebar - - Show debug information - दोषमार्जन माहिती दर्शवा + + About + + + + + Debug + @@ -4477,26 +4469,21 @@ Output: - About - - - - Support - + Known issues - + Release notes - + Donate diff --git a/lang/calamares_nb.ts b/lang/calamares_nb.ts index d63580e9f..cf9f7cc20 100644 --- a/lang/calamares_nb.ts +++ b/lang/calamares_nb.ts @@ -156,7 +156,7 @@ - + Debug information Debug informasjon @@ -502,12 +502,12 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt. CalamaresWindow - + %1 Setup Program - + %1 Installer %1 Installasjonsprogram @@ -1452,7 +1452,7 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt. - Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition. @@ -4009,61 +4009,56 @@ Output: - &About - &Om - - - Open donations website - + &Donate - + Open help and support website - + &Support - + Open issues and bug-tracking website - + &Known issues - + Open release notes website - + &Release notes - + %1 support - + About %1 setup - + About %1 installer @@ -4128,20 +4123,17 @@ Output: - - about - - - Back - - - calamares-sidebar - - Show debug information - Vis feilrettingsinformasjon + + About + + + + + Debug + Debug @@ -4478,26 +4470,21 @@ Output: - About - - - - Support - + Known issues - + Release notes - + Donate diff --git a/lang/calamares_ne_NP.ts b/lang/calamares_ne_NP.ts index 0a1f2cf22..8eb7baa10 100644 --- a/lang/calamares_ne_NP.ts +++ b/lang/calamares_ne_NP.ts @@ -156,7 +156,7 @@ - + Debug information @@ -501,12 +501,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer @@ -1451,7 +1451,7 @@ The installer will quit and all changes will be lost. - Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition. @@ -4008,61 +4008,56 @@ Output: - &About - - - - Open donations website - + &Donate - + Open help and support website - + &Support - + Open issues and bug-tracking website - + &Known issues - + Open release notes website - + &Release notes - + %1 support - + About %1 setup - + About %1 installer @@ -4127,19 +4122,16 @@ Output: - - about - - - Back - - - calamares-sidebar - - Show debug information + + About + + + + + Debug @@ -4477,26 +4469,21 @@ Output: - About - - - - Support - + Known issues - + Release notes - + Donate diff --git a/lang/calamares_nl.ts b/lang/calamares_nl.ts index c8f46aa1d..0b3307ab1 100644 --- a/lang/calamares_nl.ts +++ b/lang/calamares_nl.ts @@ -156,7 +156,7 @@ Widget-boom - + Debug information Debug informatie @@ -507,12 +507,12 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. CalamaresWindow - + %1 Setup Program %1 Voorbereidingsprogramma - + %1 Installer %1 Installatieprogramma @@ -1457,7 +1457,7 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. - Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition. @@ -4018,61 +4018,56 @@ De installatie kan niet doorgaan. - &About - &Over - - - Open donations website Open donatiewebsite - + &Donate &Doneren - + Open help and support website Open help en ondersteuningswebsite. - + &Support Onder&steuning - + Open issues and bug-tracking website Open problemen en bug-tracking website. - + &Known issues Be&kende problemen - + Open release notes website Open release-opmerkingen website. - + &Release notes Aantekeningen bij deze ve&rsie - + %1 support %1 ondersteuning - + About %1 setup Over %1 installatieprogramma. - + About %1 installer Over het %1 installatieprogramma @@ -4137,20 +4132,17 @@ De installatie kan niet doorgaan. - - about - - - Back - Terug - - calamares-sidebar - - Show debug information - Toon debug informatie + + About + Over + + + + Debug + Fouten opsporen @@ -4512,26 +4504,21 @@ De systeemstijdinstellingen beïnvloeden de cijfer- en datumsformaat. De huidige - About - Over - - - Support Ondersteuning - + Known issues Bekende problemen - + Release notes Aantekeningen bij deze versie - + Donate Doneren diff --git a/lang/calamares_oc.ts b/lang/calamares_oc.ts index 4e9e88152..2c5815cee 100644 --- a/lang/calamares_oc.ts +++ b/lang/calamares_oc.ts @@ -156,7 +156,7 @@ - + Debug information Informacions de desbugatge @@ -501,12 +501,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer Installador de %1 @@ -1451,7 +1451,7 @@ The installer will quit and all changes will be lost. - Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition. @@ -4008,61 +4008,56 @@ Output: - &About - &A prepaus - - - Open donations website - + &Donate &Donar - + Open help and support website - + &Support &Assisténcia - + Open issues and bug-tracking website - + &Known issues &Problèmas coneguts - + Open release notes website - + &Release notes - + %1 support Assisténcia %1 - + About %1 setup - + About %1 installer @@ -4127,20 +4122,17 @@ Output: - - about - - - Back - Tornar - - calamares-sidebar - - Show debug information - Afichar las informacions de desbugatge + + About + A prepaus + + + + Debug + @@ -4478,26 +4470,21 @@ Output: - About - A prepaus - - - Support Assisténcia - + Known issues Problèmas coneguts - + Release notes - + Donate Donar diff --git a/lang/calamares_pl.ts b/lang/calamares_pl.ts index f64b13de8..2441b16fc 100644 --- a/lang/calamares_pl.ts +++ b/lang/calamares_pl.ts @@ -156,7 +156,7 @@ - + Debug information Informacje debugowania @@ -506,12 +506,12 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone. CalamaresWindow - + %1 Setup Program - + %1 Installer Instalator %1 @@ -1456,7 +1456,7 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone. - Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition. @@ -4035,61 +4035,56 @@ i nie uruchomi się - &About - &Informacje - - - Open donations website - + &Donate - + Open help and support website - + &Support &Wsparcie - + Open issues and bug-tracking website - + &Known issues &Znane problemy - + Open release notes website - + &Release notes Informacje o &wydaniu - + %1 support Wsparcie %1 - + About %1 setup - + About %1 installer O instalatorze %1 @@ -4154,20 +4149,17 @@ i nie uruchomi się - - about - - - Back - Wstecz - - calamares-sidebar - - Show debug information - Pokaż informacje debugowania + + About + O nas + + + + Debug + Debug @@ -4505,26 +4497,21 @@ i nie uruchomi się - About - O nas - - - Support Wsparcie - + Known issues Znane problemy - + Release notes Informacje o wydaniu - + Donate Dotacje diff --git a/lang/calamares_pt_BR.ts b/lang/calamares_pt_BR.ts index 779bf20fb..14a8b197c 100644 --- a/lang/calamares_pt_BR.ts +++ b/lang/calamares_pt_BR.ts @@ -6,18 +6,18 @@ <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> - + <h1>%1</h1><br/><strong>%2<br/> para %3</strong><br/><br/> Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - + Obrigado ao <a href="https://calamares.io/team/">time Calamares</a> e ao <a href="https://www.transifex.com/calamares/calamares/">time de tradutores do Calamares</a>.<br/><br/>O desenvolvimento do <a href="https://calamares.io/">Calamares</a> é patrocinado por <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. Copyright %1-%2 %3 &lt;%4&gt;<br/> Copyright year-year Name <email-address> - + Direitos Autorais %1-%2 %3 &lt;%4&gt;<br/> @@ -156,7 +156,7 @@ Árvore de widgets - + Debug information Informações de depuração @@ -509,12 +509,12 @@ O instalador será fechado e todas as alterações serão perdidas. CalamaresWindow - + %1 Setup Program Programa de configuração %1 - + %1 Installer Instalador %1 @@ -1455,12 +1455,12 @@ O instalador será fechado e todas as alterações serão perdidas. Passphrase for existing partition - + Frase-chave para partição existente - Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. - + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition. + A partição %1 não pôde ser descriptografada com a frase-chave fornecida.<br/><br/>Edite a partição novamente e forneça a frase-chave correta ou a exclua e crie uma nova partição criptografada. @@ -4033,61 +4033,56 @@ Saída: - &About - &Sobre - - - Open donations website Abrir website de doações - + &Donate &Doar - + Open help and support website Abrir website de ajuda e suporte - + &Support &Suporte - + Open issues and bug-tracking website Abrir website de problemas e rastreamento de bugs - + &Known issues &Problemas conhecidos - + Open release notes website Abrir website com as notas de lançamento - + &Release notes &Notas de lançamento - + %1 support %1 suporte - + About %1 setup Sobre a configuração de %1 - + About %1 installer Sobre o instalador %1 @@ -4152,20 +4147,17 @@ Saída: O resultado foi: - - about - - - Back - Voltar - - calamares-sidebar - - Show debug information - Exibir informações de depuração + + About + Sobre + + + + Debug + Depuração @@ -4530,26 +4522,21 @@ Saída: - About - Sobre - - - Support Suporte - + Known issues Problemas conhecidos - + Release notes Notas de lançamento - + Donate Faça uma doação diff --git a/lang/calamares_pt_PT.ts b/lang/calamares_pt_PT.ts index 7c50a375a..7556313b9 100644 --- a/lang/calamares_pt_PT.ts +++ b/lang/calamares_pt_PT.ts @@ -156,7 +156,7 @@ Árvore de Widgets - + Debug information Informação de depuração @@ -509,12 +509,12 @@ O instalador será encerrado e todas as alterações serão perdidas. CalamaresWindow - + %1 Setup Program %1 Programa de Instalação - + %1 Installer %1 Instalador @@ -1459,8 +1459,8 @@ O instalador será encerrado e todas as alterações serão perdidas. - Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. - Não foi possível desencriptar a partição %1 com a frase-chave introduzida. Edite novamente a partição e introduza a frase-chave correta ou elimine e crie uma nova partição encriptada. + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition. + Não foi possível desencriptar a partição %1 com a frase-chave introduzida.<br/><br/>Edite novamente a partição e introduza a frase-chave correta ou elimine e crie uma nova partição encriptada. @@ -4033,61 +4033,56 @@ Saída de Dados: - &About - &Acerca - - - Open donations website Abrir site de doações - + &Donate &Doar - + Open help and support website Abra o site de ajuda e suporte - + &Support &Suporte - + Open issues and bug-tracking website Site de questões abertas e monitorização de erros - + &Known issues &Problemas conhecidos - + Open release notes website Abrir o site com as notas de lançamento - + &Release notes &Notas de lançamento - + %1 support Suporte do %1 - + About %1 setup Sobre a instalação de %1 - + About %1 installer Acerca do instalador %1 @@ -4152,20 +4147,17 @@ Saída de Dados: O resultado foi: - - about - - - Back - Voltar - - calamares-sidebar - - Show debug information - Mostrar informação de depuração + + About + Sobre + + + + Debug + Depuração @@ -4530,26 +4522,21 @@ Saída de Dados: - About - Sobre - - - Support Suporte - + Known issues Problemas conhecidos - + Release notes Notas de lançamento - + Donate Doar diff --git a/lang/calamares_ro.ts b/lang/calamares_ro.ts index a7584e3ab..a5d15bdf2 100644 --- a/lang/calamares_ro.ts +++ b/lang/calamares_ro.ts @@ -156,7 +156,7 @@ Arborele de widget - + Debug information Informație pentru depanare @@ -504,12 +504,12 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute. CalamaresWindow - + %1 Setup Program - + %1 Installer Program de instalare %1 @@ -1454,7 +1454,7 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute. - Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition. @@ -4026,61 +4026,56 @@ Output - &About - &Despre - - - Open donations website - + &Donate - + Open help and support website - + &Support &Suport - + Open issues and bug-tracking website - + &Known issues &Probleme cunoscute - + Open release notes website - + &Release notes &Note asupra ediției - + %1 support %1 suport - + About %1 setup - + About %1 installer Despre programul de instalare %1 @@ -4145,20 +4140,17 @@ Output - - about - - - Back - - - calamares-sidebar - - Show debug information - Arată informația de depanare + + About + + + + + Debug + Depanare @@ -4495,26 +4487,21 @@ Output - About - - - - Support - + Known issues - + Release notes - + Donate diff --git a/lang/calamares_ru.ts b/lang/calamares_ru.ts index a17bc4b8b..a5b16898b 100644 --- a/lang/calamares_ru.ts +++ b/lang/calamares_ru.ts @@ -156,7 +156,7 @@ Дерево виджетов - + Debug information Отладочная информация @@ -171,7 +171,7 @@ Install - Установить + Установка @@ -286,7 +286,7 @@ Ожидание %n модуля. Ожидание %n модулей. Ожидание %n модулей. - Ожидание %n модуля(модулей). + Ожидание %n модуля (модулей). @@ -510,12 +510,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program Программа установки %1 - + %1 Installer Программа установки %1 @@ -876,12 +876,12 @@ The installer will quit and all changes will be lost. <h1>Welcome to the Calamares installer for %1</h1> - <h1>Добро пожаловать в программу установки Calamares для %1 .</h1> + <h1>Добро пожаловать в программу установки Calamares для %1</h1> <h1>Welcome to the %1 installer</h1> - <h1>Добро пожаловать в программу установки %1 .</h1> + <h1>Добро пожаловать в программу установки %1</h1> @@ -1460,7 +1460,7 @@ The installer will quit and all changes will be lost. - Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition. @@ -1474,7 +1474,7 @@ The installer will quit and all changes will be lost. En&crypt system - Система &шифрования + Настроить &шифрование @@ -1617,7 +1617,7 @@ The installer will quit and all changes will be lost. Finish - Завершить + Завершение @@ -1625,7 +1625,7 @@ The installer will quit and all changes will be lost. Finish - Завершить + Завершение @@ -1712,7 +1712,7 @@ The installer will quit and all changes will be lost. The installer is not running with administrator rights. - Программа установки не запущена с привилегиями администратора. + Программа установки запущена без прав администратора. @@ -2624,7 +2624,7 @@ The installer will quit and all changes will be lost. Type here to test your keyboard - Эта область - для тестирования клавиатуры + Протестируйте клавиатуру здесь @@ -4039,61 +4039,56 @@ Output: - &About - &О программе - - - Open donations website - + &Donate Пожертвовать - + Open help and support website Открыть сайт справки и поддержки - + &Support П&оддержка - + Open issues and bug-tracking website Открыть сайт со списком известных проблем и отслеживанием ошибок - + &Known issues &Известные проблемы - + Open release notes website Открыть сайт с заметками о выпуске - + &Release notes &Примечания к выпуску - + %1 support %1 поддержка - + About %1 setup О установке %1 - + About %1 installer О программе установки %1 @@ -4158,20 +4153,17 @@ Output: Вывод: - - about - - - Back - Назад - - calamares-sidebar - - Show debug information - Показать отладочную информацию + + About + О Программе + + + + Debug + Отладка @@ -4268,7 +4260,7 @@ Output: Type here to test your keyboard - Эта область - для тестирования клавиатуры + Протестируйте клавиатуру здесь @@ -4510,26 +4502,21 @@ Output: - About - О Программе - - - Support Поддержка - + Known issues Известные проблемы - + Release notes Примечания к выпуску - + Donate Пожертвовать diff --git a/lang/calamares_si.ts b/lang/calamares_si.ts index 7f1505f70..067afae9a 100644 --- a/lang/calamares_si.ts +++ b/lang/calamares_si.ts @@ -156,7 +156,7 @@ විජට් ගස - + Debug information දෝශ නිරාකරණ තොරතුරු @@ -507,12 +507,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program %1 සැකසුම් වැඩසටහන - + %1 Installer %1 ස්ථාපකය @@ -1457,7 +1457,7 @@ The installer will quit and all changes will be lost. - Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition. @@ -4022,61 +4022,56 @@ Output: - &About - ගැන (&A) - - - Open donations website පරිත්‍යාග වෙබ් අඩවිය විවෘත කරන්න - + &Donate පරිත්‍යාග කරන්න (&D) - + Open help and support website උදව් සහ සහාය වෙබ් අඩවිය විවෘත කරන්න - + &Support සහාය (&S) - + Open issues and bug-tracking website ගැටළු සහ දෝෂ ලුහුබැඳීමේ වෙබ් අඩවිය විවෘත කරන්න - + &Known issues දන්නා ගැටළු (&K) - + Open release notes website නිකුතු සටහන් වෙබ් අඩවිය විවෘත කරන්න - + &Release notes නිකුත් කිරීමේ සටහන් (&R) - + %1 support %1 සහාය - + About %1 setup %1 පිහිටුවීම ගැන - + About %1 installer %1 ස්ථාපකය ගැන @@ -4141,20 +4136,17 @@ Output: ප්‍රතිදානය වූයේ: - - about - - - Back - ආපසු - - calamares-sidebar - - Show debug information - දෝශ නිරාකරණ තොරතුරු පෙන්වන්න + + About + ගැන + + + + Debug + @@ -4519,26 +4511,21 @@ Output: - About - ගැන - - - Support සහාය - + Known issues දන්නා ගැටළු - + Release notes නිකුත් කිරීමේ සටහන් - + Donate පරිත්‍යාග කරන්න diff --git a/lang/calamares_sk.ts b/lang/calamares_sk.ts index 50ff9d432..c11b2b050 100644 --- a/lang/calamares_sk.ts +++ b/lang/calamares_sk.ts @@ -156,7 +156,7 @@ Strom miniaplikácií - + Debug information Ladiace informácie @@ -507,12 +507,12 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. CalamaresWindow - + %1 Setup Program Inštalačný program distribúcie %1 - + %1 Installer Inštalátor distribúcie %1 @@ -1458,7 +1458,7 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. - Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition. @@ -4040,61 +4040,56 @@ Výstup: - &About - &O inštalátore - - - Open donations website Otvoriť webovú stránku s príspevkami - + &Donate &Prispieť - + Open help and support website Otvoriť webovú stránku s pomocou a podporou - + &Support Po&dpora - + Open issues and bug-tracking website Otvoriť webovú stránku s problémami a chybami - + &Known issues &Známe problémy - + Open release notes website Otvoriť webovú stránku s poznámkami k vydaniu - + &Release notes &Poznámky k vydaniu - + %1 support Podpora distribúcie %1 - + About %1 setup O inštalátore %1 - + About %1 installer O inštalátore %1 @@ -4159,20 +4154,17 @@ Výstup: Výstup bol: - - about - - - Back - Späť - - calamares-sidebar - - Show debug information - Zobraziť ladiace informácie + + About + O inštalátore + + + + Debug + Ladiť @@ -4516,26 +4508,21 @@ Výstup: - About - O inštalátore - - - Support Podpora - + Known issues Známe problémy - + Release notes Poznámky k vydaniu - + Donate Prispieť diff --git a/lang/calamares_sl.ts b/lang/calamares_sl.ts index ddc82adc1..3f4d2adb0 100644 --- a/lang/calamares_sl.ts +++ b/lang/calamares_sl.ts @@ -156,7 +156,7 @@ - + Debug information @@ -506,12 +506,12 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. CalamaresWindow - + %1 Setup Program - + %1 Installer %1 Namestilnik @@ -1456,7 +1456,7 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. - Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition. @@ -4031,61 +4031,56 @@ Output: - &About - - - - Open donations website - + &Donate - + Open help and support website - + &Support - + Open issues and bug-tracking website - + &Known issues - + Open release notes website - + &Release notes - + %1 support - + About %1 setup - + About %1 installer @@ -4150,21 +4145,18 @@ Output: - - about - - - Back - - - calamares-sidebar - - Show debug information + + About + + + Debug + Razhroščevanje + finishedq @@ -4500,26 +4492,21 @@ Output: - About - - - - Support - + Known issues - + Release notes - + Donate diff --git a/lang/calamares_sq.ts b/lang/calamares_sq.ts index 25d9c8f52..1c8ac3f47 100644 --- a/lang/calamares_sq.ts +++ b/lang/calamares_sq.ts @@ -156,7 +156,7 @@ Pemë Widget-esh - + Debug information Të dhëna diagnostikimi @@ -507,12 +507,12 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej. CalamaresWindow - + %1 Setup Program Programi i Rregullimit të %1 - + %1 Installer Instalues %1 @@ -1457,7 +1457,7 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej. - Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition. @@ -4020,61 +4020,56 @@ Përfundim: - &About - &Mbi - - - Open donations website Hap sajtin e dhurimeve - + &Donate &Dhuroni - + Open help and support website Hap sajtin e ndihmës dhe asistencës - + &Support &Asistencë - + Open issues and bug-tracking website Hap sajtin ndjekjes së problemeve dhe të metave - + &Known issues &Probleme të njohura - + Open release notes website Hapni sajtin e shënimeve mbi hedhjet në qarkullim - + &Release notes Shënime &versioni - + %1 support Asistencë %1 - + About %1 setup Mbi rregullimin e %1 - + About %1 installer Rreth instaluesit %1 @@ -4139,20 +4134,17 @@ Përfundim: Output-i qe: - - about - - - Back - Mbrapsht - - calamares-sidebar - - Show debug information - Shfaq të dhëna diagnostikimi + + About + Mbi + + + + Debug + @@ -4517,26 +4509,21 @@ Përfundim: - About - Mbi - - - Support Asistencë - + Known issues Probleme të njohura - + Release notes Shënime hedhjeje në qarkullim - + Donate Dhuroni diff --git a/lang/calamares_sr.ts b/lang/calamares_sr.ts index dcbfdbba8..f81e621f3 100644 --- a/lang/calamares_sr.ts +++ b/lang/calamares_sr.ts @@ -156,7 +156,7 @@ - + Debug information @@ -504,12 +504,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer %1 инсталер @@ -1454,7 +1454,7 @@ The installer will quit and all changes will be lost. - Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition. @@ -4020,61 +4020,56 @@ Output: - &About - &О програму - - - Open donations website - + &Donate - + Open help and support website - + &Support По&дршка - + Open issues and bug-tracking website - + &Known issues &Познати проблеми - + Open release notes website - + &Release notes - + %1 support %1 подршка - + About %1 setup - + About %1 installer О %1 инсталатеру @@ -4139,21 +4134,18 @@ Output: - - about - - - Back - - - calamares-sidebar - - Show debug information + + About + + + Debug + Уклањање грешака + finishedq @@ -4489,26 +4481,21 @@ Output: - About - - - - Support - + Known issues - + Release notes - + Donate diff --git a/lang/calamares_sr@latin.ts b/lang/calamares_sr@latin.ts index 6c28b5c7f..d588941c1 100644 --- a/lang/calamares_sr@latin.ts +++ b/lang/calamares_sr@latin.ts @@ -156,7 +156,7 @@ - + Debug information @@ -504,12 +504,12 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. CalamaresWindow - + %1 Setup Program - + %1 Installer %1 Instaler @@ -1454,7 +1454,7 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. - Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition. @@ -4020,61 +4020,56 @@ Output: - &About - - - - Open donations website - + &Donate - + Open help and support website - + &Support - + Open issues and bug-tracking website - + &Known issues - + Open release notes website - + &Release notes - + %1 support - + About %1 setup - + About %1 installer @@ -4139,21 +4134,18 @@ Output: - - about - - - Back - - - calamares-sidebar - - Show debug information + + About + + + Debug + Otklanjanje greški + finishedq @@ -4489,26 +4481,21 @@ Output: - About - - - - Support - + Known issues - + Release notes - + Donate diff --git a/lang/calamares_sv.ts b/lang/calamares_sv.ts index 4ae4fdaac..181d2a5c0 100644 --- a/lang/calamares_sv.ts +++ b/lang/calamares_sv.ts @@ -156,7 +156,7 @@ Widgetträd - + Debug information Avlusningsinformation @@ -506,12 +506,12 @@ Alla ändringar kommer att gå förlorade. CalamaresWindow - + %1 Setup Program %1 Installationsprogram - + %1 Installer %1-installationsprogram @@ -1456,7 +1456,7 @@ Alla ändringar kommer att gå förlorade. - Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition. Partition %1 kunde inte dekrypteras med den angivna lösenfrasen. <br/><br/>Redigera partitionen igen och ange den korrekta lösenfrasen eller ta bort och skapa en ny krypterad partition @@ -4022,61 +4022,56 @@ Installationen kan inte fortsätta.</p> - &About - &Om - - - Open donations website Besök webbplatsen för donationer - + &Donate &Donera - + Open help and support website Besök webbplatsen för hjälp och support - + &Support &Support - + Open issues and bug-tracking website Besök webbplatsen för problem och felsökning - + &Known issues &Kända problem - + Open release notes website Besök webbplatsen för versionsinformation - + &Release notes Versionsinformation, &R - + %1 support %1-support - + About %1 setup Om inställningarna för %1 - + About %1 installer Om %1-installationsprogrammet @@ -4141,20 +4136,17 @@ Installationen kan inte fortsätta.</p> Utdatan var: - - about - - - Back - Bakåt - - calamares-sidebar - - Show debug information - Visa avlusningsinformation + + About + Om + + + + Debug + Avlusning @@ -4519,26 +4511,21 @@ Systems nationella inställningar påverkar nummer och datumformat. Den nuvarand - About - Om - - - Support Support - + Known issues Kända problem - + Release notes Versionsinformation - + Donate Donera diff --git a/lang/calamares_ta_IN.ts b/lang/calamares_ta_IN.ts index dbed543b6..0fd9c5d3d 100644 --- a/lang/calamares_ta_IN.ts +++ b/lang/calamares_ta_IN.ts @@ -156,7 +156,7 @@ - + Debug information @@ -501,12 +501,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer @@ -1451,7 +1451,7 @@ The installer will quit and all changes will be lost. - Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition. @@ -4008,61 +4008,56 @@ Output: - &About - - - - Open donations website - + &Donate - + Open help and support website - + &Support - + Open issues and bug-tracking website - + &Known issues - + Open release notes website - + &Release notes - + %1 support - + About %1 setup - + About %1 installer @@ -4127,19 +4122,16 @@ Output: - - about - - - Back - - - calamares-sidebar - - Show debug information + + About + + + + + Debug @@ -4477,26 +4469,21 @@ Output: - About - - - - Support - + Known issues - + Release notes - + Donate diff --git a/lang/calamares_te.ts b/lang/calamares_te.ts index e7ef871de..4b00ab355 100644 --- a/lang/calamares_te.ts +++ b/lang/calamares_te.ts @@ -158,7 +158,7 @@ automatic ఉంటుంది, మీరు మాన్యువల్ వి విడ్జెట్ ట్రీ - + Debug information డీబగ్ సమాచారం @@ -503,12 +503,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer @@ -1453,7 +1453,7 @@ The installer will quit and all changes will be lost. - Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition. @@ -4010,61 +4010,56 @@ Output: - &About - - - - Open donations website - + &Donate - + Open help and support website - + &Support - + Open issues and bug-tracking website - + &Known issues - + Open release notes website - + &Release notes - + %1 support - + About %1 setup - + About %1 installer @@ -4129,19 +4124,16 @@ Output: - - about - - - Back - - - calamares-sidebar - - Show debug information + + About + + + + + Debug @@ -4479,26 +4471,21 @@ Output: - About - - - - Support - + Known issues - + Release notes - + Donate diff --git a/lang/calamares_tg.ts b/lang/calamares_tg.ts index 39ba94067..404053a43 100644 --- a/lang/calamares_tg.ts +++ b/lang/calamares_tg.ts @@ -156,7 +156,7 @@ Дарахти виҷетҳо - + Debug information Иттилооти ислоҳи нуқсонҳо @@ -503,12 +503,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program Барномаи танзимкунии %1 - + %1 Installer Насбкунандаи %1 @@ -1453,7 +1453,7 @@ The installer will quit and all changes will be lost. - Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition. @@ -4018,61 +4018,56 @@ Output: - &About - &Дар бораи барнома - - - Open donations website Сомонаи саҳмгузориро кушоед - + &Donate &Саҳмгузорӣ - + Open help and support website Сомонаи кумак ва дастгириро кушоед - + &Support &Дастгирӣ - + Open issues and bug-tracking website Сомонаи масъалаҳо ва пайгирии нуқсонҳоро кушоед - + &Known issues &Масъалаҳои маълум - + Open release notes website Сомонаро бо қайдҳои нашр кушоед - + &Release notes &Қайдҳои нашр - + %1 support Дастгирии %1 - + About %1 setup Дар бораи танзими %1 - + About %1 installer Дар бораи насбкунандаи %1 @@ -4137,21 +4132,17 @@ Output: - - about - - - Back - Ба қафо - - calamares-sidebar - - Show debug information - Намоиши иттилооти -ислоҳи нуқсонҳо + + About + Дар бораи барнома + + + + Debug + @@ -4512,26 +4503,21 @@ Output: - About - Дар бораи барнома - - - Support Дастгирӣ - + Known issues Масъалаҳои маълум - + Release notes Қайдҳои нашр - + Donate Саҳмгузорӣ diff --git a/lang/calamares_th.ts b/lang/calamares_th.ts index 9cd94ae73..305b8b176 100644 --- a/lang/calamares_th.ts +++ b/lang/calamares_th.ts @@ -156,7 +156,7 @@ - + Debug information ข้อมูลดีบั๊ก @@ -500,12 +500,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer ตัวติดตั้ง %1 @@ -1450,7 +1450,7 @@ The installer will quit and all changes will be lost. - Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition. @@ -3998,61 +3998,56 @@ Output: - &About - &เกี่ยวกับ - - - Open donations website - + &Donate - + Open help and support website เปิดเว็บไซต์ช่วยเหลือและสนับสนุน - + &Support &S ช่วยเหลือ - + Open issues and bug-tracking website - + &Known issues &K ปัญหาที่รู้จัก - + Open release notes website - + &Release notes - + %1 support - + About %1 setup เกี่ยวกับตัวตั้งค่า %1 - + About %1 installer เกี่ยวกับตัวติดตั้ง %1 @@ -4117,20 +4112,17 @@ Output: - - about - - - Back - ย้อนกลับ - - calamares-sidebar - - Show debug information - แสดงข้อมูลการดีบั๊ก + + About + เกี่ยวกับ + + + + Debug + แก้ไขข้อบกพร่อง @@ -4467,26 +4459,21 @@ Output: - About - เกี่ยวกับ - - - Support - + Known issues - + Release notes - + Donate diff --git a/lang/calamares_tr_TR.ts b/lang/calamares_tr_TR.ts index c0acf127b..4024fa8c1 100644 --- a/lang/calamares_tr_TR.ts +++ b/lang/calamares_tr_TR.ts @@ -6,18 +6,18 @@ <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> - + <h1>%1</h1><br/><strong> %2 <br/> %3</strong> için <br/><br/> Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - + <a href="https://calamares.io/team/">Calamares takımına</a> ve <a href="https://www.transifex.com/calamares/calamares/">Calamares çeviri ekibine</a> teşekkürler. <br/><br/><a href="https://calamares.io/">Calamares</a> gelişim sponsoru <br/> <a href="http://www.blue-systems.com/">Blue Systems</a> - Özgür Yazılım Copyright %1-%2 %3 &lt;%4&gt;<br/> Copyright year-year Name <email-address> - + Telif hakkı %1-%2 %3 &lt;%4&gt;<br/> @@ -156,7 +156,7 @@ Gereç Ağacı - + Debug information Hata ayıklama bilgisi @@ -507,12 +507,12 @@ Yükleyiciden çıkınca tüm değişiklikler kaybedilecek. CalamaresWindow - + %1 Setup Program %1 Kurulum Uygulaması - + %1 Installer %1 Yükleniyor @@ -1456,12 +1456,12 @@ Kurulum devam edebilir fakat bazı özellikler devre dışı kalabilir. Passphrase for existing partition - + Mevcut bölüm için parola - Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. - + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition. + %1 bölümünün şifresi verilen parola ile çözülemedi. <br/><br/>Bölümü tekrar düzenleyin ve doğru parolayı girin veya silin ve yeni bir şifreli bölüm oluşturun. @@ -4027,61 +4027,56 @@ Output: - &About - &Hakkında - - - Open donations website Bağış web sitesini aç - + &Donate &Bağış - + Open help and support website Yardım ve destek web sitesini açın - + &Support &Destek - + Open issues and bug-tracking website Geri bildirim ve hata izleme web sitesi - + &Known issues &Bilinen hatalar - + Open release notes website Sürüm Notları web sitesini aç - + &Release notes &Sürüm notları - + %1 support %1 destek - + About %1 setup %1 kurulum hakkında - + About %1 installer %1 sistem yükleyici hakkında @@ -4146,20 +4141,17 @@ Output: Çıktı şuydu: - - about - - - Back - Geri - - calamares-sidebar - - Show debug information - Hata ayıklama bilgisini göster + + About + Hakkında + + + + Debug + Hata Ayıklama @@ -4524,26 +4516,21 @@ Output: - About - Hakkında - - - Support Destek - + Known issues Bilinen sorunlar - + Release notes Sürüm notları - + Donate Bağış diff --git a/lang/calamares_uk.ts b/lang/calamares_uk.ts index cadd05d67..fd6264aea 100644 --- a/lang/calamares_uk.ts +++ b/lang/calamares_uk.ts @@ -156,7 +156,7 @@ Дерево віджетів - + Debug information Діагностична інформація @@ -511,12 +511,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program Програма для налаштовування %1 - + %1 Installer Засіб встановлення %1 @@ -1461,7 +1461,7 @@ The installer will quit and all changes will be lost. - Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition. Розділ %1 не вдалося розшифрувати з використанням наданого пароля.<br/><br/>Виконайте редагування розділів ще раз і вкажіть правильний пароль або вилучіть розділ і створіть новий шифрований розділ. @@ -4045,61 +4045,56 @@ Output: - &About - &Про програму - - - Open donations website Відкрити сторінку сайта із посиланнями для фінансової підтримки - + &Donate Підтримати &фінансово - + Open help and support website Відкрити сторінку сайта із посиланнями на довідку та технічну підтримку - + &Support Під&тримка - + Open issues and bug-tracking website Відкрити сторінку сайта стеження за вадами у програмі - + &Known issues &Відомі проблеми - + Open release notes website Відкрити сторінку сайта із нотатками щодо випуску - + &Release notes При&мітки до випуску - + %1 support Підтримка %1 - + About %1 setup Про засіб налаштовування %1 - + About %1 installer Про засіб встановлення %1 @@ -4164,20 +4159,17 @@ Output: Виведені дані: - - about - - - Back - Назад - - calamares-sidebar - - Show debug information - Показати діагностичну інформацію + + About + Про програму + + + + Debug + Діагностика @@ -4542,26 +4534,21 @@ Output: - About - Про програму - - - Support Підтримка - + Known issues Відомі вади - + Release notes Нотатки щодо випуску - + Donate Підтримати фінансово diff --git a/lang/calamares_ur.ts b/lang/calamares_ur.ts index a93b89de5..d473add2a 100644 --- a/lang/calamares_ur.ts +++ b/lang/calamares_ur.ts @@ -156,7 +156,7 @@ - + Debug information @@ -501,12 +501,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer @@ -1451,7 +1451,7 @@ The installer will quit and all changes will be lost. - Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition. @@ -4008,61 +4008,56 @@ Output: - &About - - - - Open donations website - + &Donate - + Open help and support website - + &Support - + Open issues and bug-tracking website - + &Known issues - + Open release notes website - + &Release notes - + %1 support ٪ 1 سپورٹ - + About %1 setup تقریبا٪ 1 سیٹ اپ - + About %1 installer لگ بھگ٪ 1 انسٹال @@ -4127,19 +4122,16 @@ Output: - - about - - - Back - واپس - - calamares-sidebar - - Show debug information + + About + متعلق + + + + Debug @@ -4478,26 +4470,21 @@ Output: - About - متعلق - - - Support حمائیت - + Known issues معلوم مسائل - + Release notes جاری کردہ نوٹس - + Donate عطیہ diff --git a/lang/calamares_vi.ts b/lang/calamares_vi.ts index ec0ac362d..ff92501fc 100644 --- a/lang/calamares_vi.ts +++ b/lang/calamares_vi.ts @@ -156,7 +156,7 @@ Cây công cụ - + Debug information Thông tin gỡ lỗi @@ -501,12 +501,12 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.< CalamaresWindow - + %1 Setup Program %1 Thiết lập chương trình - + %1 Installer %1 cài đặt hệ điều hành @@ -1451,7 +1451,7 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.< - Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition. @@ -4007,61 +4007,56 @@ Output: - &About - &Giới thiệu - - - Open donations website Mở trang web ủng hộ - + &Donate Ủng &hộ - + Open help and support website Mở trang web trợ giúp - + &Support &Hỗ trợ - + Open issues and bug-tracking website Mở trang web theo dõi lỗi và vấn đề - + &Known issues &Vấn đề đã biết - + Open release notes website Mở trang web ghi chú phát hành - + &Release notes &Ghi chú phát hành - + %1 support Hỗ trợ %1 - + About %1 setup Về thiết lập %1 - + About %1 installer Về bộ cài đặt %1 @@ -4126,20 +4121,17 @@ Output: - - about - - - Back - Quay lại - - calamares-sidebar - - Show debug information - Hiện thông tin gỡ lỗi + + About + Giới thiệu + + + + Debug + @@ -4500,26 +4492,21 @@ Output: - About - Giới thiệu - - - Support Hỗ trợ - + Known issues Các vấn đề đã biết - + Release notes Ghi chú phát hành - + Donate Ủng hộ diff --git a/lang/calamares_zh.ts b/lang/calamares_zh.ts index 3f057c506..71d060fd8 100644 --- a/lang/calamares_zh.ts +++ b/lang/calamares_zh.ts @@ -156,7 +156,7 @@ - + Debug information @@ -499,12 +499,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer @@ -1449,7 +1449,7 @@ The installer will quit and all changes will be lost. - Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition. @@ -3997,61 +3997,56 @@ Output: - &About - - - - Open donations website - + &Donate - + Open help and support website - + &Support - + Open issues and bug-tracking website - + &Known issues - + Open release notes website - + &Release notes - + %1 support - + About %1 setup - + About %1 installer @@ -4116,19 +4111,16 @@ Output: - - about - - - Back - - - calamares-sidebar - - Show debug information + + About + + + + + Debug @@ -4466,26 +4458,21 @@ Output: - About - - - - Support - + Known issues - + Release notes - + Donate diff --git a/lang/calamares_zh_CN.ts b/lang/calamares_zh_CN.ts index cb88308c5..f5b7a575d 100644 --- a/lang/calamares_zh_CN.ts +++ b/lang/calamares_zh_CN.ts @@ -157,7 +157,7 @@ 树形控件 - + Debug information 调试信息 @@ -506,12 +506,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program %1 安装程序 - + %1 Installer %1 安装程序 @@ -1459,7 +1459,7 @@ The installer will quit and all changes will be lost. - Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition. @@ -4015,61 +4015,56 @@ Output: - &About - 关于(&A) - - - Open donations website 打开捐赠信息网页 - + &Donate 捐赠(&D) - + Open help and support website 打开帮助和支持页面 - + &Support 支持信息(&S) - + Open issues and bug-tracking website 打开问题追踪网站 - + &Known issues 已知问题(&K) - + Open release notes website 打开发布日志网页 - + &Release notes 发行注记(&R) - + %1 support %1 的支持信息 - + About %1 setup 关于 %1 安装程序 - + About %1 installer 关于 %1 安装程序 @@ -4134,20 +4129,17 @@ Output: 输出为： - - about - - - Back - 后退 - - calamares-sidebar - - Show debug information - 显示调试信息 + + About + 关于 + + + + Debug + 调试 @@ -4513,26 +4505,21 @@ Output: - About - 关于 - - - Support 支持 - + Known issues 已知问题 - + Release notes 发行说明 - + Donate 捐赠 diff --git a/lang/calamares_zh_HK.ts b/lang/calamares_zh_HK.ts index 61a23d3f7..57e63b419 100644 --- a/lang/calamares_zh_HK.ts +++ b/lang/calamares_zh_HK.ts @@ -156,7 +156,7 @@ - + Debug information @@ -499,12 +499,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer @@ -1449,7 +1449,7 @@ The installer will quit and all changes will be lost. - Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition. @@ -3997,61 +3997,56 @@ Output: - &About - - - - Open donations website - + &Donate - + Open help and support website - + &Support - + Open issues and bug-tracking website - + &Known issues - + Open release notes website - + &Release notes - + %1 support - + About %1 setup - + About %1 installer @@ -4116,19 +4111,16 @@ Output: - - about - - - Back - - - calamares-sidebar - - Show debug information + + About + + + + + Debug @@ -4466,26 +4458,21 @@ Output: - About - - - - Support - + Known issues - + Release notes - + Donate diff --git a/lang/calamares_zh_TW.ts b/lang/calamares_zh_TW.ts index 2a55f95fd..e6d8a27f4 100644 --- a/lang/calamares_zh_TW.ts +++ b/lang/calamares_zh_TW.ts @@ -6,18 +6,18 @@ <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> - + <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - + 感謝 <a href="https://calamares.io/team/">Calamares 團隊</a>與 <a href="https://www.transifex.com/calamares/calamares/">Calamares 翻譯者團隊</a>。<br/><br/><a href="https://calamares.io/">Calamares</a> 的開發由 <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software 贊助。 Copyright %1-%2 %3 &lt;%4&gt;<br/> Copyright year-year Name <email-address> - + Copyright %1-%2 %3 &lt;%4&gt;<br/> @@ -156,7 +156,7 @@ 小工具樹 - + Debug information 除錯資訊 @@ -505,12 +505,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program %1 設定程式 - + %1 Installer %1 安裝程式 @@ -1451,12 +1451,12 @@ The installer will quit and all changes will be lost. Passphrase for existing partition - + 既有分割區的密碼 - Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphraseor delete and create a new encrypted partition. - + Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition. + 分割區 %1 無法使用給予的密碼解密。<br/><br/>再次編輯分割區並給予正確的密碼或刪除並建立新的加密分割區。 @@ -4011,61 +4011,56 @@ Output: - &About - 關於(&A) - - - Open donations website 開啟捐款網頁 - + &Donate 捐款(&D) - + Open help and support website 開啟說明與支援網頁 - + &Support 支援(&S) - + Open issues and bug-tracking website 開啟問題與錯誤追蹤網頁 - + &Known issues 已知問題(&K) - + Open release notes website 開啟發行記事網站 - + &Release notes 發行註記(&R) - + %1 support %1 支援 - + About %1 setup 關於 %1 安裝程式 - + About %1 installer 關於 %1 安裝程式 @@ -4130,20 +4125,17 @@ Output: 輸出為： - - about - - - Back - 返回 - - calamares-sidebar - - Show debug information - 顯示除錯資訊 + + About + 關於 + + + + Debug + Debug @@ -4508,26 +4500,21 @@ Output: - About - 關於 - - - Support 支援 - + Known issues 已知問題 - + Release notes 發行記事 - + Donate 捐助 From 5f55f14f9dca7b15d9f11f13c39ad6a3f457045c Mon Sep 17 00:00:00 2001 From: Calamares CI Date: Tue, 14 Jun 2022 13:32:17 +0200 Subject: [PATCH 08/91] 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 "正在儲存網路設定。"

From e4729b8dc3dcba3b848e1c992d6248b87c7c7ba9 Mon Sep 17 00:00:00 2001
From: demmm 
Date: Wed, 15 Jun 2022 18:26:35 +0200
Subject: [PATCH 09/91] [welcomeq] adjust Requirements.qml starting with
 https://github.com/calamares/calamares/commit/217e4ab4f7ec21c4acf71d6700f87984fe10cbab
 the messages have expanded, no longer fitting in the used ListView model set
 the text blocks to expand with text size, add a scrollbar reduce top spacing
 so underlying image won't show set the full requirements listing as default

---
 src/modules/welcomeq/Requirements.qml | 30 +++++++++++++++------------
 src/modules/welcomeq/welcomeq.qml     |  2 +-
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/src/modules/welcomeq/Requirements.qml b/src/modules/welcomeq/Requirements.qml
index 159d88446..17631dff4 100644
--- a/src/modules/welcomeq/Requirements.qml
+++ b/src/modules/welcomeq/Requirements.qml
@@ -1,6 +1,6 @@
 /* === This file is part of Calamares -  ===
  *
- *   SPDX-FileCopyrightText: 2020 Anke Boersma 
+ *   SPDX-FileCopyrightText: 2020 - 2022 Anke Boersma 
  *   SPDX-FileCopyrightText: 2020 Adriaan de Groot 
  *   SPDX-License-Identifier: GPL-3.0-or-later
  *
@@ -20,15 +20,14 @@ Rectangle {
     focus: true
     Kirigami.Theme.backgroundColor: Kirigami.Theme.backgroundColor
     anchors.fill: parent
-    anchors.topMargin: 50
+    anchors.topMargin: 60
 
     TextArea {
         id: required
         anchors.horizontalCenter: parent.horizontalCenter
         anchors.top: parent.top
-        anchors.topMargin: 1
         horizontalAlignment: TextEdit.AlignHCenter
-        width: 640
+        width: parent.width
         font.pointSize: 11
         textFormat: Text.RichText
         antialiasing: true
@@ -44,8 +43,8 @@ Rectangle {
     }
 
     Rectangle {
-        width: 640
-        height: 360
+        width: parent.width * 0.8
+        height: parent.height * 0.6
         anchors.horizontalCenter: parent.horizontalCenter
         anchors.top: required.bottom
         anchors.topMargin: 5
@@ -54,8 +53,8 @@ Rectangle {
             id: requirementsDelegate
 
             Item {
-                width: 640
-                height: 35
+                width: parent.width
+                implicitHeight: message.implicitHeight + 30
                 visible: true
 
                 Column {
@@ -63,7 +62,7 @@ Rectangle {
 
                     Rectangle {
                         implicitWidth: 640
-                        implicitHeight: 35
+                        implicitHeight: message.implicitHeight + 30
                         // Colors and images based on the two satisfied-bools:
                         // - if satisfied, then green / ok
                         // - otherwise if mandatory, then red / stop
@@ -92,11 +91,16 @@ Rectangle {
             id: requirementsList
             anchors.fill: parent
             spacing: 5
-            // This uses the filtered model, so that only unsatisfied
-            // requirements are ever shown. You could use *requirementsModel*
-            // to get all of them.
-            model: config.unsatisfiedRequirements
+            clip: true
+            // This uses the unfiltered model, so that all requirements are
+            // shown. You could use *unsatisfiedRequirements* to get the
+            // filtered model so that only unsatisfied requirements are ever shown.
+            //model: config.unsatisfiedRequirements
+            model: config.requirementsModel
             delegate: requirementsDelegate
+            ScrollBar.vertical: ScrollBar {
+                active: true
+            }
         }
     }
 }
diff --git a/src/modules/welcomeq/welcomeq.qml b/src/modules/welcomeq/welcomeq.qml
index acb1cebf2..7c1187c7d 100644
--- a/src/modules/welcomeq/welcomeq.qml
+++ b/src/modules/welcomeq/welcomeq.qml
@@ -30,7 +30,7 @@ Page
             anchors.horizontalCenter: parent.horizontalCenter
             anchors.top: parent.top
             horizontalAlignment: Text.AlignHCenter
-            padding: 40
+            padding: 20
             // In QML, QString::arg() only takes one argument
             text: qsTr("
Welcome to the %1 %2 installer

             
This program will ask you some questions and set up %1 on your computer.
").arg(Branding.string(Branding.ProductName)).arg(Branding.string(Branding.Version))

From 0257c9d31e202c72422fef0dca9199a0d78dfacd Mon Sep 17 00:00:00 2001
From: demmm 
Date: Wed, 15 Jun 2022 19:52:27 +0200
Subject: [PATCH 10/91] [welcomeq] set needed Text id

---
 src/modules/welcomeq/Requirements.qml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/modules/welcomeq/Requirements.qml b/src/modules/welcomeq/Requirements.qml
index 17631dff4..949ac32c0 100644
--- a/src/modules/welcomeq/Requirements.qml
+++ b/src/modules/welcomeq/Requirements.qml
@@ -78,6 +78,7 @@ Rectangle {
                         }
 
                         Text {
+                            id: message
                             text: satisfied ? details : negatedText
                             anchors.centerIn: parent
                             font.pointSize: 11

From 214522f42a9f985bf6fdee477a349560be9e5358 Mon Sep 17 00:00:00 2001
From: Calamares CI 
Date: Fri, 17 Jun 2022 22:20:17 +0200
Subject: [PATCH 11/91] i18n: [calamares] Automatic merge of Transifex
 translations

---
 lang/calamares_oc.ts |   42 +-
 lang/calamares_uz.ts | 4480 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 4501 insertions(+), 21 deletions(-)
 create mode 100644 lang/calamares_uz.ts

diff --git a/lang/calamares_oc.ts b/lang/calamares_oc.ts
index 2c5815cee..9a931e4c2 100644
--- a/lang/calamares_oc.ts
+++ b/lang/calamares_oc.ts
@@ -6,7 +6,7 @@
     
       
       <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/>
-      
+      <h1>%1</h1><br/><strong>%2<br/> per %3</strong><br/><br/>
     
     
       
@@ -17,7 +17,7 @@
       
       Copyright %1-%2 %3 &lt;%4&gt;<br/>
       Copyright year-year Name <email-address>
-      
+      Copyright %1-%2 %3 &lt;%4&gt;<br/>
     
   
   
@@ -51,7 +51,7 @@
     
       
       Master Boot Record of %1
-      
+      Enregistrament d’aviada màger de %1
     
     
       
@@ -87,7 +87,7 @@
     
       
       Form
-      
+      Formulari
     
     
       
@@ -179,7 +179,7 @@
     
       
       Job failed (%1)
-      
+      Prètzfach fracassat (%1)
     
     
       
@@ -200,7 +200,7 @@
     
       
       Example job (%1)
-      
+      Prètzfach d’exemple (%1)
     
   
   
@@ -503,7 +503,7 @@ The installer will quit and all changes will be lost.
     
       
       %1 Setup Program
-      
+      Programa de configuracion %1
     
     
       
@@ -534,7 +534,7 @@ The installer will quit and all changes will be lost.
     
       
       Gathering system information...
-      
+      Obtencion de las informacions del sistèma...
     
   
   
@@ -542,7 +542,7 @@ The installer will quit and all changes will be lost.
     
       
       Form
-      
+      Formulari
     
     
       
@@ -1460,7 +1460,7 @@ The installer will quit and all changes will be lost.
     
       
       Form
-      
+      Formulari
     
     
       
@@ -1565,7 +1565,7 @@ The installer will quit and all changes will be lost.
     
       
       Form
-      
+      Formulari
     
     
       
@@ -1864,7 +1864,7 @@ The installer will quit and all changes will be lost.
     
       
       Form
-      
+      Formulari
     
     
       
@@ -2541,7 +2541,7 @@ The installer will quit and all changes will be lost.
     
       
       Form
-      
+      Formulari
     
     
       
@@ -2587,7 +2587,7 @@ The installer will quit and all changes will be lost.
     
       
       Form
-      
+      Formulari
     
     
       
@@ -2605,7 +2605,7 @@ The installer will quit and all changes will be lost.
     
       
       Form
-      
+      Formulari
     
     
       
@@ -2786,7 +2786,7 @@ The installer will quit and all changes will be lost.
     
       
       Form
-      
+      Formulari
     
     
       
@@ -2864,7 +2864,7 @@ The installer will quit and all changes will be lost.
     
       
       Gathering system information...
-      
+      Obtencion de las informacions del sistèma...
     
     
       
@@ -2986,7 +2986,7 @@ The installer will quit and all changes will be lost.
     
       
       Form
-      
+      Formulari
     
     
       
@@ -3210,7 +3210,7 @@ Output:
     
       
       Form
-      
+      Formulari
     
     
       
@@ -3832,7 +3832,7 @@ Output:
     
       
       Form
-      
+      Formulari
     
     
       
@@ -3998,7 +3998,7 @@ Output:
     
       
       Form
-      
+      Formulari
     
     
       
diff --git a/lang/calamares_uz.ts b/lang/calamares_uz.ts
new file mode 100644
index 000000000..6ee480111
--- /dev/null
+++ b/lang/calamares_uz.ts
@@ -0,0 +1,4480 @@
+
+
+
+  
+    AboutData
+    
+      
+      <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/>
+      
+    
+    
+      
+      Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software.
+      
+    
+    
+      
+      Copyright %1-%2 %3 &lt;%4&gt;<br/>
+      Copyright year-year Name <email-address>
+      
+    
+  
+  
+    AutoMountManagementJob
+    
+      
+      Manage auto-mount settings
+      
+    
+  
+  
+    BootInfoWidget
+    
+      
+      The <strong>boot environment</strong> of this system.<br><br>Older x86 systems only support <strong>BIOS</strong>.<br>Modern systems usually use <strong>EFI</strong>, but may also show up as BIOS if started in compatibility mode.
+      
+    
+    
+      
+      This system was started with an <strong>EFI</strong> boot environment.<br><br>To configure startup from an EFI environment, this installer must deploy a boot loader application, like <strong>GRUB</strong> or <strong>systemd-boot</strong> on an <strong>EFI System Partition</strong>. This is automatic, unless you choose manual partitioning, in which case you must choose it or create it on your own.
+      
+    
+    
+      
+      This system was started with a <strong>BIOS</strong> boot environment.<br><br>To configure startup from a BIOS environment, this installer must install a boot loader, like <strong>GRUB</strong>, either at the beginning of a partition or on the <strong>Master Boot Record</strong> near the beginning of the partition table (preferred). This is automatic, unless you choose manual partitioning, in which case you must set it up on your own.
+      
+    
+  
+  
+    BootLoaderModel
+    
+      
+      Master Boot Record of %1
+      
+    
+    
+      
+      Boot Partition
+      
+    
+    
+      
+      System Partition
+      
+    
+    
+      
+      Do not install a boot loader
+      
+    
+    
+      
+      %1 (%2)
+      
+    
+  
+  
+    Calamares::BlankViewStep
+    
+      
+      Blank Page
+      
+    
+  
+  
+    Calamares::DebugWindow
+    
+      
+      Form
+      
+    
+    
+      
+      GlobalStorage
+      
+    
+    
+      
+      JobQueue
+      
+    
+    
+      
+      Modules
+      
+    
+    
+      
+      Type:
+      
+    
+    
+      
+      
+      none
+      
+    
+    
+      
+      Interface:
+      
+    
+    
+      
+      Crashes Calamares, so that Dr. Konqui can look at it.
+      
+    
+    
+      
+      Reloads the stylesheet from the branding directory.
+      
+    
+    
+      
+      Uploads the session log to the configured pastebin.
+      
+    
+    
+      
+      Send Session Log
+      
+    
+    
+      
+      Reload Stylesheet
+      
+    
+    
+      
+      Displays the tree of widget names in the log (for stylesheet debugging).
+      
+    
+    
+      
+      Widget Tree
+      
+    
+    
+      
+      Debug information
+      
+    
+  
+  
+    Calamares::ExecutionViewStep
+    
+      
+      Set up
+      
+    
+    
+      
+      Install
+      
+    
+  
+  
+    Calamares::FailJob
+    
+      
+      Job failed (%1)
+      
+    
+    
+      
+      Programmed job failure was explicitly requested.
+      
+    
+  
+  
+    Calamares::JobThread
+    
+      
+      Done
+      
+    
+  
+  
+    Calamares::NamedJob
+    
+      
+      Example job (%1)
+      
+    
+  
+  
+    Calamares::ProcessJob
+    
+      
+      Run command '%1' in target system.
+      
+    
+    
+      
+       Run command '%1'.
+      
+    
+    
+      
+      Running command %1 %2
+      
+    
+  
+  
+    Calamares::PythonJob
+    
+      
+      Running %1 operation.
+      
+    
+    
+      
+      Bad working directory path
+      
+    
+    
+      
+      Working directory %1 for python job %2 is not readable.
+      
+    
+    
+      
+      Bad main script file
+      
+    
+    
+      
+      Main script file %1 for python job %2 is not readable.
+      
+    
+    
+      
+      Boost.Python error in job "%1".
+      
+    
+  
+  
+    Calamares::QmlViewStep
+    
+      
+      Loading ...
+      
+    
+    
+      
+      QML Step <i>%1</i>.
+      
+    
+    
+      
+      Loading failed.
+      
+    
+  
+  
+    Calamares::RequirementsChecker
+    
+      
+      Requirements checking for module <i>%1</i> is complete.
+      
+    
+    
+      
+      Waiting for %n module(s).
+      
+        
+      
+    
+    
+      
+      (%n second(s))
+      
+        
+      
+    
+    
+      
+      System-requirements checking is complete.
+      
+    
+  
+  
+    Calamares::ViewManager
+    
+      
+      Setup Failed
+      
+    
+    
+      
+      Installation Failed
+      
+    
+    
+      
+      Error
+      
+    
+    
+      
+      &Yes
+      
+    
+    
+      
+      &No
+      
+    
+    
+      
+      &Close
+      
+    
+    
+      
+      Install Log Paste URL
+      
+    
+    
+      
+      The upload was unsuccessful. No web-paste was done.
+      
+    
+    
+      
+      Install log posted to
+
+%1
+
+Link copied to clipboard
+      
+    
+    
+      
+      Calamares Initialization Failed
+      
+    
+    
+      
+      %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
+      
+    
+    
+      
+      <br/>The following modules could not be loaded:
+      
+    
+    
+      
+      Continue with setup?
+      
+    
+    
+      
+      Continue with installation?
+      
+    
+    
+      
+      The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
+      
+    
+    
+      
+      The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
+      
+    
+    
+      
+      &Set up now
+      
+    
+    
+      
+      &Install now
+      
+    
+    
+      
+      Go &back
+      
+    
+    
+      
+      &Set up
+      
+    
+    
+      
+      &Install
+      
+    
+    
+      
+      Setup is complete. Close the setup program.
+      
+    
+    
+      
+      The installation is complete. Close the installer.
+      
+    
+    
+      
+      Cancel setup without changing the system.
+      
+    
+    
+      
+      Cancel installation without changing the system.
+      
+    
+    
+      
+      &Next
+      
+    
+    
+      
+      &Back
+      
+    
+    
+      
+      &Done
+      
+    
+    
+      
+      &Cancel
+      
+    
+    
+      
+      Cancel setup?
+      
+    
+    
+      
+      Cancel installation?
+      
+    
+    
+      
+      Do you really want to cancel the current setup process?
+The setup program will quit and all changes will be lost.
+      
+    
+    
+      
+      Do you really want to cancel the current install process?
+The installer will quit and all changes will be lost.
+      
+    
+  
+  
+    CalamaresPython::Helper
+    
+      
+      Unknown exception type
+      
+    
+    
+      
+      unparseable Python error
+      
+    
+    
+      
+      unparseable Python traceback
+      
+    
+    
+      
+      Unfetchable Python error.
+      
+    
+  
+  
+    CalamaresWindow
+    
+      
+      %1 Setup Program
+      
+    
+    
+      
+      %1 Installer
+      
+    
+  
+  
+    ChangeFilesystemLabelJob
+    
+      
+      Set filesystem label on %1.
+      
+    
+    
+      
+      Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
+      
+    
+    
+      
+      The installer failed to update partition table on disk '%1'.
+      
+    
+  
+  
+    CheckerContainer
+    
+      
+      Gathering system information...
+      
+    
+  
+  
+    ChoicePage
+    
+      
+      Form
+      
+    
+    
+      
+      Select storage de&vice:
+      
+    
+    
+      
+      
+      
+      
+      Current:
+      
+    
+    
+      
+      After:
+      
+    
+    
+      
+      <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
+      
+    
+    
+      
+      Reuse %1 as home partition for %2.
+      
+    
+    
+      
+      <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
+      
+    
+    
+      
+      %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
+      
+    
+    
+      
+      Boot loader location:
+      
+    
+    
+      
+      <strong>Select a partition to install on</strong>
+      
+    
+    
+      
+      An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
+      
+    
+    
+      
+      The EFI system partition at %1 will be used for starting %2.
+      
+    
+    
+      
+      EFI system partition:
+      
+    
+    
+      
+      This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
+      
+    
+    
+      
+      
+      
+      
+      <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
+      
+    
+    
+      
+      
+      
+      
+      <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
+      
+    
+    
+      
+      
+      
+      
+      <strong>Replace a partition</strong><br/>Replaces a partition with %1.
+      
+    
+    
+      
+      This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
+      
+    
+    
+      
+      This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
+      
+    
+    
+      
+      This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
+      
+    
+    
+      
+      This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
+      
+    
+    
+      
+      This storage device has one of its partitions <strong>mounted</strong>.
+      
+    
+    
+      
+      This storage device is a part of an <strong>inactive RAID</strong> device.
+      
+    
+    
+      
+      No Swap
+      
+    
+    
+      
+      Reuse Swap
+      
+    
+    
+      
+      Swap (no Hibernate)
+      
+    
+    
+      
+      Swap (with Hibernate)
+      
+    
+    
+      
+      Swap to file
+      
+    
+  
+  
+    ClearMountsJob
+    
+      
+      Successfully unmounted %1.
+      
+    
+    
+      
+      Successfully disabled swap %1.
+      
+    
+    
+      
+      Successfully cleared swap %1.
+      
+    
+    
+      
+      Successfully closed mapper device %1.
+      
+    
+    
+      
+      Successfully disabled volume group %1.
+      
+    
+    
+      
+      Clear mounts for partitioning operations on %1
+      
+    
+    
+      
+      Clearing mounts for partitioning operations on %1.
+      
+    
+    
+      
+      Cleared all mounts for %1
+      
+    
+  
+  
+    ClearTempMountsJob
+    
+      
+      Clear all temporary mounts.
+      
+    
+    
+      
+      Clearing all temporary mounts.
+      
+    
+    
+      
+      Cleared all temporary mounts.
+      
+    
+  
+  
+    CommandList
+    
+      
+      
+      Could not run command.
+      
+    
+    
+      
+      The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined.
+      
+    
+    
+      
+      The command needs to know the user's name, but no username is defined.
+      
+    
+  
+  
+    Config
+    
+      
+      Set keyboard model to %1.<br/>
+      
+    
+    
+      
+      Set keyboard layout to %1/%2.
+      
+    
+    
+      
+      Set timezone to %1/%2.
+      
+    
+    
+      
+      The system language will be set to %1.
+      
+    
+    
+      
+      The numbers and dates locale will be set to %1.
+      
+    
+    
+      
+      Network Installation. (Disabled: Incorrect configuration)
+      
+    
+    
+      
+      Network Installation. (Disabled: Received invalid groups data)
+      
+    
+    
+      
+      Network Installation. (Disabled: Internal error)
+      
+    
+    
+      
+      Network Installation. (Disabled: No package list)
+      
+    
+    
+      
+      Package selection
+      
+    
+    
+      
+      Network Installation. (Disabled: Unable to fetch package lists, check your network connection)
+      
+    
+    
+      
+      This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
+      
+    
+    
+      
+      This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
+      
+    
+    
+      
+      This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
+      
+    
+    
+      
+      This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
+      
+    
+    
+      
+      This program will ask you some questions and set up %2 on your computer.
+      
+    
+    
+      
+      <h1>Welcome to the Calamares setup program for %1</h1>
+      
+    
+    
+      
+      <h1>Welcome to %1 setup</h1>
+      
+    
+    
+      
+      <h1>Welcome to the Calamares installer for %1</h1>
+      
+    
+    
+      
+      <h1>Welcome to the %1 installer</h1>
+      
+    
+    
+      
+      Your username is too long.
+      
+    
+    
+      
+      '%1' is not allowed as username.
+      
+    
+    
+      
+      Your username must start with a lowercase letter or underscore.
+      
+    
+    
+      
+      Only lowercase letters, numbers, underscore and hyphen are allowed.
+      
+    
+    
+      
+      Your hostname is too short.
+      
+    
+    
+      
+      Your hostname is too long.
+      
+    
+    
+      
+      '%1' is not allowed as hostname.
+      
+    
+    
+      
+      Only letters, numbers, underscore and hyphen are allowed.
+      
+    
+    
+      
+      Your passwords do not match!
+      
+    
+    
+      
+      OK!
+      
+    
+    
+      
+      Setup Failed
+      
+    
+    
+      
+      Installation Failed
+      
+    
+    
+      
+      The setup of %1 did not complete successfully.
+      
+    
+    
+      
+      The installation of %1 did not complete successfully.
+      
+    
+    
+      
+      Setup Complete
+      
+    
+    
+      
+      Installation Complete
+      
+    
+    
+      
+      The setup of %1 is complete.
+      
+    
+    
+      
+      The installation of %1 is complete.
+      
+    
+    
+      
+      Package Selection
+      
+    
+    
+      
+      Please pick a product from the list. The selected product will be installed.
+      
+    
+    
+      
+      Packages
+      
+    
+    
+      
+      Install option: <strong>%1</strong>
+      
+    
+    
+      
+      None
+      
+    
+    
+      
+      Summary
+      
+    
+    
+      
+      This is an overview of what will happen once you start the setup procedure.
+      
+    
+    
+      
+      This is an overview of what will happen once you start the install procedure.
+      
+    
+  
+  
+    ContextualProcessJob
+    
+      
+      Contextual Processes Job
+      
+    
+  
+  
+    CreatePartitionDialog
+    
+      
+      Create a Partition
+      
+    
+    
+      
+      Si&ze:
+      
+    
+    
+      
+       MiB
+      
+    
+    
+      
+      Partition &Type:
+      
+    
+    
+      
+      Primar&y
+      
+    
+    
+      
+      E&xtended
+      
+    
+    
+      
+      Fi&le System:
+      
+    
+    
+      
+      LVM LV name
+      
+    
+    
+      
+      &Mount Point:
+      
+    
+    
+      
+      Flags:
+      
+    
+    
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
+      En&crypt
+      
+    
+    
+      
+      Logical
+      
+    
+    
+      
+      Primary
+      
+    
+    
+      
+      GPT
+      
+    
+    
+      
+      Mountpoint already in use. Please select another one.
+      
+    
+    
+      
+      Mountpoint must start with a <tt>/</tt>.
+      
+    
+  
+  
+    CreatePartitionJob
+    
+      
+      Create new %1MiB partition on %3 (%2) with entries %4.
+      
+    
+    
+      
+      Create new %1MiB partition on %3 (%2).
+      
+    
+    
+      
+      Create new %2MiB partition on %4 (%3) with file system %1.
+      
+    
+    
+      
+      Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.
+      
+    
+    
+      
+      Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).
+      
+    
+    
+      
+      Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.
+      
+    
+    
+      
+      
+      Creating new %1 partition on %2.
+      
+    
+    
+      
+      The installer failed to create partition on disk '%1'.
+      
+    
+  
+  
+    CreatePartitionTableDialog
+    
+      
+      Create Partition Table
+      
+    
+    
+      
+      Creating a new partition table will delete all existing data on the disk.
+      
+    
+    
+      
+      What kind of partition table do you want to create?
+      
+    
+    
+      
+      Master Boot Record (MBR)
+      
+    
+    
+      
+      GUID Partition Table (GPT)
+      
+    
+  
+  
+    CreatePartitionTableJob
+    
+      
+      Create new %1 partition table on %2.
+      
+    
+    
+      
+      Create new <strong>%1</strong> partition table on <strong>%2</strong> (%3).
+      
+    
+    
+      
+      Creating new %1 partition table on %2.
+      
+    
+    
+      
+      The installer failed to create a partition table on %1.
+      
+    
+  
+  
+    CreateUserJob
+    
+      
+      Create user %1
+      
+    
+    
+      
+      Create user <strong>%1</strong>.
+      
+    
+    
+      
+      Preserving home directory
+      
+    
+    
+      
+      
+      Creating user %1
+      
+    
+    
+      
+      Configuring user %1
+      
+    
+    
+      
+      Setting file permissions
+      
+    
+  
+  
+    CreateVolumeGroupDialog
+    
+      
+      Create Volume Group
+      
+    
+  
+  
+    CreateVolumeGroupJob
+    
+      
+      Create new volume group named %1.
+      
+    
+    
+      
+      Create new volume group named <strong>%1</strong>.
+      
+    
+    
+      
+      Creating new volume group named %1.
+      
+    
+    
+      
+      The installer failed to create a volume group named '%1'.
+      
+    
+  
+  
+    DeactivateVolumeGroupJob
+    
+      
+      
+      Deactivate volume group named %1.
+      
+    
+    
+      
+      Deactivate volume group named <strong>%1</strong>.
+      
+    
+    
+      
+      The installer failed to deactivate a volume group named %1.
+      
+    
+  
+  
+    DeletePartitionJob
+    
+      
+      Delete partition %1.
+      
+    
+    
+      
+      Delete partition <strong>%1</strong>.
+      
+    
+    
+      
+      Deleting partition %1.
+      
+    
+    
+      
+      The installer failed to delete partition %1.
+      
+    
+  
+  
+    DeviceInfoWidget
+    
+      
+      This device has a <strong>%1</strong> partition table.
+      
+    
+    
+      
+      This is a <strong>loop</strong> device.<br><br>It is a pseudo-device with no partition table that makes a file accessible as a block device. This kind of setup usually only contains a single filesystem.
+      
+    
+    
+      
+      This installer <strong>cannot detect a partition table</strong> on the selected storage device.<br><br>The device either has no partition table, or the partition table is corrupted or of an unknown type.<br>This installer can create a new partition table for you, either automatically, or through the manual partitioning page.
+      
+    
+    
+      
+      <br><br>This is the recommended partition table type for modern systems which start from an <strong>EFI</strong> boot environment.
+      
+    
+    
+      
+      <br><br>This partition table type is only advisable on older systems which start from a <strong>BIOS</strong> boot environment. GPT is recommended in most other cases.<br><br><strong>Warning:</strong> the MBR partition table is an obsolete MS-DOS era standard.<br>Only 4 <em>primary</em> partitions may be created, and of those 4, one can be an <em>extended</em> partition, which may in turn contain many <em>logical</em> partitions.
+      
+    
+    
+      
+      The type of <strong>partition table</strong> on the selected storage device.<br><br>The only way to change the partition table type is to erase and recreate the partition table from scratch, which destroys all data on the storage device.<br>This installer will keep the current partition table unless you explicitly choose otherwise.<br>If unsure, on modern systems GPT is preferred.
+      
+    
+  
+  
+    DeviceModel
+    
+      
+      %1 - %2 (%3)
+      device[name] - size[number] (device-node[name])
+      
+    
+    
+      
+      %1 - (%2)
+      device[name] - (device-node[name])
+      
+    
+  
+  
+    DracutLuksCfgJob
+    
+      
+      Write LUKS configuration for Dracut to %1
+      
+    
+    
+      
+      Skip writing LUKS configuration for Dracut: "/" partition is not encrypted
+      
+    
+    
+      
+      Failed to open %1
+      
+    
+  
+  
+    DummyCppJob
+    
+      
+      Dummy C++ Job
+      
+    
+  
+  
+    EditExistingPartitionDialog
+    
+      
+      Edit Existing Partition
+      
+    
+    
+      
+      Con&tent:
+      
+    
+    
+      
+      &Keep
+      
+    
+    
+      
+      Format
+      
+    
+    
+      
+      Warning: Formatting the partition will erase all existing data.
+      
+    
+    
+      
+      &Mount Point:
+      
+    
+    
+      
+      Si&ze:
+      
+    
+    
+      
+       MiB
+      
+    
+    
+      
+      Fi&le System:
+      
+    
+    
+      
+      Flags:
+      
+    
+    
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
+      Passphrase for existing partition
+      
+    
+    
+      
+      Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition.
+      
+    
+  
+  
+    EncryptWidget
+    
+      
+      Form
+      
+    
+    
+      
+      En&crypt system
+      
+    
+    
+      
+      Your system does not seem to support encryption well enough to encrypt the entire system. You may enable encryption, but performance may suffer.
+      
+    
+    
+      
+      Passphrase
+      
+    
+    
+      
+      Confirm passphrase
+      
+    
+    
+      
+      
+      Please enter the same passphrase in both boxes.
+      
+    
+  
+  
+    ErrorDialog
+    
+      
+      Details:
+      
+    
+    
+      
+      Would you like to paste the install log to the web?
+      
+    
+  
+  
+    FillGlobalStorageJob
+    
+      
+      Set partition information
+      
+    
+    
+      
+      Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em>
+      
+    
+    
+      
+      Install %1 on <strong>new</strong> %2 system partition.
+      
+    
+    
+      
+      Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.
+      
+    
+    
+      
+      Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.
+      
+    
+    
+      
+      Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.
+      
+    
+    
+      
+      Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.
+      
+    
+    
+      
+      Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.
+      
+    
+    
+      
+      Install %2 on %3 system partition <strong>%1</strong>.
+      
+    
+    
+      
+      Install boot loader on <strong>%1</strong>.
+      
+    
+    
+      
+      Setting up mount points.
+      
+    
+  
+  
+    FinishedPage
+    
+      
+      Form
+      
+    
+    
+      
+      &Restart now
+      
+    
+    
+      
+      <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system.
+      
+    
+    
+      
+      <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html>
+      
+    
+    
+      
+      <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment.
+      
+    
+    
+      
+      <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html>
+      
+    
+    
+      
+      <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2.
+      
+    
+    
+      
+      <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2.
+      
+    
+  
+  
+    FinishedQmlViewStep
+    
+      
+      Finish
+      
+    
+  
+  
+    FinishedViewStep
+    
+      
+      Finish
+      
+    
+  
+  
+    FormatPartitionJob
+    
+      
+      Format partition %1 (file system: %2, size: %3 MiB) on %4.
+      
+    
+    
+      
+      Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.
+      
+    
+    
+      
+      %1 (%2)
+      partition label %1 (device path %2)
+      
+    
+    
+      
+      Formatting partition %1 with file system %2.
+      
+    
+    
+      
+      The installer failed to format partition %1 on disk '%2'.
+      
+    
+  
+  
+    GeneralRequirements
+    
+      
+      has at least %1 GiB available drive space
+      
+    
+    
+      
+      There is not enough drive space. At least %1 GiB is required.
+      
+    
+    
+      
+      has at least %1 GiB working memory
+      
+    
+    
+      
+      The system does not have enough working memory. At least %1 GiB is required.
+      
+    
+    
+      
+      is plugged in to a power source
+      
+    
+    
+      
+      The system is not plugged in to a power source.
+      
+    
+    
+      
+      is connected to the Internet
+      
+    
+    
+      
+      The system is not connected to the Internet.
+      
+    
+    
+      
+      is running the installer as an administrator (root)
+      
+    
+    
+      
+      The setup program is not running with administrator rights.
+      
+    
+    
+      
+      The installer is not running with administrator rights.
+      
+    
+    
+      
+      has a screen large enough to show the whole installer
+      
+    
+    
+      
+      The screen is too small to display the setup program.
+      
+    
+    
+      
+      The screen is too small to display the installer.
+      
+    
+  
+  
+    HostInfoJob
+    
+      
+      Collecting information about your machine.
+      
+    
+  
+  
+    IDJob
+    
+      
+      
+      
+      
+      OEM Batch Identifier
+      
+    
+    
+      
+      Could not create directories <code>%1</code>.
+      
+    
+    
+      
+      Could not open file <code>%1</code>.
+      
+    
+    
+      
+      Could not write to file <code>%1</code>.
+      
+    
+  
+  
+    InitcpioJob
+    
+      
+      Creating initramfs with mkinitcpio.
+      
+    
+  
+  
+    InitramfsJob
+    
+      
+      Creating initramfs.
+      
+    
+  
+  
+    InteractiveTerminalPage
+    
+      
+      Konsole not installed
+      
+    
+    
+      
+      Please install KDE Konsole and try again!
+      
+    
+    
+      
+      Executing script: &nbsp;<code>%1</code>
+      
+    
+  
+  
+    InteractiveTerminalViewStep
+    
+      
+      Script
+      
+    
+  
+  
+    KeyboardQmlViewStep
+    
+      
+      Keyboard
+      
+    
+  
+  
+    KeyboardViewStep
+    
+      
+      Keyboard
+      
+    
+  
+  
+    LCLocaleDialog
+    
+      
+      System locale setting
+      
+    
+    
+      
+      The system locale setting affects the language and character set for some command line user interface elements.<br/>The current setting is <strong>%1</strong>.
+      
+    
+    
+      
+      &Cancel
+      
+    
+    
+      
+      &OK
+      
+    
+  
+  
+    LOSHJob
+    
+      
+      Configuring encrypted swap.
+      
+    
+    
+      
+      No target system available.
+      
+    
+    
+      
+      No rootMountPoint is set.
+      
+    
+    
+      
+      No configFilePath is set.
+      
+    
+  
+  
+    LicensePage
+    
+      
+      Form
+      
+    
+    
+      
+      <h1>License Agreement</h1>
+      
+    
+    
+      
+      I accept the terms and conditions above.
+      
+    
+    
+      
+      Please review the End User License Agreements (EULAs).
+      
+    
+    
+      
+      This setup procedure will install proprietary software that is subject to licensing terms.
+      
+    
+    
+      
+      If you do not agree with the terms, the setup procedure cannot continue.
+      
+    
+    
+      
+      This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.
+      
+    
+    
+      
+      If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.
+      
+    
+  
+  
+    LicenseViewStep
+    
+      
+      License
+      
+    
+  
+  
+    LicenseWidget
+    
+      
+      URL: %1
+      
+    
+    
+      
+      <strong>%1 driver</strong><br/>by %2
+      %1 is an untranslatable product name, example: Creative Audigy driver
+      
+    
+    
+      
+      <strong>%1 graphics driver</strong><br/><font color="Grey">by %2</font>
+      %1 is usually a vendor name, example: Nvidia graphics driver
+      
+    
+    
+      
+      <strong>%1 browser plugin</strong><br/><font color="Grey">by %2</font>
+      
+    
+    
+      
+      <strong>%1 codec</strong><br/><font color="Grey">by %2</font>
+      
+    
+    
+      
+      <strong>%1 package</strong><br/><font color="Grey">by %2</font>
+      
+    
+    
+      
+      <strong>%1</strong><br/><font color="Grey">by %2</font>
+      
+    
+    
+      
+      File: %1
+      
+    
+    
+      
+      Hide license text
+      
+    
+    
+      
+      Show the license text
+      
+    
+    
+      
+      Open license agreement in browser.
+      
+    
+  
+  
+    LocalePage
+    
+      
+      Region:
+      
+    
+    
+      
+      Zone:
+      
+    
+    
+      
+      
+      &Change...
+      
+    
+  
+  
+    LocaleQmlViewStep
+    
+      
+      Location
+      
+    
+  
+  
+    LocaleTests
+    
+      
+      Quit
+      
+    
+  
+  
+    LocaleViewStep
+    
+      
+      Location
+      
+    
+  
+  
+    LuksBootKeyFileJob
+    
+      
+      Configuring LUKS key file.
+      
+    
+    
+      
+      
+      No partitions are defined.
+      
+    
+    
+      
+      
+      
+      Encrypted rootfs setup error
+      
+    
+    
+      
+      Root partition %1 is LUKS but no passphrase has been set.
+      
+    
+    
+      
+      Could not create LUKS key file for root partition %1.
+      
+    
+    
+      
+      Could not configure LUKS key file on partition %1.
+      
+    
+  
+  
+    MachineIdJob
+    
+      
+      Generate machine-id.
+      
+    
+    
+      
+      Configuration Error
+      
+    
+    
+      
+      No root mount point is set for MachineId.
+      
+    
+  
+  
+    Map
+    
+      
+      Timezone: %1
+      
+    
+    
+      
+      Please select your preferred location on the map so the installer can suggest the locale
+            and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging
+            to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming.
+      
+    
+  
+  
+    NetInstallViewStep
+    
+      
+      Package selection
+      
+    
+    
+      
+      Office software
+      
+    
+    
+      
+      Office package
+      
+    
+    
+      
+      Browser software
+      
+    
+    
+      
+      Browser package
+      
+    
+    
+      
+      Web browser
+      
+    
+    
+      
+      Kernel
+      label for netinstall module, Linux kernel
+      
+    
+    
+      
+      Services
+      label for netinstall module, system services
+      
+    
+    
+      
+      Login
+      label for netinstall module, choose login manager
+      
+    
+    
+      
+      Desktop
+      label for netinstall module, choose desktop environment
+      
+    
+    
+      
+      Communication
+      label for netinstall module
+      
+    
+    
+      
+      Development
+      label for netinstall module
+      
+    
+    
+      
+      Office
+      label for netinstall module
+      
+    
+    
+      
+      Multimedia
+      label for netinstall module
+      
+    
+    
+      
+      Internet
+      label for netinstall module
+      
+    
+    
+      
+      Theming
+      label for netinstall module
+      
+    
+    
+      
+      Gaming
+      label for netinstall module
+      
+    
+    
+      
+      Utilities
+      label for netinstall module
+      
+    
+    
+      
+      Applications
+      
+    
+  
+  
+    NotesQmlViewStep
+    
+      
+      Notes
+      
+    
+  
+  
+    OEMPage
+    
+      
+      Ba&tch:
+      
+    
+    
+      
+      <html><head/><body><p>Enter a batch-identifier here. This will be stored in the target system.</p></body></html>
+      
+    
+    
+      
+      <html><head/><body><h1>OEM Configuration</h1><p>Calamares will use OEM settings while configuring the target system.</p></body></html>
+      
+    
+  
+  
+    OEMViewStep
+    
+      
+      OEM Configuration
+      
+    
+    
+      
+      Set the OEM Batch Identifier to <code>%1</code>.
+      
+    
+  
+  
+    Offline
+    
+      
+      Select your preferred Region, or use the default settings.
+      
+    
+    
+      
+      
+      
+      Timezone: %1
+      
+    
+    
+      
+      Select your preferred Zone within your Region.
+      
+    
+    
+      
+      Zones
+      
+    
+    
+      
+      You can fine-tune Language and Locale settings below.
+      
+    
+  
+  
+    PWQ
+    
+      
+      Password is too short
+      
+    
+    
+      
+      Password is too long
+      
+    
+    
+      
+      Password is too weak
+      
+    
+    
+      
+      Memory allocation error when setting '%1'
+      
+    
+    
+      
+      Memory allocation error
+      
+    
+    
+      
+      The password is the same as the old one
+      
+    
+    
+      
+      The password is a palindrome
+      
+    
+    
+      
+      The password differs with case changes only
+      
+    
+    
+      
+      The password is too similar to the old one
+      
+    
+    
+      
+      The password contains the user name in some form
+      
+    
+    
+      
+      The password contains words from the real name of the user in some form
+      
+    
+    
+      
+      The password contains forbidden words in some form
+      
+    
+    
+      
+      The password contains too few digits
+      
+    
+    
+      
+      The password contains too few uppercase letters
+      
+    
+    
+      
+      The password contains fewer than %n lowercase letters
+      
+        
+      
+    
+    
+      
+      The password contains too few lowercase letters
+      
+    
+    
+      
+      The password contains too few non-alphanumeric characters
+      
+    
+    
+      
+      The password is too short
+      
+    
+    
+      
+      The password does not contain enough character classes
+      
+    
+    
+      
+      The password contains too many same characters consecutively
+      
+    
+    
+      
+      The password contains too many characters of the same class consecutively
+      
+    
+    
+      
+      The password contains fewer than %n digits
+      
+        
+      
+    
+    
+      
+      The password contains fewer than %n uppercase letters
+      
+        
+      
+    
+    
+      
+      The password contains fewer than %n non-alphanumeric characters
+      
+        
+      
+    
+    
+      
+      The password is shorter than %n characters
+      
+        
+      
+    
+    
+      
+      The password is a rotated version of the previous one
+      
+    
+    
+      
+      The password contains fewer than %n character classes
+      
+        
+      
+    
+    
+      
+      The password contains more than %n same characters consecutively
+      
+        
+      
+    
+    
+      
+      The password contains more than %n characters of the same class consecutively
+      
+        
+      
+    
+    
+      
+      The password contains monotonic sequence longer than %n characters
+      
+        
+      
+    
+    
+      
+      The password contains too long of a monotonic character sequence
+      
+    
+    
+      
+      No password supplied
+      
+    
+    
+      
+      Cannot obtain random numbers from the RNG device
+      
+    
+    
+      
+      Password generation failed - required entropy too low for settings
+      
+    
+    
+      
+      The password fails the dictionary check - %1
+      
+    
+    
+      
+      The password fails the dictionary check
+      
+    
+    
+      
+      Unknown setting - %1
+      
+    
+    
+      
+      Unknown setting
+      
+    
+    
+      
+      Bad integer value of setting - %1
+      
+    
+    
+      
+      Bad integer value
+      
+    
+    
+      
+      Setting %1 is not of integer type
+      
+    
+    
+      
+      Setting is not of integer type
+      
+    
+    
+      
+      Setting %1 is not of string type
+      
+    
+    
+      
+      Setting is not of string type
+      
+    
+    
+      
+      Opening the configuration file failed
+      
+    
+    
+      
+      The configuration file is malformed
+      
+    
+    
+      
+      Fatal failure
+      
+    
+    
+      
+      Unknown error
+      
+    
+    
+      
+      Password is empty
+      
+    
+  
+  
+    PackageChooserPage
+    
+      
+      Form
+      
+    
+    
+      
+      Product Name
+      
+    
+    
+      
+      TextLabel
+      
+    
+    
+      
+      Long Product Description
+      
+    
+    
+      
+      Package Selection
+      
+    
+    
+      
+      Please pick a product from the list. The selected product will be installed.
+      
+    
+  
+  
+    PackageModel
+    
+      
+      Name
+      
+    
+    
+      
+      Description
+      
+    
+  
+  
+    Page_Keyboard
+    
+      
+      Form
+      
+    
+    
+      
+      Keyboard Model:
+      
+    
+    
+      
+      Type here to test your keyboard
+      
+    
+  
+  
+    Page_UserSetup
+    
+      
+      Form
+      
+    
+    
+      
+      What is your name?
+      
+    
+    
+      
+      Your Full Name
+      
+    
+    
+      
+      What name do you want to use to log in?
+      
+    
+    
+      
+      login
+      
+    
+    
+      
+      What is the name of this computer?
+      
+    
+    
+      
+      <small>This name will be used if you make the computer visible to others on a network.</small>
+      
+    
+    
+      
+      Computer Name
+      
+    
+    
+      
+      Choose a password to keep your account safe.
+      
+    
+    
+      
+      
+      <small>Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.</small>
+      
+    
+    
+      
+      
+      Password
+      
+    
+    
+      
+      
+      Repeat Password
+      
+    
+    
+      
+      When this box is checked, password-strength checking is done and you will not be able to use a weak password.
+      
+    
+    
+      
+      Require strong passwords.
+      
+    
+    
+      
+      Log in automatically without asking for the password.
+      
+    
+    
+      
+      Use the same password for the administrator account.
+      
+    
+    
+      
+      Choose a password for the administrator account.
+      
+    
+    
+      
+      
+      <small>Enter the same password twice, so that it can be checked for typing errors.</small>
+      
+    
+  
+  
+    PartitionLabelsView
+    
+      
+      Root
+      
+    
+    
+      
+      Home
+      
+    
+    
+      
+      Boot
+      
+    
+    
+      
+      EFI system
+      
+    
+    
+      
+      Swap
+      
+    
+    
+      
+      New partition for %1
+      
+    
+    
+      
+      New partition
+      
+    
+    
+      
+      %1  %2
+      size[number] filesystem[name]
+      
+    
+  
+  
+    PartitionModel
+    
+      
+      
+      Free Space
+      
+    
+    
+      
+      
+      New partition
+      
+    
+    
+      
+      Name
+      
+    
+    
+      
+      File System
+      
+    
+    
+      
+      File System Label
+      
+    
+    
+      
+      Mount Point
+      
+    
+    
+      
+      Size
+      
+    
+  
+  
+    PartitionPage
+    
+      
+      Form
+      
+    
+    
+      
+      Storage de&vice:
+      
+    
+    
+      
+      &Revert All Changes
+      
+    
+    
+      
+      New Partition &Table
+      
+    
+    
+      
+      Cre&ate
+      
+    
+    
+      
+      &Edit
+      
+    
+    
+      
+      &Delete
+      
+    
+    
+      
+      New Volume Group
+      
+    
+    
+      
+      Resize Volume Group
+      
+    
+    
+      
+      Deactivate Volume Group
+      
+    
+    
+      
+      Remove Volume Group
+      
+    
+    
+      
+      I&nstall boot loader on:
+      
+    
+    
+      
+      Are you sure you want to create a new partition table on %1?
+      
+    
+    
+      
+      Can not create new partition
+      
+    
+    
+      
+      The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.
+      
+    
+  
+  
+    PartitionViewStep
+    
+      
+      Gathering system information...
+      
+    
+    
+      
+      Partitions
+      
+    
+    
+      
+      Unsafe partition actions are enabled.
+      
+    
+    
+      
+      Partitioning is configured to <b>always</b> fail.
+      
+    
+    
+      
+      No partitions will be changed.
+      
+    
+    
+      
+      Current:
+      
+    
+    
+      
+      After:
+      
+    
+    
+      
+      No EFI system partition configured
+      
+    
+    
+      
+      EFI system partition configured incorrectly
+      
+    
+    
+      
+      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
+      
+    
+    
+      
+      The filesystem must be mounted on <strong>%1</strong>.
+      
+    
+    
+      
+      The filesystem must have type FAT32.
+      
+    
+    
+      
+      The filesystem must be at least %1 MiB in size.
+      
+    
+    
+      
+      The filesystem must have flag <strong>%1</strong> set.
+      
+    
+    
+      
+      You can continue without setting up an EFI system partition but your system may fail to start.
+      
+    
+    
+      
+      Option to use GPT on BIOS
+      
+    
+    
+      
+      A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>%2</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
+      
+    
+    
+      
+      Boot partition not encrypted
+      
+    
+    
+      
+      A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
+      
+    
+    
+      
+      has at least one disk device available.
+      
+    
+    
+      
+      There are no partitions to install on.
+      
+    
+  
+  
+    PlasmaLnfJob
+    
+      
+      Plasma Look-and-Feel Job
+      
+    
+    
+      
+      
+      Could not select KDE Plasma Look-and-Feel package
+      
+    
+  
+  
+    PlasmaLnfPage
+    
+      
+      Form
+      
+    
+    
+      
+      Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel.
+      
+    
+    
+      
+      Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is installed. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel.
+      
+    
+  
+  
+    PlasmaLnfViewStep
+    
+      
+      Look-and-Feel
+      
+    
+  
+  
+    PreserveFiles
+    
+      
+      Saving files for later ...
+      
+    
+    
+      
+      No files configured to save for later.
+      
+    
+    
+      
+      Not all of the configured files could be preserved.
+      
+    
+  
+  
+    ProcessResult
+    
+      
+      
+There was no output from the command.
+      
+    
+    
+      
+      
+Output:
+
+      
+    
+    
+      
+      External command crashed.
+      
+    
+    
+      
+      Command <i>%1</i> crashed.
+      
+    
+    
+      
+      External command failed to start.
+      
+    
+    
+      
+      Command <i>%1</i> failed to start.
+      
+    
+    
+      
+      Internal error when starting command.
+      
+    
+    
+      
+      Bad parameters for process job call.
+      
+    
+    
+      
+      External command failed to finish.
+      
+    
+    
+      
+      Command <i>%1</i> failed to finish in %2 seconds.
+      
+    
+    
+      
+      External command finished with errors.
+      
+    
+    
+      
+      Command <i>%1</i> finished with exit code %2.
+      
+    
+  
+  
+    QObject
+    
+      
+      %1 (%2)
+      
+    
+    
+      
+      unknown
+      
+    
+    
+      
+      extended
+      
+    
+    
+      
+      unformatted
+      
+    
+    
+      
+      swap
+      
+    
+    
+      
+      
+      Default
+      
+    
+    
+      
+      
+      
+      
+      File not found
+      
+    
+    
+      
+      Path <pre>%1</pre> must be an absolute path.
+      
+    
+    
+      
+      Directory not found
+      
+    
+    
+      
+      
+      Could not create new random file <pre>%1</pre>.
+      
+    
+    
+      
+      No product
+      
+    
+    
+      
+      No description provided.
+      
+    
+    
+      
+      (no mount point)
+      
+    
+    
+      
+      Unpartitioned space or unknown partition table
+      
+    
+  
+  
+    Recommended
+    
+      
+      <p>This computer does not satisfy some of the recommended requirements for setting up %1.<br/>
+        Setup can continue, but some features might be disabled.</p>
+      
+    
+  
+  
+    RemoveUserJob
+    
+      
+      Remove live user from target system
+      
+    
+  
+  
+    RemoveVolumeGroupJob
+    
+      
+      
+      Remove Volume Group named %1.
+      
+    
+    
+      
+      Remove Volume Group named <strong>%1</strong>.
+      
+    
+    
+      
+      The installer failed to remove a volume group named '%1'.
+      
+    
+  
+  
+    ReplaceWidget
+    
+      
+      Form
+      
+    
+    
+      
+      Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition.
+      
+    
+    
+      
+      The selected item does not appear to be a valid partition.
+      
+    
+    
+      
+      %1 cannot be installed on empty space. Please select an existing partition.
+      
+    
+    
+      
+      %1 cannot be installed on an extended partition. Please select an existing primary or logical partition.
+      
+    
+    
+      
+      %1 cannot be installed on this partition.
+      
+    
+    
+      
+      Data partition (%1)
+      
+    
+    
+      
+      Unknown system partition (%1)
+      
+    
+    
+      
+      %1 system partition (%2)
+      
+    
+    
+      
+      <strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB.
+      
+    
+    
+      
+      <strong>%2</strong><br/><br/>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
+      
+    
+    
+      
+      
+      
+      <strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost.
+      
+    
+    
+      
+      The EFI system partition at %1 will be used for starting %2.
+      
+    
+    
+      
+      EFI system partition:
+      
+    
+  
+  
+    Requirements
+    
+      
+      <p>This computer does not satisfy the minimum requirements for installing %1.<br/>
+        Installation cannot continue.</p>
+      
+    
+    
+      
+      <p>This computer does not satisfy some of the recommended requirements for setting up %1.<br/>
+        Setup can continue, but some features might be disabled.</p>
+      
+    
+  
+  
+    ResizeFSJob
+    
+      
+      Resize Filesystem Job
+      
+    
+    
+      
+      Invalid configuration
+      
+    
+    
+      
+      The file-system resize job has an invalid configuration and will not run.
+      
+    
+    
+      
+      KPMCore not Available
+      
+    
+    
+      
+      Calamares cannot start KPMCore for the file-system resize job.
+      
+    
+    
+      
+      
+      
+      
+      
+      Resize Failed
+      
+    
+    
+      
+      The filesystem %1 could not be found in this system, and cannot be resized.
+      
+    
+    
+      
+      The device %1 could not be found in this system, and cannot be resized.
+      
+    
+    
+      
+      
+      The filesystem %1 cannot be resized.
+      
+    
+    
+      
+      
+      The device %1 cannot be resized.
+      
+    
+    
+      
+      The filesystem %1 must be resized, but cannot.
+      
+    
+    
+      
+      The device %1 must be resized, but cannot
+      
+    
+  
+  
+    ResizePartitionJob
+    
+      
+      Resize partition %1.
+      
+    
+    
+      
+      Resize <strong>%2MiB</strong> partition <strong>%1</strong> to <strong>%3MiB</strong>.
+      
+    
+    
+      
+      Resizing %2MiB partition %1 to %3MiB.
+      
+    
+    
+      
+      The installer failed to resize partition %1 on disk '%2'.
+      
+    
+  
+  
+    ResizeVolumeGroupDialog
+    
+      
+      Resize Volume Group
+      
+    
+  
+  
+    ResizeVolumeGroupJob
+    
+      
+      
+      Resize volume group named %1 from %2 to %3.
+      
+    
+    
+      
+      Resize volume group named <strong>%1</strong> from <strong>%2</strong> to <strong>%3</strong>.
+      
+    
+    
+      
+      The installer failed to resize a volume group named '%1'.
+      
+    
+  
+  
+    ResultsListDialog
+    
+      
+      For best results, please ensure that this computer:
+      
+    
+    
+      
+      System requirements
+      
+    
+  
+  
+    ScanningDialog
+    
+      
+      Scanning storage devices...
+      
+    
+    
+      
+      Partitioning
+      
+    
+  
+  
+    SetHostNameJob
+    
+      
+      Set hostname %1
+      
+    
+    
+      
+      Set hostname <strong>%1</strong>.
+      
+    
+    
+      
+      Setting hostname %1.
+      
+    
+    
+      
+      
+      Internal Error
+      
+    
+    
+      
+      
+      Cannot write hostname to target system
+      
+    
+  
+  
+    SetKeyboardLayoutJob
+    
+      
+      Set keyboard model to %1, layout to %2-%3
+      
+    
+    
+      
+      Failed to write keyboard configuration for the virtual console.
+      
+    
+    
+      
+      
+      
+      Failed to write to %1
+      
+    
+    
+      
+      Failed to write keyboard configuration for X11.
+      
+    
+    
+      
+      Failed to write keyboard configuration to existing /etc/default directory.
+      
+    
+  
+  
+    SetPartFlagsJob
+    
+      
+      Set flags on partition %1.
+      
+    
+    
+      
+      Set flags on %1MiB %2 partition.
+      
+    
+    
+      
+      Set flags on new partition.
+      
+    
+    
+      
+      Clear flags on partition <strong>%1</strong>.
+      
+    
+    
+      
+      Clear flags on %1MiB <strong>%2</strong> partition.
+      
+    
+    
+      
+      Clear flags on new partition.
+      
+    
+    
+      
+      Flag partition <strong>%1</strong> as <strong>%2</strong>.
+      
+    
+    
+      
+      Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>.
+      
+    
+    
+      
+      Flag new partition as <strong>%1</strong>.
+      
+    
+    
+      
+      Clearing flags on partition <strong>%1</strong>.
+      
+    
+    
+      
+      Clearing flags on %1MiB <strong>%2</strong> partition.
+      
+    
+    
+      
+      Clearing flags on new partition.
+      
+    
+    
+      
+      Setting flags <strong>%2</strong> on partition <strong>%1</strong>.
+      
+    
+    
+      
+      Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition.
+      
+    
+    
+      
+      Setting flags <strong>%1</strong> on new partition.
+      
+    
+    
+      
+      The installer failed to set flags on partition %1.
+      
+    
+  
+  
+    SetPasswordJob
+    
+      
+      Set password for user %1
+      
+    
+    
+      
+      Setting password for user %1.
+      
+    
+    
+      
+      Bad destination system path.
+      
+    
+    
+      
+      rootMountPoint is %1
+      
+    
+    
+      
+      Cannot disable root account.
+      
+    
+    
+      
+      passwd terminated with error code %1.
+      
+    
+    
+      
+      Cannot set password for user %1.
+      
+    
+    
+      
+      usermod terminated with error code %1.
+      
+    
+  
+  
+    SetTimezoneJob
+    
+      
+      Set timezone to %1/%2
+      
+    
+    
+      
+      Cannot access selected timezone path.
+      
+    
+    
+      
+      Bad path: %1
+      
+    
+    
+      
+      Cannot set timezone.
+      
+    
+    
+      
+      Link creation failed, target: %1; link name: %2
+      
+    
+    
+      
+      Cannot set timezone,
+      
+    
+    
+      
+      Cannot open /etc/timezone for writing
+      
+    
+  
+  
+    SetupGroupsJob
+    
+      
+      Preparing groups.
+      
+    
+    
+      
+      
+      Could not create groups in target system
+      
+    
+    
+      
+      These groups are missing in the target system: %1
+      
+    
+  
+  
+    SetupSudoJob
+    
+      
+      Configure <pre>sudo</pre> users.
+      
+    
+    
+      
+      Cannot chmod sudoers file.
+      
+    
+    
+      
+      Cannot create sudoers file for writing.
+      
+    
+  
+  
+    ShellProcessJob
+    
+      
+      Shell Processes Job
+      
+    
+  
+  
+    SlideCounter
+    
+      
+      %L1 / %L2
+      slide counter, %1 of %2 (numeric)
+      
+    
+  
+  
+    StandardButtons
+    
+      
+      &OK
+      
+    
+    
+      
+      &Yes
+      
+    
+    
+      
+      &No
+      
+    
+    
+      
+      &Cancel
+      
+    
+    
+      
+      &Close
+      
+    
+  
+  
+    TrackingInstallJob
+    
+      
+      Installation feedback
+      
+    
+    
+      
+      Sending installation feedback.
+      
+    
+    
+      
+      Internal error in install-tracking.
+      
+    
+    
+      
+      HTTP request timed out.
+      
+    
+  
+  
+    TrackingKUserFeedbackJob
+    
+      
+      KDE user feedback
+      
+    
+    
+      
+      Configuring KDE user feedback.
+      
+    
+    
+      
+      
+      Error in KDE user feedback configuration.
+      
+    
+    
+      
+      Could not configure KDE user feedback correctly, script error %1.
+      
+    
+    
+      
+      Could not configure KDE user feedback correctly, Calamares error %1.
+      
+    
+  
+  
+    TrackingMachineUpdateManagerJob
+    
+      
+      Machine feedback
+      
+    
+    
+      
+      Configuring machine feedback.
+      
+    
+    
+      
+      
+      Error in machine feedback configuration.
+      
+    
+    
+      
+      Could not configure machine feedback correctly, script error %1.
+      
+    
+    
+      
+      Could not configure machine feedback correctly, Calamares error %1.
+      
+    
+  
+  
+    TrackingPage
+    
+      
+      Form
+      
+    
+    
+      
+      Placeholder
+      
+    
+    
+      
+      <html><head/><body><p>Click here to send <span style=" font-weight:600;">no information at all</span> about your installation.</p></body></html>
+      
+    
+    
+      
+      <html><head/><body><p><a href="placeholder"><span style=" text-decoration: underline; color:#2980b9;">Click here for more information about user feedback</span></a></p></body></html>
+      
+    
+    
+      
+      Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area.
+      
+    
+    
+      
+      By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes.
+      
+    
+    
+      
+      By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1.
+      
+    
+    
+      
+      By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1.
+      
+    
+  
+  
+    TrackingViewStep
+    
+      
+      Feedback
+      
+    
+  
+  
+    UmountJob
+    
+      
+      Unmount file systems.
+      
+    
+    
+      
+      No target system available.
+      
+    
+    
+      
+      No rootMountPoint is set.
+      
+    
+  
+  
+    UsersPage
+    
+      
+      <small>If more than one person will use this computer, you can create multiple accounts after setup.</small>
+      
+    
+    
+      
+      <small>If more than one person will use this computer, you can create multiple accounts after installation.</small>
+      
+    
+  
+  
+    UsersQmlViewStep
+    
+      
+      Users
+      
+    
+  
+  
+    UsersViewStep
+    
+      
+      Users
+      
+    
+  
+  
+    VariantModel
+    
+      
+      Key
+      Column header for key/value
+      
+    
+    
+      
+      Value
+      Column header for key/value
+      
+    
+  
+  
+    VolumeGroupBaseDialog
+    
+      
+      Create Volume Group
+      
+    
+    
+      
+      List of Physical Volumes
+      
+    
+    
+      
+      Volume Group Name:
+      
+    
+    
+      
+      Volume Group Type:
+      
+    
+    
+      
+      Physical Extent Size:
+      
+    
+    
+      
+       MiB
+      
+    
+    
+      
+      Total Size:
+      
+    
+    
+      
+      Used Size:
+      
+    
+    
+      
+      Total Sectors:
+      
+    
+    
+      
+      Quantity of LVs:
+      
+    
+  
+  
+    WelcomePage
+    
+      
+      Form
+      
+    
+    
+      
+      
+      Select application and system language
+      
+    
+    
+      
+      Open donations website
+      
+    
+    
+      
+      &Donate
+      
+    
+    
+      
+      Open help and support website
+      
+    
+    
+      
+      &Support
+      
+    
+    
+      
+      Open issues and bug-tracking website
+      
+    
+    
+      
+      &Known issues
+      
+    
+    
+      
+      Open release notes website
+      
+    
+    
+      
+      &Release notes
+      
+    
+    
+      
+      %1 support
+      
+    
+    
+      
+      About %1 setup
+      
+    
+    
+      
+      About %1 installer
+      
+    
+  
+  
+    WelcomeQmlViewStep
+    
+      
+      Welcome
+      
+    
+  
+  
+    WelcomeViewStep
+    
+      
+      Welcome
+      
+    
+  
+  
+    ZfsJob
+    
+      
+      Create ZFS pools and datasets
+      
+    
+    
+      
+      Failed to create zpool on 
+      
+    
+    
+      
+      Configuration Error
+      
+    
+    
+      
+      No partitions are available for ZFS.
+      
+    
+    
+      
+      Internal data missing
+      
+    
+    
+      
+      
+      Failed to create zpool
+      
+    
+    
+      
+      Failed to create dataset
+      
+    
+    
+      
+      The output was: 
+      
+    
+  
+  
+    calamares-sidebar
+    
+      
+      About
+      
+    
+    
+      
+      Debug
+      
+    
+  
+  
+    finishedq
+    
+      
+      Installation Completed
+      
+    
+    
+      
+      %1 has been installed on your computer.<br/>
+            You may now restart into your new system, or continue using the Live environment.
+      
+    
+    
+      
+      Close Installer
+      
+    
+    
+      
+      Restart System
+      
+    
+    
+      
+      <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/>
+            This log is copied to /var/log/installation.log of the target system.</p>
+      
+    
+  
+  
+    finishedq@mobile
+    
+      
+      Installation Completed
+      
+    
+    
+      
+      %1 has been installed on your computer.<br/>
+            You may now restart your device.
+      
+    
+    
+      
+      Close
+      
+    
+    
+      
+      Restart
+      
+    
+  
+  
+    i18n
+    
+      
+      <h1>Languages</h1> </br>
+                    The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>.
+      
+    
+    
+      
+      <h1>Locales</h1> </br>
+                    The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>.
+      
+    
+    
+      
+      Back
+      
+    
+  
+  
+    keyboardq
+    
+      
+      To activate keyboard preview, select a layout.
+      
+    
+    
+      
+      Keyboard Model:
+      
+    
+    
+      
+      Layouts
+      
+    
+    
+      
+      Type here to test your keyboard
+      
+    
+    
+      
+      Variants
+      
+    
+  
+  
+    localeq
+    
+      
+      Change
+      
+    
+  
+  
+    notesqml
+    
+      
+      <h3>%1</h3>
+            <p>These are example release notes.</p>
+      
+    
+  
+  
+    packagechooserq
+    
+      
+      LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
+                    Default option.
+      
+    
+    
+      
+      LibreOffice
+      
+    
+    
+      
+      If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
+      
+    
+    
+      
+      No Office Suite
+      
+    
+    
+      
+      Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
+      
+    
+    
+      
+      Minimal Install
+      
+    
+    
+      
+      Please select an option for your install, or use the default: LibreOffice included.
+      
+    
+  
+  
+    release_notes
+    
+      
+      <h3>%1</h3>
+            <p>This an example QML file, showing options in RichText with Flickable content.</p>
+
+            <p>QML with RichText can use HTML tags, Flickable content is useful for touchscreens.</p>
+
+            <p><b>This is bold text</b></p>
+            <p><i>This is italic text</i></p>
+            <p><u>This is underlined text</u></p>
+            <p><center>This text will be center-aligned.</center></p>
+            <p><s>This is strikethrough</s></p>
+
+            <p>Code example:
+            <code>ls -l /home</code></p>
+
+            <p><b>Lists:</b></p>
+            <ul>
+                <li>Intel CPU systems</li>
+                <li>AMD CPU systems</li>
+            </ul>
+
+            <p>The vertical scrollbar is adjustable, current width set to 10.</p>
+      
+    
+    
+      
+      Back
+      
+    
+  
+  
+    usersq
+    
+      
+      Pick your user name and credentials to login and perform admin tasks
+      
+    
+    
+      
+      What is your name?
+      
+    
+    
+      
+      Your Full Name
+      
+    
+    
+      
+      What name do you want to use to log in?
+      
+    
+    
+      
+      Login Name
+      
+    
+    
+      
+      If more than one person will use this computer, you can create multiple accounts after installation.
+      
+    
+    
+      
+      Only lowercase letters, numbers, underscore and hyphen are allowed.
+      
+    
+    
+      
+      root is not allowed as username.
+      
+    
+    
+      
+      What is the name of this computer?
+      
+    
+    
+      
+      Computer Name
+      
+    
+    
+      
+      This name will be used if you make the computer visible to others on a network.
+      
+    
+    
+      
+      localhost is not allowed as hostname.
+      
+    
+    
+      
+      Choose a password to keep your account safe.
+      
+    
+    
+      
+      Password
+      
+    
+    
+      
+      Repeat Password
+      
+    
+    
+      
+      Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
+      
+    
+    
+      
+      Validate passwords quality
+      
+    
+    
+      
+      When this box is checked, password-strength checking is done and you will not be able to use a weak password.
+      
+    
+    
+      
+      Log in automatically without asking for the password
+      
+    
+    
+      
+      Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
+    
+      
+      Reuse user password as root password
+      
+    
+    
+      
+      Use the same password for the administrator account.
+      
+    
+    
+      
+      Choose a root password to keep your account safe.
+      
+    
+    
+      
+      Root Password
+      
+    
+    
+      
+      Repeat Root Password
+      
+    
+    
+      
+      Enter the same password twice, so that it can be checked for typing errors.
+      
+    
+  
+  
+    welcomeq
+    
+      
+      <h3>Welcome to the %1 <quote>%2</quote> installer</h3>
+            <p>This program will ask you some questions and set up %1 on your computer.</p>
+      
+    
+    
+      
+      Support
+      
+    
+    
+      
+      Known issues
+      
+    
+    
+      
+      Release notes
+      
+    
+    
+      
+      Donate
+      
+    
+  
+

From 1f237cd373f9de1f738e3108ff68dd4d45a61358 Mon Sep 17 00:00:00 2001
From: Calamares CI 
Date: Fri, 17 Jun 2022 22:20:17 +0200
Subject: [PATCH 12/91] i18n: [python] Automatic merge of Transifex
 translations

---
 lang/python/uz/LC_MESSAGES/python.po | 402 +++++++++++++++++++++++++++
 1 file changed, 402 insertions(+)
 create mode 100644 lang/python/uz/LC_MESSAGES/python.po

diff --git a/lang/python/uz/LC_MESSAGES/python.po b/lang/python/uz/LC_MESSAGES/python.po
new file mode 100644
index 000000000..8ab5489f9
--- /dev/null
+++ b/lang/python/uz/LC_MESSAGES/python.po
@@ -0,0 +1,402 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR , YEAR.
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-05-29 16:17+0200\n"
+"PO-Revision-Date: 2017-08-09 10:34+0000\n"
+"Language-Team: Uzbek (https://www.transifex.com/calamares/teams/20061/uz/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: uz\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: 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/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: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/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/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/mount/main.py:253
+msgid "zfs mounting error"
+msgstr ""
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr ""
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr ""
+
+#: src/modules/services-systemd/main.py:60
+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."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:254
+msgid "rsync failed with error code {}."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:299
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:314
+msgid "Starting to unpack {}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:467
+msgid "Failed to unpack image \"{}\""
+msgstr ""
+
+#: src/modules/unpackfs/main.py:430
+msgid "No mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:431
+msgid "globalstorage does not contain a \"rootMountPoint\" key."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:434
+msgid "Bad mount point for root partition"
+msgstr ""
+
+#: 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 ""
+
+#: src/modules/unpackfs/main.py:460
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: 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 ""
+
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:993
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr ""
+
+#: 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/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 ""

From 4420120b553809d4cb68f25fb6af2ccc0525baa7 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Fri, 17 Jun 2022 23:29:55 +0200
Subject: [PATCH 13/91] i18n: update language lists, welcome back Uzbek

---
 CMakeLists.txt | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

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

From d80661211cb5477932d6ad8e38f42df2c0ce2824 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Sat, 18 Jun 2022 00:23:21 +0200
Subject: [PATCH 14/91] [libcalamares] Introduce convenience for reading Locale
 map

---
 src/libcalamares/locale/Global.cpp | 13 +++++++++++++
 src/libcalamares/locale/Global.h   |  6 ++++++
 2 files changed, 19 insertions(+)

diff --git a/src/libcalamares/locale/Global.cpp b/src/libcalamares/locale/Global.cpp
index a23a10478..c9fb27fbc 100644
--- a/src/libcalamares/locale/Global.cpp
+++ b/src/libcalamares/locale/Global.cpp
@@ -73,6 +73,19 @@ clearGS( Calamares::GlobalStorage& gs )
     gs.remove( gsKey );
 }
 
+QString
+readGS( Calamares::GlobalStorage& gs, const QString& key )
+{
+    if ( gs.contains( gsKey ) )
+    {
+        QVariantMap localeConf = gs.value( gsKey ).toMap();
+        if ( localeConf.contains( key ) )
+        {
+            return localeConf.value( key ).toString();
+        }
+    }
+    return QString();
+}
 
 }  // namespace Locale
 }  // namespace CalamaresUtils
diff --git a/src/libcalamares/locale/Global.h b/src/libcalamares/locale/Global.h
index abcf43dcd..cf23ef7df 100644
--- a/src/libcalamares/locale/Global.h
+++ b/src/libcalamares/locale/Global.h
@@ -74,6 +74,12 @@ DLLEXPORT void removeGS( Calamares::GlobalStorage& gs, const QString& key );
  */
 DLLEXPORT void clearGS( Calamares::GlobalStorage& gs );
 
+/** @brief Gets a value from the *localeConf* map in @p gs
+ *
+ * If the key is not set (or doesn't exist), returns QString().
+ */
+DLLEXPORT QString readGS( Calamares::GlobalStorage& gs, const QString& key );
+
 }  // namespace Locale
 }  // namespace CalamaresUtils
 

From 2478570debbe7b08c0dc4110d2962c238bc44095 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Sat, 18 Jun 2022 00:40:26 +0200
Subject: [PATCH 15/91] [libcalamares, keyboard] Use convenience for getting
 current locale

---
 src/libcalamares/PythonJobApi.cpp | 26 +++++++++++---------------
 src/modules/keyboard/Config.cpp   |  3 ++-
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/src/libcalamares/PythonJobApi.cpp b/src/libcalamares/PythonJobApi.cpp
index 3532d8f32..93297436d 100644
--- a/src/libcalamares/PythonJobApi.cpp
+++ b/src/libcalamares/PythonJobApi.cpp
@@ -13,6 +13,7 @@
 #include "GlobalStorage.h"
 #include "JobQueue.h"
 #include "PythonHelper.h"
+#include "locale/Global.h"
 #include "partition/Mount.h"
 #include "utils/CalamaresUtilsSystem.h"
 #include "utils/Logger.h"
@@ -280,24 +281,19 @@ _gettext_languages()
     Calamares::GlobalStorage* gs
         = jq ? jq->globalStorage() : CalamaresPython::GlobalStoragePythonWrapper::globalStorageInstance();
 
-    QVariant localeConf_ = gs->value( "localeConf" );
-    if ( localeConf_.canConvert< QVariantMap >() )
+    QString lang = CalamaresUtils::Locale::readGS( *gs, QStringLiteral( "LANG" ) );
+    if ( !lang.isEmpty() )
     {
-        QVariant lang_ = localeConf_.value< QVariantMap >()[ "LANG" ];
-        if ( lang_.canConvert< QString >() )
+        languages.append( lang );
+        if ( lang.indexOf( '.' ) > 0 )
         {
-            QString lang = lang_.value< QString >();
+            lang.truncate( lang.indexOf( '.' ) );
+            languages.append( lang );
+        }
+        if ( lang.indexOf( '_' ) > 0 )
+        {
+            lang.truncate( lang.indexOf( '_' ) );
             languages.append( lang );
-            if ( lang.indexOf( '.' ) > 0 )
-            {
-                lang.truncate( lang.indexOf( '.' ) );
-                languages.append( lang );
-            }
-            if ( lang.indexOf( '_' ) > 0 )
-            {
-                lang.truncate( lang.indexOf( '_' ) );
-                languages.append( lang );
-            }
         }
     }
     return languages;
diff --git a/src/modules/keyboard/Config.cpp b/src/modules/keyboard/Config.cpp
index 9afaef5f3..e7ffc6555 100644
--- a/src/modules/keyboard/Config.cpp
+++ b/src/modules/keyboard/Config.cpp
@@ -15,6 +15,7 @@
 
 #include "GlobalStorage.h"
 #include "JobQueue.h"
+#include "locale/Global.h"
 #include "utils/Logger.h"
 #include "utils/RAII.h"
 #include "utils/Retranslator.h"
@@ -483,7 +484,7 @@ Config::guessLocaleKeyboardLayout()
 
     // Try to preselect a layout, depending on language and locale
     Calamares::GlobalStorage* gs = Calamares::JobQueue::instance()->globalStorage();
-    QString lang = gs->value( "localeConf" ).toMap().value( "LANG" ).toString();
+    QString lang = CalamaresUtils::Locale::readGS( *gs, QStringLiteral( "LANG" ) );
 
     cDebug() << "Got locale language" << lang;
     if ( !lang.isEmpty() )

From 79db04dc2eb00b354044f73c054a94fe2b9f9aae Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Sat, 18 Jun 2022 11:48:50 +0200
Subject: [PATCH 16/91] [locale] Defer to the locale-service idea of LANG

- Using QLocale().name() loses some special locales that
  Calamares understands but Qt does not (e.g. sr@latn, ca@valencia)
  so do it in two steps.
---
 src/modules/locale/Config.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/modules/locale/Config.cpp b/src/modules/locale/Config.cpp
index 5888fd071..b6378b03d 100644
--- a/src/modules/locale/Config.cpp
+++ b/src/modules/locale/Config.cpp
@@ -305,8 +305,14 @@ Config::automaticLocaleConfiguration() const
     {
         return LocaleConfiguration();
     }
-    return LocaleConfiguration::fromLanguageAndLocation(
-        QLocale().name(), supportedLocales(), currentLocation()->country() );
+
+    auto* gs = Calamares::JobQueue::instance()->globalStorage();
+    QString lang = CalamaresUtils::Locale::readGS( *gs, QStringLiteral( "LANG" ) );
+    if ( lang.isEmpty() )
+    {
+        lang = QLocale().name();
+    }
+    return LocaleConfiguration::fromLanguageAndLocation( lang, supportedLocales(), currentLocation()->country() );
 }
 
 LocaleConfiguration

From 7f7e4aa1ae5a7c5090b4427ec53fa9859e1217bd Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Sat, 18 Jun 2022 12:33:02 +0200
Subject: [PATCH 17/91] [locale] Expand tests to language-matching

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

diff --git a/src/modules/locale/Tests.cpp b/src/modules/locale/Tests.cpp
index 6fe9d5662..6acd2cabb 100644
--- a/src/modules/locale/Tests.cpp
+++ b/src/modules/locale/Tests.cpp
@@ -40,6 +40,8 @@ private Q_SLOTS:
 
     // Check the Config loading
     void testConfigInitialization();
+    void testLanguageDetection_data();
+    void testLanguageDetection();
 };
 
 QTEST_MAIN( LocaleTests )
@@ -267,6 +269,50 @@ LocaleTests::testConfigInitialization()
     QVERIFY( !c.currentLocationStatus().isEmpty() );
 }
 
+void
+LocaleTests::testLanguageDetection_data()
+{
+    QTest::addColumn< QString >( "locale" );
+    QTest::addColumn< QString >( "country" );
+    QTest::addColumn< QString >( "expected" );
+
+    QTest::newRow( "english (US)" ) << QStringLiteral( "en" ) << QStringLiteral( "US" ) << QStringLiteral( "en_US" );
+    QTest::newRow( "english (CA)" ) << QStringLiteral( "en" ) << QStringLiteral( "CA" ) << QStringLiteral( "en" );
+    QTest::newRow( "english (GB)" ) << QStringLiteral( "en" ) << QStringLiteral( "GB" ) << QStringLiteral( "en_GB" );
+    QTest::newRow( "english (NL)" ) << QStringLiteral( "en" ) << QStringLiteral( "NL" ) << QStringLiteral( "en" );
+
+    QTest::newRow( "portuguese (PT)" ) << QStringLiteral( "pt" ) << QStringLiteral( "PT" ) << QStringLiteral( "pt" );
+    QTest::newRow( "portuguese (NL)" ) << QStringLiteral( "pt" ) << QStringLiteral( "NL" ) << QStringLiteral( "pt" );
+    QTest::newRow( "portuguese (BR)" ) << QStringLiteral( "pt" ) << QStringLiteral( "BR" ) << QStringLiteral( "pt_BR" );
+
+    QTest::newRow( "catalan ()" ) << QStringLiteral( "ca" ) << QStringLiteral( "" )
+                                  << QStringLiteral( "ca_ES" );  // no country given? Matches first
+    QTest::newRow( "catalan (ES)" ) << QStringLiteral( "ca" ) << QStringLiteral( "ES" ) << QStringLiteral( "ca_ES" );
+    QTest::newRow( "catalan (NL)" ) << QStringLiteral( "ca" ) << QStringLiteral( "NL" ) << QStringLiteral( "ca" );
+    QTest::newRow( "catalan (@valencia)" )
+        << QStringLiteral( "ca@valencia" ) << QStringLiteral( "ES" ) << QStringLiteral( "ca@valencia" );
+    QTest::newRow( "catalan (@valencia_NL)" )
+        << QStringLiteral( "ca@valencia" ) << QStringLiteral( "NL" ) << QStringLiteral( "ca@valencia" );
+}
+
+
+void
+LocaleTests::testLanguageDetection()
+{
+    // This **might** be representative
+    static const QStringList availableLocales { "en.UTF-8",         "en_US.UTF-8", "en_GB.UTF-8", "fr.UTF-8",
+                                                "pt.UTF-8",         "pt_BR.UTF-8", "ca.UTF-8",    "ca_ES.UTF-8",
+                                                "es.UTF-8",         "es_ES.UTF-8", "sr.UTF-8",    "sr@latin.UTF-8",
+                                                "ca@valencia.UTF-8" };
+
+    QFETCH( QString, locale );
+    QFETCH( QString, country );
+    QFETCH( QString, expected );
+
+    auto r = LocaleConfiguration::fromLanguageAndLocation( locale, availableLocales, country );
+    QCOMPARE( r.language(), expected + QStringLiteral( ".UTF-8" ) );
+}
+
 
 #include "utils/moc-warnings.h"
 

From b7dcf55d4cf39b7611c10aa0946bed918a739abc Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Sat, 18 Jun 2022 12:34:44 +0200
Subject: [PATCH 18/91] [locale] Add debug while mapping language+country

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

diff --git a/src/modules/locale/LocaleConfiguration.cpp b/src/modules/locale/LocaleConfiguration.cpp
index b7b895290..e6de826dd 100644
--- a/src/modules/locale/LocaleConfiguration.cpp
+++ b/src/modules/locale/LocaleConfiguration.cpp
@@ -46,11 +46,13 @@ LocaleConfiguration::fromLanguageAndLocation( const QString& languageLocale,
                                               const QStringList& availableLocales,
                                               const QString& countryCode )
 {
+    cDebug() << "Mapping" << languageLocale << "in" << countryCode << "to locale.";
     QString language = languageLocale.split( '_' ).first();
 
     // Either an exact match, or the whole language part matches
     // (followed by . or _
     QStringList linesForLanguage = availableLocales.filter( QRegularExpression( language + "[._]" ) );
+    cDebug() << Logger::SubEntry << "Matching" << linesForLanguage;
 
     QString lang;
     if ( linesForLanguage.length() == 0 || languageLocale.isEmpty() )

From f4fb4954886c36fbda7da55eac101577ae13f348 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Sun, 19 Jun 2022 12:34:12 +0200
Subject: [PATCH 19/91] CI: replace 'prepare' step with a script in the
 Calamares repo

---
 .github/workflows/nightly-opensuse.yml | 45 +++++++++++++++++++++++++-
 1 file changed, 44 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/nightly-opensuse.yml b/.github/workflows/nightly-opensuse.yml
index 469632f0a..0bc0e74e7 100644
--- a/.github/workflows/nightly-opensuse.yml
+++ b/.github/workflows/nightly-opensuse.yml
@@ -22,7 +22,50 @@ jobs:
       options: --tmpfs /build:rw --user 0:0
     steps:
       - name: "prepare env"
-        uses: calamares/actions/prepare-opensuse@0947b82b55adbb1055018d706da46eb70f8bcce5
+        shell: bash
+        run: |
+          zypper --non-interactive up
+          zypper --non-interactive in git-core jq curl
+          # From deploycala.py
+          zypper --non-interactive in \
+            "autoconf" \
+            "automake" \
+            "bison" \
+            "flex" \
+            "git" \
+            "libtool" \
+            "m4" \
+            "make" \
+            "cmake" \
+            "extra-cmake-modules" \
+            "gcc-c++"
+          zypper --non-interactive in \
+            "libqt5-qtbase-devel" \
+            "libqt5-linguist-devel" \
+            "libqt5-qtsvg-devel" \
+            "libqt5-qtdeclarative-devel" \
+            "libqt5-qtwebengine-devel" \
+            "yaml-cpp-devel" \
+            "libpolkit-qt5-1-devel" \
+            "libpwquality-devel" \
+            "parted-devel" \
+            "python-devel" \
+            "libboost_headers-devel" \
+            "libboost_python3-devel"
+          zypper --non-interactive in \
+            "kdbusaddons-devel" \
+            "kservice-devel" \
+            "kpackage-devel" \
+            "kparts-devel" \
+            "kcrash-devel" \
+            "kpmcore-devel" \
+            "plasma5-workspace-devel" \
+            "plasma-framework-devel" \
+          # Additional dependencies
+          zypper --non-interactive in \
+            libicu-devel \
+            libAppStreamQt-devel \
+            libatasmart-devel
       - name: "prepare source"
         uses: calamares/actions/generic-checkout@v4
       - name: "build"

From ed5149c17f297895046cea9fc1461b90c235574a Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Sun, 19 Jun 2022 12:43:12 +0200
Subject: [PATCH 20/91] CI: on 3.2 branch, check for 3.2 branch

---
 .github/workflows/push.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index cf1505f17..8861efa48 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -3,8 +3,7 @@ name: ci-push
 on:
   push:
     branches:
-      - calamares
-      - work-3.3
+      - 3.2.x-stable
   pull_request:
     types:
       - opened

From b8b7b10bfd9707702d6de16a77f374488de856af Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Sun, 19 Jun 2022 14:17:12 +0200
Subject: [PATCH 21/91] [locale] Be more chatty when loading locales

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

diff --git a/src/modules/locale/Config.cpp b/src/modules/locale/Config.cpp
index b6378b03d..2357019a7 100644
--- a/src/modules/locale/Config.cpp
+++ b/src/modules/locale/Config.cpp
@@ -40,6 +40,7 @@
 static QStringList
 loadLocales( const QString& localeGenPath )
 {
+    Logger::Once o;
     QStringList localeGenLines;
 
     // Some distros come with a meaningfully commented and easy to parse locale.gen,
@@ -52,6 +53,7 @@ loadLocales( const QString& localeGenPath )
 
     if ( supported.exists() && supported.open( QIODevice::ReadOnly | QIODevice::Text ) )
     {
+        cDebug() << o << "Loading locales from" << supported.fileName();
         ba = supported.readAll();
         supported.close();
 
@@ -66,6 +68,7 @@ loadLocales( const QString& localeGenPath )
         QFile localeGen( localeGenPath );
         if ( localeGen.open( QIODevice::ReadOnly | QIODevice::Text ) )
         {
+            cDebug() << o << "Loading locales from" << localeGenPath;
             ba = localeGen.readAll();
             localeGen.close();
         }
@@ -115,6 +118,10 @@ loadLocales( const QString& localeGenPath )
                    << "* a complete pre-compiled locale-gen database which allows complete locale -a output.";
         return localeGenLines;  // something went wrong and there's nothing we can do about it.
     }
+    else
+    {
+        cDebug() << o << "Read" << localeGenLines.length() << "lines";
+    }
 
     // Assuming we have a list of supported locales, we usually only want UTF-8 ones
     // because it's not 1995.
@@ -134,6 +141,7 @@ loadLocales( const QString& localeGenPath )
         s = s.simplified();
     };
     std::for_each( localeGenLines.begin(), localeGenLines.end(), unredundant );
+    cDebug() << o << "After filtering" << localeGenLines.length() << "lines";
 
     return localeGenLines;
 }

From 40d8e1e0f6bff35bcdd6c6b99d25dbea5fc9fb4f Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Sun, 19 Jun 2022 14:37:54 +0200
Subject: [PATCH 22/91] [locale] Expand tests for matching-valencia locales

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

diff --git a/src/modules/locale/Tests.cpp b/src/modules/locale/Tests.cpp
index 6acd2cabb..7f7179fe5 100644
--- a/src/modules/locale/Tests.cpp
+++ b/src/modules/locale/Tests.cpp
@@ -42,6 +42,7 @@ private Q_SLOTS:
     void testConfigInitialization();
     void testLanguageDetection_data();
     void testLanguageDetection();
+    void testLanguageDetectionValencia();
 };
 
 QTEST_MAIN( LocaleTests )
@@ -313,6 +314,26 @@ LocaleTests::testLanguageDetection()
     QCOMPARE( r.language(), expected + QStringLiteral( ".UTF-8" ) );
 }
 
+void
+LocaleTests::testLanguageDetectionValencia()
+{
+    Logger::setupLogLevel( Logger::LOGDEBUG );
+    static const QStringList availableLocales { "nl_AW",       "nl_BE.UTF-8", "nl_NL.UTF-8",
+                                                "en_AU.UTF-8", "en_US.UTF-8", "en_GB.UTF-8",
+                                                "ca_AD.UTF-8", "ca_ES.UTF-8", "ca_ES@valencia" };
+
+    {
+        auto r = LocaleConfiguration::fromLanguageAndLocation(
+            QStringLiteral( "nl" ), availableLocales, QStringLiteral( "NL" ) );
+        QCOMPARE( r.language(), "nl_NL.UTF-8" );
+    }
+    {
+        auto r = LocaleConfiguration::fromLanguageAndLocation(
+            QStringLiteral( "ca@valencia" ), availableLocales, QStringLiteral( "NL" ) );
+        QCOMPARE( r.language(), "ca@valencia" );
+    }
+}
+
 
 #include "utils/moc-warnings.h"
 

From 18626901d3fd5420e3ec0c0ff4ef446417dfb2ea Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Sun, 19 Jun 2022 14:49:46 +0200
Subject: [PATCH 23/91] [locale] Improve regional variant lookup

---
 src/modules/locale/LocaleConfiguration.cpp | 24 ++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/src/modules/locale/LocaleConfiguration.cpp b/src/modules/locale/LocaleConfiguration.cpp
index e6de826dd..513b576f5 100644
--- a/src/modules/locale/LocaleConfiguration.cpp
+++ b/src/modules/locale/LocaleConfiguration.cpp
@@ -48,6 +48,13 @@ LocaleConfiguration::fromLanguageAndLocation( const QString& languageLocale,
 {
     cDebug() << "Mapping" << languageLocale << "in" << countryCode << "to locale.";
     QString language = languageLocale.split( '_' ).first();
+    QString region;
+    if ( language.contains( '@' ) )
+    {
+        auto r = language.split( '@' );
+        language = r.first();
+        region = r[ 1 ];  // second()
+    }
 
     // Either an exact match, or the whole language part matches
     // (followed by . or _
@@ -75,16 +82,33 @@ LocaleConfiguration::fromLanguageAndLocation( const QString& languageLocale,
         # locale categories reflect the selected location. */
     if ( language == "pt" || language == "zh" )
     {
+        cDebug() << Logger::SubEntry << "Special-case Portuguese and Chinese";
         QString proposedLocale = QString( "%1_%2" ).arg( language ).arg( countryCode );
         for ( const QString& line : linesForLanguage )
         {
             if ( line.contains( proposedLocale ) )
             {
+                cDebug() << Logger::SubEntry << "Country-variant" << line << "chosen.";
                 lang = line;
                 break;
             }
         }
     }
+    if ( lang.isEmpty() && !region.isEmpty() )
+    {
+        cDebug() << Logger::SubEntry << "Special-case region @" << region;
+        QString proposedRegion = QString( "@%1" ).arg( region );
+        for ( const QString& line : linesForLanguage )
+        {
+            if ( line.startsWith( language ) && line.contains( proposedRegion ) )
+            {
+                cDebug() << Logger::SubEntry << "Region-variant" << line << "chosen.";
+                lang = line;
+                break;
+            }
+        }
+    }
+
 
     // If we found no good way to set a default lang, do a search with the whole
     // language locale and pick the first result, if any.

From 82b19a631463ff781eb636a819bde47014723cd5 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Sun, 19 Jun 2022 15:25:23 +0200
Subject: [PATCH 24/91] [locale] Fix up handling of regional variants,
 country-specifics

- expand tests to include Serbian variants
- massage detection code to do better filtering based on
  country-selection (so "American English" doesn't later
  pick "English" with Antigua and Barbados for locale)
---
 src/modules/locale/LocaleConfiguration.cpp | 44 ++++++++++++---
 src/modules/locale/Tests.cpp               | 65 ++++++++++++++--------
 2 files changed, 78 insertions(+), 31 deletions(-)

diff --git a/src/modules/locale/LocaleConfiguration.cpp b/src/modules/locale/LocaleConfiguration.cpp
index 513b576f5..17953f079 100644
--- a/src/modules/locale/LocaleConfiguration.cpp
+++ b/src/modules/locale/LocaleConfiguration.cpp
@@ -62,7 +62,7 @@ LocaleConfiguration::fromLanguageAndLocation( const QString& languageLocale,
     cDebug() << Logger::SubEntry << "Matching" << linesForLanguage;
 
     QString lang;
-    if ( linesForLanguage.length() == 0 || languageLocale.isEmpty() )
+    if ( linesForLanguage.isEmpty() || languageLocale.isEmpty() )
     {
         lang = "en_US.UTF-8";
     }
@@ -72,6 +72,16 @@ LocaleConfiguration::fromLanguageAndLocation( const QString& languageLocale,
     }
 
     // lang could still be empty if we found multiple locales that satisfy myLanguage
+    const QString combinedLanguageAndCountry = QString( "%1_%2" ).arg( language ).arg( countryCode );
+    if ( lang.isEmpty() && region.isEmpty() )
+    {
+        auto l = linesForLanguage.filter(
+            QRegularExpression( combinedLanguageAndCountry + "[._]" ) );  // no regional variants
+        if ( l.length() == 1 )
+        {
+            lang = l.first();
+        }
+    }
 
     // The following block was inspired by Ubiquity, scripts/localechooser-apply.
     // No copyright statement found in file, assuming GPL v2 or later.
@@ -178,15 +188,33 @@ LocaleConfiguration::fromLanguageAndLocation( const QString& languageLocale,
     // We make a proposed locale based on the UI language and the timezone's country. There is no
     // guarantee that this will be a valid, supported locale (often it won't).
     QString lc_formats;
-    QString combined = QString( "%1_%2" ).arg( language ).arg( countryCode );
-    // We look up if it's a supported locale.
-    for ( const QString& line : availableLocales )
+    const QString combined = QString( "%1_%2" ).arg( language ).arg( countryCode );
+    if ( lang.isEmpty() )
     {
-        if ( line.startsWith( combined ) )
+        cDebug() << Logger::SubEntry << "Looking up formats for" << combinedLanguageAndCountry;
+        // We look up if it's a supported locale.
+        for ( const QString& line : availableLocales )
         {
-            lang = line;
-            lc_formats = line;
-            break;
+            if ( line.startsWith( combinedLanguageAndCountry ) )
+            {
+                lang = line;
+                lc_formats = line;
+                break;
+            }
+        }
+    }
+    else
+    {
+        if ( availableLocales.contains( lang ) )
+        {
+            cDebug() << Logger::SubEntry << "Exact formats match for language tag" << lang;
+            lc_formats = lang;
+        }
+        else if ( availableLocales.contains( combinedLanguageAndCountry ) )
+        {
+            cDebug() << Logger::SubEntry << "Exact formats match for combined" << combinedLanguageAndCountry;
+            lang = combinedLanguageAndCountry;
+            lc_formats = combinedLanguageAndCountry;
         }
     }
 
diff --git a/src/modules/locale/Tests.cpp b/src/modules/locale/Tests.cpp
index 7f7179fe5..23f9b5b3e 100644
--- a/src/modules/locale/Tests.cpp
+++ b/src/modules/locale/Tests.cpp
@@ -277,50 +277,59 @@ LocaleTests::testLanguageDetection_data()
     QTest::addColumn< QString >( "country" );
     QTest::addColumn< QString >( "expected" );
 
-    QTest::newRow( "english (US)" ) << QStringLiteral( "en" ) << QStringLiteral( "US" ) << QStringLiteral( "en_US" );
-    QTest::newRow( "english (CA)" ) << QStringLiteral( "en" ) << QStringLiteral( "CA" ) << QStringLiteral( "en" );
-    QTest::newRow( "english (GB)" ) << QStringLiteral( "en" ) << QStringLiteral( "GB" ) << QStringLiteral( "en_GB" );
+    QTest::newRow( "english (US)" ) << QStringLiteral( "en" ) << QStringLiteral( "US" )
+                                    << QStringLiteral( "en_US.UTF-8" );
+    QTest::newRow( "english (CA)" ) << QStringLiteral( "en" ) << QStringLiteral( "CA" )
+                                    << QStringLiteral( "en" );  // because it's first in the list
+    QTest::newRow( "english (GB)" ) << QStringLiteral( "en" ) << QStringLiteral( "GB" )
+                                    << QStringLiteral( "en_GB.UTF-8" );
     QTest::newRow( "english (NL)" ) << QStringLiteral( "en" ) << QStringLiteral( "NL" ) << QStringLiteral( "en" );
 
-    QTest::newRow( "portuguese (PT)" ) << QStringLiteral( "pt" ) << QStringLiteral( "PT" ) << QStringLiteral( "pt" );
-    QTest::newRow( "portuguese (NL)" ) << QStringLiteral( "pt" ) << QStringLiteral( "NL" ) << QStringLiteral( "pt" );
-    QTest::newRow( "portuguese (BR)" ) << QStringLiteral( "pt" ) << QStringLiteral( "BR" ) << QStringLiteral( "pt_BR" );
+    QTest::newRow( "portuguese (PT)" ) << QStringLiteral( "pt" ) << QStringLiteral( "PT" )
+                                       << QStringLiteral( "pt_PT.UTF-8" );
+    QTest::newRow( "portuguese (NL)" ) << QStringLiteral( "pt" ) << QStringLiteral( "NL" )
+                                       << QStringLiteral( "pt_BR.UTF-8" );  // first
+    QTest::newRow( "portuguese (BR)" ) << QStringLiteral( "pt" ) << QStringLiteral( "BR" )
+                                       << QStringLiteral( "pt_BR.UTF-8" );
 
     QTest::newRow( "catalan ()" ) << QStringLiteral( "ca" ) << QStringLiteral( "" )
-                                  << QStringLiteral( "ca_ES" );  // no country given? Matches first
-    QTest::newRow( "catalan (ES)" ) << QStringLiteral( "ca" ) << QStringLiteral( "ES" ) << QStringLiteral( "ca_ES" );
-    QTest::newRow( "catalan (NL)" ) << QStringLiteral( "ca" ) << QStringLiteral( "NL" ) << QStringLiteral( "ca" );
-    QTest::newRow( "catalan (@valencia)" )
-        << QStringLiteral( "ca@valencia" ) << QStringLiteral( "ES" ) << QStringLiteral( "ca@valencia" );
+                                  << QStringLiteral( "ca_AD.UTF-8" );  // no country given? Matches first
+    QTest::newRow( "catalan (ES)" ) << QStringLiteral( "ca" ) << QStringLiteral( "ES" )
+                                    << QStringLiteral( "ca_ES.UTF-8" );
+    QTest::newRow( "catalan (NL)" ) << QStringLiteral( "ca" ) << QStringLiteral( "NL" )
+                                    << QStringLiteral( "ca_AD.UTF-8" );
+    QTest::newRow( "catalan (@valencia)" ) << QStringLiteral( "ca@valencia" ) << QStringLiteral( "ES" )
+                                           << QStringLiteral( "ca_ES@valencia" );  // Prefers regional variant
     QTest::newRow( "catalan (@valencia_NL)" )
-        << QStringLiteral( "ca@valencia" ) << QStringLiteral( "NL" ) << QStringLiteral( "ca@valencia" );
+        << QStringLiteral( "ca@valencia" ) << QStringLiteral( "NL" ) << QStringLiteral( "ca_ES@valencia" );
 }
 
 
+/*
+ * This list of available locales was created by grepping `/etc/locale.gen`
+ * on an EndeavourOS ISO image for a handful of representative locales.
+ */
+static const QStringList availableLocales {
+    "nl_AW",       "nl_BE.UTF-8", "nl_NL.UTF-8",    "en",          "en_AU.UTF-8", "en_US.UTF-8", "en_GB.UTF-8",
+    "ca_AD.UTF-8", "ca_ES.UTF-8", "ca_ES@valencia", "sr_ME",       "sr_RS",       "sr_RS@latin", "pt_BR.UTF-8",
+    "pt_PT.UTF-8", "es_AR.UTF-8", "es_ES.UTF-8",    "es_MX.UTF-8",
+};
+
 void
 LocaleTests::testLanguageDetection()
 {
-    // This **might** be representative
-    static const QStringList availableLocales { "en.UTF-8",         "en_US.UTF-8", "en_GB.UTF-8", "fr.UTF-8",
-                                                "pt.UTF-8",         "pt_BR.UTF-8", "ca.UTF-8",    "ca_ES.UTF-8",
-                                                "es.UTF-8",         "es_ES.UTF-8", "sr.UTF-8",    "sr@latin.UTF-8",
-                                                "ca@valencia.UTF-8" };
-
     QFETCH( QString, locale );
     QFETCH( QString, country );
     QFETCH( QString, expected );
 
     auto r = LocaleConfiguration::fromLanguageAndLocation( locale, availableLocales, country );
-    QCOMPARE( r.language(), expected + QStringLiteral( ".UTF-8" ) );
+    QCOMPARE( r.language(), expected );
 }
 
 void
 LocaleTests::testLanguageDetectionValencia()
 {
     Logger::setupLogLevel( Logger::LOGDEBUG );
-    static const QStringList availableLocales { "nl_AW",       "nl_BE.UTF-8", "nl_NL.UTF-8",
-                                                "en_AU.UTF-8", "en_US.UTF-8", "en_GB.UTF-8",
-                                                "ca_AD.UTF-8", "ca_ES.UTF-8", "ca_ES@valencia" };
 
     {
         auto r = LocaleConfiguration::fromLanguageAndLocation(
@@ -330,7 +339,17 @@ LocaleTests::testLanguageDetectionValencia()
     {
         auto r = LocaleConfiguration::fromLanguageAndLocation(
             QStringLiteral( "ca@valencia" ), availableLocales, QStringLiteral( "NL" ) );
-        QCOMPARE( r.language(), "ca@valencia" );
+        QCOMPARE( r.language(), "ca_ES@valencia" );
+    }
+    {
+        auto r = LocaleConfiguration::fromLanguageAndLocation(
+            QStringLiteral( "sr" ), availableLocales, QStringLiteral( "NL" ) );
+        QCOMPARE( r.language(), "sr_ME" );  // Because that one is first in the list
+    }
+    {
+        auto r = LocaleConfiguration::fromLanguageAndLocation(
+            QStringLiteral( "sr@latin" ), availableLocales, QStringLiteral( "NL" ) );
+        QCOMPARE( r.language(), "sr_RS@latin" );
     }
 }
 

From b11ee3abc583e571e588fd00afb99d1a528373e6 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Sun, 19 Jun 2022 15:34:20 +0200
Subject: [PATCH 25/91] [libcalamares] Add alternatives ca@valencia and
 ca_ES@valencia

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

diff --git a/src/libcalamares/locale/Translation.cpp b/src/libcalamares/locale/Translation.cpp
index 213d2b9a7..279949d3f 100644
--- a/src/libcalamares/locale/Translation.cpp
+++ b/src/libcalamares/locale/Translation.cpp
@@ -58,6 +58,12 @@ static constexpr const TranslationSpecialCase special_cases[] = {
       QLocale::Script::AnyScript,
       QLocale::Country::AnyCountry,
       "Català (València)" },
+    { "ca_ES@valencia",
+      catalan_regions,
+      QLocale::Language::Catalan,
+      QLocale::Script::AnyScript,
+      QLocale::Country::AnyCountry,
+      "Català (València)" },
     // Simplified Chinese, but drop the (China) from the name
     { "zh_CN",
       nullptr,

From 795256cba5e446ad64a749ef77e77709c13c290d Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Sun, 19 Jun 2022 16:00:41 +0200
Subject: [PATCH 26/91] Changes: release-related housekeeping

---
 CHANGES-3.2 | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/CHANGES-3.2 b/CHANGES-3.2
index b897c1b35..548b925a8 100644
--- a/CHANGES-3.2
+++ b/CHANGES-3.2
@@ -10,16 +10,26 @@ website will have to do for older versions.
 
 > Note that the 3.2 series is now in LTS / bug-fix-only mode.
 
-# 3.2.60 (unreleased) #
+# 3.2.60 (2022-06-19) #
 
-This release contains contributions from (alphabetically by first name):
- - No external contributors yet
+This is the first community-maintainence release of Calamares 3.2.
+Somewhat ironically, all the commits in the branch come from
+Adriaan de Groot -- the community is working in the 3.3 (*calamares*)
+branch.
 
 ## Core ##
- - No core changes yet
+ - No core changes
 
 ## Modules ##
- - No module changes yet
+ - *fstab* now warns when the mount options are empty (which is non-
+   sensical, and indicates that the configuration is bad).
+ - *locale* does a better job of preserving Catalan (Valencia)
+   across modules; previously it dropped the *Valencia*
+   after the locale module unless you specifically re-selected
+   `ca@valencia` in the locale module. (Reported by Lliurex)
+ - *welcome* now has text labels on the special buttons (nominally,
+   this is part of the core, but the *About* button was always on the
+   welcome page).
 
 
 # 3.2.59 (2022-05-29) #

From 6dbf9de06ee6821c34e042ab17a534bb51370e9b Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Sun, 19 Jun 2022 16:01:34 +0200
Subject: [PATCH 27/91] Changes: post-release housekeeping

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

diff --git a/CHANGES-3.2 b/CHANGES-3.2
index 548b925a8..3e5cc3db1 100644
--- a/CHANGES-3.2
+++ b/CHANGES-3.2
@@ -10,7 +10,19 @@ website will have to do for older versions.
 
 > Note that the 3.2 series is now in LTS / bug-fix-only mode.
 
-# 3.2.60 (2022-06-19) #
+# 3.2.61 (unreleased) #
+
+This release contains contributions from (alphabetically by first name):
+ - No external contributors yet
+
+## Core ##
+ - No core changes yet
+
+## Modules ##
+ - No module changes yet
+
+
+ # 3.2.60 (2022-06-19) #
 
 This is the first community-maintainence release of Calamares 3.2.
 Somewhat ironically, all the commits in the branch come from
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 80a8170bd..4782e11fd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,7 +41,7 @@
 # TODO:3.3: Require CMake 3.12
 cmake_minimum_required( VERSION 3.3 FATAL_ERROR )
 project( CALAMARES
-    VERSION 3.2.60
+    VERSION 3.2.61
     LANGUAGES C CXX
 )
 

From d9b456207624c9398b0590a928ca79942dd4c115 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Mon, 20 Jun 2022 21:48:22 +0200
Subject: [PATCH 28/91] Style: remove trailing ; after namespace

---
 src/libcalamaresui/widgets/ErrorDialog.h   | 4 ++--
 src/modules/partition/core/PartitionInfo.h | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/libcalamaresui/widgets/ErrorDialog.h b/src/libcalamaresui/widgets/ErrorDialog.h
index c4949a89c..28ca70f65 100644
--- a/src/libcalamaresui/widgets/ErrorDialog.h
+++ b/src/libcalamaresui/widgets/ErrorDialog.h
@@ -15,7 +15,7 @@
 namespace Ui
 {
 class ErrorDialog;
-}
+}  // namespace Ui
 
 namespace Calamares
 {
@@ -78,6 +78,6 @@ private:
     bool m_shouldOfferWebPaste = false;
 };
 
-};  // namespace Calamares
+}  // namespace Calamares
 
 #endif  // LIBCALAMARESUI_ERRORDIALOG_H
diff --git a/src/modules/partition/core/PartitionInfo.h b/src/modules/partition/core/PartitionInfo.h
index 53064abe5..387576c10 100644
--- a/src/modules/partition/core/PartitionInfo.h
+++ b/src/modules/partition/core/PartitionInfo.h
@@ -51,6 +51,6 @@ void reset( Partition* partition );
  */
 bool isDirty( Partition* partition );
 
-};  // namespace PartitionInfo
+}  // namespace PartitionInfo
 
 #endif /* PARTITIONINFO_H */

From 136ec3df585adb591844641af8fef04526470b1c Mon Sep 17 00:00:00 2001
From: Sunderland93 
Date: Wed, 22 Jun 2022 11:49:21 +0400
Subject: [PATCH 29/91] greetd: remove autologin copied from the Live ISO
 (fixes #1995)

---
 src/modules/displaymanager/main.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/modules/displaymanager/main.py b/src/modules/displaymanager/main.py
index 2b49a595c..cf80383ef 100644
--- a/src/modules/displaymanager/main.py
+++ b/src/modules/displaymanager/main.py
@@ -837,8 +837,12 @@ class DMgreetd(DisplayManager):
         else:
             self.config_data['default_session']['command'] = "agreety --cmd " + de_command
 
-        if do_autologin == True:
+        if do_autologin:
+            # Log in as user, with given DE
             self.config_data['initial_session'] = dict(command = de_command, user = username)
+        elif 'initial_session' in self.config_data:
+            # No autologin, remove any autologin that was copied from the live ISO
+            del self.config_data['initial_session']
 
         self.config_write()
 

From 464a9ac50352fefba1ef7dbac37383c6d64257ee Mon Sep 17 00:00:00 2001
From: Sunderland93 
Date: Wed, 22 Jun 2022 11:52:14 +0400
Subject: [PATCH 30/91] greetd: fix typo in gtkgreet path

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

diff --git a/src/modules/displaymanager/main.py b/src/modules/displaymanager/main.py
index cf80383ef..f908bc441 100644
--- a/src/modules/displaymanager/main.py
+++ b/src/modules/displaymanager/main.py
@@ -827,7 +827,7 @@ class DMgreetd(DisplayManager):
         self.config_load()
 
         de_command = default_desktop_environment.executable
-        if os.path.exists(self.os_path("usr/bin/gtkgreed")) and os.path.exists(self.os_path("usr/bin/cage")):
+        if os.path.exists(self.os_path("usr/bin/gtkgreet")) and os.path.exists(self.os_path("usr/bin/cage")):
             self.config_data['default_session']['command'] = "cage -s -- gtkgreet"
         elif os.path.exists(self.os_path("usr/bin/tuigreet")):
             tuigreet_base_cmd = "tuigreet --remember --time --issue --asterisks --cmd "

From 3b9aa272f723240e51465deb8a8daf944bf6cf7e Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Sun, 26 Jun 2022 21:53:24 +0200
Subject: [PATCH 31/91] Desktop: mark as single-main-window

Desktop environments that understand this (relatively new)
.desktop key won't offer multi-window-related functionality.
---
 calamares.desktop | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/calamares.desktop b/calamares.desktop
index 9a1416e16..29a32663e 100644
--- a/calamares.desktop
+++ b/calamares.desktop
@@ -3,14 +3,16 @@ Type=Application
 Version=1.0
 Name=Install System
 GenericName=System Installer
+Comment=Calamares — System Installer
 Keywords=calamares;system;installer;
 TryExec=calamares
 Exec=sh -c "pkexec calamares"
-Comment=Calamares — System Installer
+
+Categories=Qt;System;
 Icon=calamares
 Terminal=false
+SingleMainWindow=true
 StartupNotify=true
-Categories=Qt;System;
 X-AppStream-Ignore=true
 
 Name[ar]=تثبيت النظام 

From e80764a01ea827cd3de6bab70bb1023341037829 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Sun, 26 Jun 2022 21:59:53 +0200
Subject: [PATCH 32/91] 3rdparty: import KDSingleApplication

This was removed (in favor of DBus activation) but DBus activation
does not work; re-import the latest version, now under the MIT
license. Pull in only src/ and the license file, though.

https://github.com/KDAB/KDSingleApplication
9dc8b2f61638aa1c4dbf49d38f8b97178974409f
---
 .reuse/dep5                                   |   4 +
 3rdparty/kdsingleapplication/CMakeLists.txt   |  65 ++++
 .../KDSingleApplicationConfig.cmake.in        |   7 +
 3rdparty/kdsingleapplication/LICENSE.MIT.txt  |  22 ++
 .../kdsingleapplication.cpp                   | 123 +++++++
 .../kdsingleapplication/kdsingleapplication.h |  62 ++++
 .../kdsingleapplication_lib.h                 |  37 +++
 .../kdsingleapplication_localsocket.cpp       | 304 ++++++++++++++++++
 .../kdsingleapplication_localsocket_p.h       | 133 ++++++++
 3rdparty/kdsingleapplication/src.pro          |  20 ++
 10 files changed, 777 insertions(+)
 create mode 100644 3rdparty/kdsingleapplication/CMakeLists.txt
 create mode 100644 3rdparty/kdsingleapplication/KDSingleApplicationConfig.cmake.in
 create mode 100644 3rdparty/kdsingleapplication/LICENSE.MIT.txt
 create mode 100644 3rdparty/kdsingleapplication/kdsingleapplication.cpp
 create mode 100644 3rdparty/kdsingleapplication/kdsingleapplication.h
 create mode 100644 3rdparty/kdsingleapplication/kdsingleapplication_lib.h
 create mode 100644 3rdparty/kdsingleapplication/kdsingleapplication_localsocket.cpp
 create mode 100644 3rdparty/kdsingleapplication/kdsingleapplication_localsocket_p.h
 create mode 100644 3rdparty/kdsingleapplication/src.pro

diff --git a/.reuse/dep5 b/.reuse/dep5
index cfd836c01..09ac6c165 100644
--- a/.reuse/dep5
+++ b/.reuse/dep5
@@ -15,6 +15,10 @@ Files: man/calamares.8
 License: GPL-3.0-or-later
 Copyright: 2017 Jonathan Carter 
 
+Files: 3rdparty/kdsingleapplication/*
+License: MIT
+Copyright: Copyright (C) 2019-2021 Klarälvdalens Datakonsult AB, a KDAB Group company, info@ kdab.com
+
 ### BUILD ARTIFACTS / NOT SOURCE
 #
 # QRC Files are basically build artifacts
diff --git a/3rdparty/kdsingleapplication/CMakeLists.txt b/3rdparty/kdsingleapplication/CMakeLists.txt
new file mode 100644
index 000000000..c345a2b6a
--- /dev/null
+++ b/3rdparty/kdsingleapplication/CMakeLists.txt
@@ -0,0 +1,65 @@
+set(KDSINGLEAPPLICATION_SRCS
+	kdsingleapplication.cpp
+	kdsingleapplication_localsocket.cpp)
+
+set(KDSINGLEAPPLICATION_INSTALLABLE_INCLUDES
+       kdsingleapplication.h
+       kdsingleapplication_lib.h
+    )
+
+set(KDSINGLEAPPLICATION_NON_INSTALLABLE_INCLUDES
+       kdsingleapplication_localsocket_p.h
+   )
+
+if (${PROJECT_NAME}_STATIC)
+    add_library(kdsingleapplication STATIC ${KDSINGLEAPPLICATION_INSTALLABLE_INCLUDES} ${KDSINGLEAPPLICATION_SRCS})
+    target_compile_definitions(kdsingleapplication PUBLIC KDSINGLEAPPLICATION_STATIC_BUILD)
+else()
+    add_library(kdsingleapplication SHARED ${KDSINGLEAPPLICATION_INSTALLABLE_INCLUDES} ${KDSINGLEAPPLICATION_SRCS})
+    target_compile_definitions(kdsingleapplication PRIVATE KDSINGLEAPPLICATION_SHARED_BUILD)
+endif()
+
+include(GNUInstallDirs)
+
+set(KDSINGLEAPPLICATION_INCLUDEDIR ${CMAKE_INSTALL_INCLUDEDIR}/kdsingleapplication)
+
+target_include_directories(kdsingleapplication
+    PUBLIC
+        $
+        $
+    PRIVATE
+        ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+if (WIN32)
+    target_link_libraries(kdsingleapplication kernel32)
+endif()
+target_link_libraries(kdsingleapplication Qt5::Core Qt5::Network)
+
+install (FILES ${KDSINGLEAPPLICATION_INSTALLABLE_INCLUDES} DESTINATION ${KDSINGLEAPPLICATION_INCLUDEDIR})
+
+install (TARGETS kdsingleapplication
+         EXPORT kdsingleapplicationTargets
+         RUNTIME DESTINATION bin
+         LIBRARY DESTINATION lib
+         ARCHIVE DESTINATION lib
+)
+
+include(CMakePackageConfigHelpers)
+
+write_basic_package_version_file(
+    KDSingleApplicationConfigVersion.cmake
+    VERSION ${PACKAGE_VERSION}
+    COMPATIBILITY AnyNewerVersion
+    )
+
+install(EXPORT kdsingleapplicationTargets
+    FILE KDSingleApplicationTargets.cmake
+    NAMESPACE KDAB::
+    DESTINATION lib/cmake/KDSingleApplication
+    )
+configure_file(KDSingleApplicationConfig.cmake.in KDSingleApplicationConfig.cmake @ONLY)
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/KDSingleApplicationConfig.cmake"
+    "${CMAKE_CURRENT_BINARY_DIR}/KDSingleApplicationConfigVersion.cmake"
+    DESTINATION lib/cmake/KDSingleApplication
+    )
diff --git a/3rdparty/kdsingleapplication/KDSingleApplicationConfig.cmake.in b/3rdparty/kdsingleapplication/KDSingleApplicationConfig.cmake.in
new file mode 100644
index 000000000..0bfc1646b
--- /dev/null
+++ b/3rdparty/kdsingleapplication/KDSingleApplicationConfig.cmake.in
@@ -0,0 +1,7 @@
+include(CMakeFindDependencyMacro)
+
+find_dependency(Qt5Widgets REQUIRED)
+find_dependency(Qt5Network REQUIRED)
+
+# Add the targets file
+include("${CMAKE_CURRENT_LIST_DIR}/KDSingleApplicationTargets.cmake")
diff --git a/3rdparty/kdsingleapplication/LICENSE.MIT.txt b/3rdparty/kdsingleapplication/LICENSE.MIT.txt
new file mode 100644
index 000000000..de636926c
--- /dev/null
+++ b/3rdparty/kdsingleapplication/LICENSE.MIT.txt
@@ -0,0 +1,22 @@
+MIT License
+
+Copyright (C) 2019-2021 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
diff --git a/3rdparty/kdsingleapplication/kdsingleapplication.cpp b/3rdparty/kdsingleapplication/kdsingleapplication.cpp
new file mode 100644
index 000000000..bd876c6e2
--- /dev/null
+++ b/3rdparty/kdsingleapplication/kdsingleapplication.cpp
@@ -0,0 +1,123 @@
+/*
+    MIT License
+
+    Copyright (C) 2019-2021 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in all
+    copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+    SOFTWARE.
+*/
+
+#include "kdsingleapplication.h"
+
+#include 
+#include 
+
+// TODO: make this pluggable.
+#include "kdsingleapplication_localsocket_p.h"
+
+// Avoiding dragging in Qt private APIs for now, so this does not inherit
+// from QObjectPrivate.
+class KDSingleApplicationPrivate
+{
+public:
+    explicit KDSingleApplicationPrivate(const QString &name, KDSingleApplication *q);
+
+    void initialize();
+
+    QString name() const
+    {
+        return m_name;
+    }
+
+    bool isPrimaryInstance() const
+    {
+        return m_impl.isPrimaryInstance();
+    }
+
+    bool sendMessage(const QByteArray &message, int timeout)
+    {
+        return m_impl.sendMessage(message, timeout);
+    }
+
+private:
+    Q_DECLARE_PUBLIC(KDSingleApplication)
+
+    KDSingleApplication *q_ptr;
+    QString m_name;
+
+    KDSingleApplicationLocalSocket m_impl;
+};
+
+KDSingleApplicationPrivate::KDSingleApplicationPrivate(const QString &name, KDSingleApplication *q)
+    : q_ptr(q)
+    , m_name(name)
+    , m_impl(name)
+{
+    if (Q_UNLIKELY(name.isEmpty()))
+        qFatal("KDSingleApplication requires a non-empty application name");
+
+    if (isPrimaryInstance()) {
+        QObject::connect(&m_impl, &KDSingleApplicationLocalSocket::messageReceived,
+                         q, &KDSingleApplication::messageReceived);
+    }
+}
+
+static QString extractExecutableName(const QString &applicationFilePath)
+{
+    return QFileInfo(applicationFilePath).fileName();
+}
+
+KDSingleApplication::KDSingleApplication(QObject *parent)
+    : KDSingleApplication(extractExecutableName(QCoreApplication::applicationFilePath()), parent)
+{
+}
+
+KDSingleApplication::KDSingleApplication(const QString &name, QObject *parent)
+    : QObject(parent)
+    , d_ptr(new KDSingleApplicationPrivate(name, this))
+{
+}
+
+QString KDSingleApplication::name() const
+{
+    Q_D(const KDSingleApplication);
+    return d->name();
+}
+
+bool KDSingleApplication::isPrimaryInstance() const
+{
+    Q_D(const KDSingleApplication);
+    return d->isPrimaryInstance();
+}
+
+bool KDSingleApplication::sendMessage(const QByteArray &message)
+{
+    return sendMessageWithTimeout(message, 5000);
+}
+
+bool KDSingleApplication::sendMessageWithTimeout(const QByteArray &message, int timeout)
+{
+    Q_ASSERT(!isPrimaryInstance());
+
+    Q_D(KDSingleApplication);
+    return d->sendMessage(message, timeout);
+}
+
+
+KDSingleApplication::~KDSingleApplication() = default;
+
diff --git a/3rdparty/kdsingleapplication/kdsingleapplication.h b/3rdparty/kdsingleapplication/kdsingleapplication.h
new file mode 100644
index 000000000..c2ef5e495
--- /dev/null
+++ b/3rdparty/kdsingleapplication/kdsingleapplication.h
@@ -0,0 +1,62 @@
+/*
+    MIT License
+
+    Copyright (C) 2019-2021 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in all
+    copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+    SOFTWARE.
+*/
+#ifndef KDSINGLEAPPLICATION_H
+#define KDSINGLEAPPLICATION_H
+
+#include 
+
+#include 
+
+#include "kdsingleapplication_lib.h"
+
+class KDSingleApplicationPrivate;
+
+class KDSINGLEAPPLICATION_EXPORT KDSingleApplication : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QString name READ name CONSTANT)
+    Q_PROPERTY(bool isPrimaryInstance READ isPrimaryInstance CONSTANT)
+
+public:
+    explicit KDSingleApplication(QObject *parent = nullptr);
+    explicit KDSingleApplication(const QString &name, QObject *parent = nullptr);
+    ~KDSingleApplication();
+
+    QString name() const;
+    bool isPrimaryInstance() const;
+
+public Q_SLOTS:
+    // avoid default arguments and overloads, as they don't mix with connections
+    bool sendMessage(const QByteArray &message);
+    bool sendMessageWithTimeout(const QByteArray &message, int timeout);
+
+Q_SIGNALS:
+    void messageReceived(const QByteArray &message);
+
+private:
+    Q_DECLARE_PRIVATE(KDSingleApplication)
+    std::unique_ptr d_ptr;
+};
+
+#endif // KDSINGLEAPPLICATION_H
diff --git a/3rdparty/kdsingleapplication/kdsingleapplication_lib.h b/3rdparty/kdsingleapplication/kdsingleapplication_lib.h
new file mode 100644
index 000000000..5749b22ce
--- /dev/null
+++ b/3rdparty/kdsingleapplication/kdsingleapplication_lib.h
@@ -0,0 +1,37 @@
+/*
+    MIT License
+
+    Copyright (C) 2019-2021 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in all
+    copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+    SOFTWARE.
+*/
+#ifndef KDSINGLEAPPLICATION_LIB_H
+#define KDSINGLEAPPLICATION_LIB_H
+
+#include 
+
+#if defined(KDSINGLEAPPLICATION_STATIC_BUILD)
+#define KDSINGLEAPPLICATION_EXPORT
+#elif defined(KDSINGLEAPPLICATION_SHARED_BUILD)
+#define KDSINGLEAPPLICATION_EXPORT Q_DECL_EXPORT
+#else
+#define KDSINGLEAPPLICATION_EXPORT Q_DECL_IMPORT
+#endif
+
+#endif // KDSINGLEAPPLICATION_LIB_H
diff --git a/3rdparty/kdsingleapplication/kdsingleapplication_localsocket.cpp b/3rdparty/kdsingleapplication/kdsingleapplication_localsocket.cpp
new file mode 100644
index 000000000..32492db23
--- /dev/null
+++ b/3rdparty/kdsingleapplication/kdsingleapplication_localsocket.cpp
@@ -0,0 +1,304 @@
+/*
+    MIT License
+
+    Copyright (C) 2019-2021 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in all
+    copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+    SOFTWARE.
+*/
+
+#include "kdsingleapplication_localsocket_p.h"
+
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+
+#include 
+#include 
+
+#include 
+#include 
+
+#if defined(Q_OS_UNIX)
+// for ::getuid()
+#include 
+#include 
+#endif
+
+#if defined(Q_OS_WIN)
+#include 
+#endif
+
+static const auto LOCALSOCKET_CONNECTION_TIMEOUT = std::chrono::seconds(5);
+static const char LOCALSOCKET_PROTOCOL_VERSION = 2;
+
+Q_LOGGING_CATEGORY(kdsaLocalSocket, "kdsingleapplication.localsocket", QtWarningMsg);
+
+KDSingleApplicationLocalSocket::KDSingleApplicationLocalSocket(const QString &name, QObject *parent)
+    : QObject(parent)
+{
+#if defined(Q_OS_UNIX)
+    m_socketName = QStringLiteral("kdsingleapp-%1-%2-%3")
+            .arg(::getuid())
+            .arg(qEnvironmentVariable("XDG_SESSION_ID"), name);
+#elif defined(Q_OS_WIN)
+    // I'm not sure of a "global session identifier" on Windows; are
+    // multiple logins from the same user a possibility? For now, following this:
+    // https://docs.microsoft.com/en-us/windows/desktop/devnotes/getting-the-session-id-of-the-current-process
+
+    DWORD sessionId;
+    BOOL haveSessionId = ProcessIdToSessionId(GetCurrentProcessId(), &sessionId);
+
+    m_socketName = QString::fromUtf8("kdsingleapp-%1-%2")
+            .arg(haveSessionId ? sessionId : 0)
+            .arg(name);
+#else
+#error "KDSingleApplication has not been ported to this platform"
+#endif
+
+    const QString lockFilePath =
+            QDir::tempPath() + QLatin1Char('/') + m_socketName + QLatin1String(".lock");
+
+    qCDebug(kdsaLocalSocket) << "Socket name is" << m_socketName;
+    qCDebug(kdsaLocalSocket) << "Lock file path is" << lockFilePath;
+
+    std::unique_ptr lockFile(new QLockFile(lockFilePath));
+    lockFile->setStaleLockTime(0);
+
+    if (!lockFile->tryLock()) {
+        // someone else has the lock => we're secondary
+        return;
+    }
+
+    std::unique_ptr server = std::make_unique();
+    if (!server->listen(m_socketName)) {
+        // maybe the primary crashed, leaving a stale socket; delete it and try again
+        QLocalServer::removeServer(m_socketName);
+        if (!server->listen(m_socketName)) {
+            // TODO: better error handling.
+            qWarning("KDSingleApplication: unable to make the primary instance listen on %ls: %ls",
+                     qUtf16Printable(m_socketName),
+                     qUtf16Printable(server->errorString()));
+
+            return;
+        }
+    }
+
+    connect(server.get(), &QLocalServer::newConnection,
+            this, &KDSingleApplicationLocalSocket::handleNewConnection);
+
+    m_lockFile = std::move(lockFile);
+    m_localServer = std::move(server);
+}
+
+KDSingleApplicationLocalSocket::~KDSingleApplicationLocalSocket() = default;
+
+bool KDSingleApplicationLocalSocket::isPrimaryInstance() const
+{
+    return m_localServer != nullptr;
+}
+
+bool KDSingleApplicationLocalSocket::sendMessage(const QByteArray &message, int timeout)
+{
+    Q_ASSERT(!isPrimaryInstance());
+    QLocalSocket socket;
+
+    qCDebug(kdsaLocalSocket) << "Preparing to send message" << message << "with timeout" << timeout;
+
+    QDeadlineTimer deadline(timeout);
+
+    // There is an inherent race here with the setup of the server side.
+    // Even if the socket lock is held by the server, the server may not
+    // be listening yet. So this connection may fail; keep retrying
+    // until we hit the timeout.
+    do {
+        socket.connectToServer(m_socketName);
+        if (socket.waitForConnected(deadline.remainingTime()))
+            break;
+    } while (!deadline.hasExpired());
+
+    qCDebug(kdsaLocalSocket) << "Socket state:" << socket.state() << "Timer remaining" << deadline.remainingTime() << "Expired?" << deadline.hasExpired();
+
+    if (deadline.hasExpired())
+        return false;
+
+    socket.write(&LOCALSOCKET_PROTOCOL_VERSION, 1);
+
+    {
+        QByteArray encodedMessage;
+        QDataStream ds(&encodedMessage, QIODevice::WriteOnly);
+        ds << message;
+        socket.write(encodedMessage);
+    }
+
+    qCDebug(kdsaLocalSocket) << "Wrote message in the socket" << "Timer remaining" << deadline.remainingTime() << "Expired?" << deadline.hasExpired();
+
+    // There is no acknowledgement mechanism here.
+    // Should there be one?
+
+    while (socket.bytesToWrite() > 0) {
+        if (!socket.waitForBytesWritten(deadline.remainingTime()))
+            return false;
+    }
+
+    qCDebug(kdsaLocalSocket) << "Bytes written, now disconnecting" << "Timer remaining" << deadline.remainingTime() << "Expired?" << deadline.hasExpired();
+
+    socket.disconnectFromServer();
+
+    if (socket.state() == QLocalSocket::UnconnectedState)
+        return true;
+
+    if (!socket.waitForDisconnected(deadline.remainingTime()))
+        return false;
+
+    qCDebug(kdsaLocalSocket) << "Disconnected -- success!";
+
+    return true;
+}
+
+void KDSingleApplicationLocalSocket::handleNewConnection()
+{
+    Q_ASSERT(m_localServer);
+
+    QLocalSocket *socket = m_localServer->nextPendingConnection();
+
+    qCDebug(kdsaLocalSocket) << "Got new connection on" << m_socketName << "state" << socket->state();
+
+    Connection c(socket);
+
+    c.readDataConnection = QObjectConnectionHolder(
+                connect(c.socket.get(), &QLocalSocket::readyRead,
+                        this, &KDSingleApplicationLocalSocket::readDataFromSecondary));
+
+    c.secondaryDisconnectedConnection = QObjectConnectionHolder(
+                connect(c.socket.get(), &QLocalSocket::disconnected,
+                        this, &KDSingleApplicationLocalSocket::secondaryDisconnected));
+
+    c.abortConnection = QObjectConnectionHolder(
+                connect(c.timeoutTimer.get(), &QTimer::timeout,
+                        this, &KDSingleApplicationLocalSocket::abortConnectionToSecondary));
+
+    m_clients.push_back(std::move(c));
+
+    // Note that by the time we get here, the socket could've already been closed,
+    // and no signals emitted (hello, Windows!). Read what's already in the socket.
+    if (readDataFromSecondarySocket(socket))
+        return;
+
+    if (socket->state() == QLocalSocket::UnconnectedState)
+        secondarySocketDisconnected(socket);
+}
+
+template 
+static auto findConnectionBySocket(Container &container, QLocalSocket *socket)
+{
+    auto i = std::find_if(container.begin(),
+                          container.end(),
+                          [socket](const auto &c) { return c.socket.get() == socket; });
+    Q_ASSERT(i != container.end());
+    return i;
+}
+
+template 
+static auto findConnectionByTimer(Container &container, QTimer *timer)
+{
+    auto i = std::find_if(container.begin(),
+                          container.end(),
+                          [timer](const auto &c) { return c.timeoutTimer.get() == timer; });
+    Q_ASSERT(i != container.end());
+    return i;
+}
+
+void KDSingleApplicationLocalSocket::readDataFromSecondary()
+{
+    QLocalSocket *socket = static_cast(sender());
+    readDataFromSecondarySocket(socket);
+}
+
+bool KDSingleApplicationLocalSocket::readDataFromSecondarySocket(QLocalSocket *socket)
+{
+    auto i = findConnectionBySocket(m_clients, socket);
+    Connection &c = *i;
+    c.readData.append(socket->readAll());
+
+    qCDebug(kdsaLocalSocket) << "Got more data from a secondary. Data read so far:" << c.readData;
+
+    const QByteArray &data = c.readData;
+
+    if (data.size() >= 1) {
+        if (data[0] != LOCALSOCKET_PROTOCOL_VERSION) {
+            qCDebug(kdsaLocalSocket) << "Got an invalid protocol version";
+            m_clients.erase(i);
+            return true;
+        }
+    }
+
+    QDataStream ds(data);
+    ds.skipRawData(1);
+
+    ds.startTransaction();
+    QByteArray message;
+    ds >> message;
+
+    if (ds.commitTransaction()) {
+        qCDebug(kdsaLocalSocket) << "Got a complete message:" << message;
+        Q_EMIT messageReceived(message);
+        m_clients.erase(i);
+        return true;
+    }
+
+    return false;
+}
+
+void KDSingleApplicationLocalSocket::secondaryDisconnected()
+{
+    QLocalSocket *socket = static_cast(sender());
+    secondarySocketDisconnected(socket);
+}
+
+void KDSingleApplicationLocalSocket::secondarySocketDisconnected(QLocalSocket *socket)
+{
+    auto i = findConnectionBySocket(m_clients, socket);
+    Connection c = std::move(*i);
+    m_clients.erase(i);
+
+    qCDebug(kdsaLocalSocket) << "Secondary disconnected. Data read:" << c.readData;
+}
+
+void KDSingleApplicationLocalSocket::abortConnectionToSecondary()
+{
+    QTimer *timer = static_cast(sender());
+
+    auto i = findConnectionByTimer(m_clients, timer);
+    Connection c = std::move(*i);
+    m_clients.erase(i);
+
+    qCDebug(kdsaLocalSocket) << "Secondary timed out. Data read:" << c.readData;
+}
+
+KDSingleApplicationLocalSocket::Connection::Connection(QLocalSocket *socket)
+    : socket(socket)
+    , timeoutTimer(new QTimer)
+{
+    timeoutTimer->start(LOCALSOCKET_CONNECTION_TIMEOUT);
+}
diff --git a/3rdparty/kdsingleapplication/kdsingleapplication_localsocket_p.h b/3rdparty/kdsingleapplication/kdsingleapplication_localsocket_p.h
new file mode 100644
index 000000000..1dd47cabd
--- /dev/null
+++ b/3rdparty/kdsingleapplication/kdsingleapplication_localsocket_p.h
@@ -0,0 +1,133 @@
+/*
+    MIT License
+
+    Copyright (C) 2019-2021 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in all
+    copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+    SOFTWARE.
+*/
+
+#ifndef KDSINGLEAPPLICATION_LOCALSOCKET_P_H
+#define KDSINGLEAPPLICATION_LOCALSOCKET_P_H
+
+#include 
+#include 
+#include 
+
+QT_BEGIN_NAMESPACE
+class QLockFile;
+class QLocalServer;
+class QLocalSocket;
+class QTimer;
+QT_END_NAMESPACE
+
+#include 
+#include 
+
+struct QObjectDeleteLater
+{
+    void operator()(QObject *o) { o->deleteLater(); }
+};
+
+class QObjectConnectionHolder
+{
+    Q_DISABLE_COPY(QObjectConnectionHolder)
+    QMetaObject::Connection c;
+
+public:
+    QObjectConnectionHolder() {}
+
+    explicit QObjectConnectionHolder(QMetaObject::Connection c)
+        : c(std::move(c))
+    {
+    }
+
+    ~QObjectConnectionHolder()
+    {
+        QObject::disconnect(c);
+    }
+
+    QObjectConnectionHolder(QObjectConnectionHolder &&other) noexcept
+        : c(std::exchange(other.c, {}))
+    {}
+
+    QObjectConnectionHolder &operator=(QObjectConnectionHolder &&other) noexcept
+    {
+        QObjectConnectionHolder moved(std::move(other));
+        swap(moved);
+        return *this;
+    }
+
+    void swap(QObjectConnectionHolder &other) noexcept
+    {
+        using std::swap;
+        swap(c, other.c);
+    }
+};
+
+class KDSingleApplicationLocalSocket : public QObject
+{
+    Q_OBJECT
+
+public:
+    explicit KDSingleApplicationLocalSocket(const QString &name,
+                                            QObject *parent = nullptr);
+    ~KDSingleApplicationLocalSocket();
+
+    bool isPrimaryInstance() const;
+
+public Q_SLOTS:
+    bool sendMessage(const QByteArray &message, int timeout);
+
+Q_SIGNALS:
+    void messageReceived(const QByteArray &message);
+
+private:
+    void handleNewConnection();
+    void readDataFromSecondary();
+    bool readDataFromSecondarySocket(QLocalSocket *socket);
+    void secondaryDisconnected();
+    void secondarySocketDisconnected(QLocalSocket *socket);
+    void abortConnectionToSecondary();
+
+    QString m_socketName;
+
+    std::unique_ptr m_lockFile; // protects m_localServer
+    std::unique_ptr m_localServer;
+
+    struct Connection {
+        explicit Connection(QLocalSocket *s);
+
+        std::unique_ptr socket;
+        std::unique_ptr timeoutTimer;
+        QByteArray readData;
+
+        // socket/timeoutTimer are deleted via deleteLater (as we delete them
+        // in slots connected to their signals). Before the deleteLater is acted upon,
+        // they may emit further signals, triggering logic that it's not supposed
+        // to be triggered (as the Connection has already been destroyed).
+        // Use this Holder to break the connections.
+        QObjectConnectionHolder readDataConnection;
+        QObjectConnectionHolder secondaryDisconnectedConnection;
+        QObjectConnectionHolder abortConnection;
+    };
+
+    std::vector m_clients;
+};
+
+#endif // KDSINGLEAPPLICATION_LOCALSOCKET_P_H
diff --git a/3rdparty/kdsingleapplication/src.pro b/3rdparty/kdsingleapplication/src.pro
new file mode 100644
index 000000000..28883fa56
--- /dev/null
+++ b/3rdparty/kdsingleapplication/src.pro
@@ -0,0 +1,20 @@
+include(../common.pri)
+
+TEMPLATE = lib
+TARGET = kdsingleapplication
+QT = core network
+CONFIG += static
+
+SOURCES += \
+    kdsingleapplication.cpp \
+    kdsingleapplication_localsocket.cpp \
+
+HEADERS += \
+    kdsingleapplication.h \
+    kdsingleapplication_lib.h \
+    kdsingleapplication_localsocket_p.h \
+
+DEFINES += \
+    KDSINGLEAPPLICATION_BUILD
+
+win32:LIBS += -lkernel32

From 784f591deea77e35b5e3910b72264c9b664b0401 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Sun, 26 Jun 2022 22:03:06 +0200
Subject: [PATCH 33/91] 3rdparty: build only the part of KDSAG we need

---
 3rdparty/kdsingleapplication/CMakeLists.txt | 58 +++------------------
 1 file changed, 8 insertions(+), 50 deletions(-)

diff --git a/3rdparty/kdsingleapplication/CMakeLists.txt b/3rdparty/kdsingleapplication/CMakeLists.txt
index c345a2b6a..aca2df70b 100644
--- a/3rdparty/kdsingleapplication/CMakeLists.txt
+++ b/3rdparty/kdsingleapplication/CMakeLists.txt
@@ -1,17 +1,10 @@
-set(KDSINGLEAPPLICATION_SRCS
-	kdsingleapplication.cpp
-	kdsingleapplication_localsocket.cpp)
+set(KDSINGLEAPPLICATION_SRCS kdsingleapplication.cpp kdsingleapplication_localsocket.cpp)
 
-set(KDSINGLEAPPLICATION_INSTALLABLE_INCLUDES
-       kdsingleapplication.h
-       kdsingleapplication_lib.h
-    )
+set(KDSINGLEAPPLICATION_INSTALLABLE_INCLUDES kdsingleapplication.h kdsingleapplication_lib.h)
 
-set(KDSINGLEAPPLICATION_NON_INSTALLABLE_INCLUDES
-       kdsingleapplication_localsocket_p.h
-   )
+set(KDSINGLEAPPLICATION_NON_INSTALLABLE_INCLUDES kdsingleapplication_localsocket_p.h)
 
-if (${PROJECT_NAME}_STATIC)
+if(KDSINGLEAPPLICATION_STATIC)
     add_library(kdsingleapplication STATIC ${KDSINGLEAPPLICATION_INSTALLABLE_INCLUDES} ${KDSINGLEAPPLICATION_SRCS})
     target_compile_definitions(kdsingleapplication PUBLIC KDSINGLEAPPLICATION_STATIC_BUILD)
 else()
@@ -19,47 +12,12 @@ else()
     target_compile_definitions(kdsingleapplication PRIVATE KDSINGLEAPPLICATION_SHARED_BUILD)
 endif()
 
-include(GNUInstallDirs)
-
 set(KDSINGLEAPPLICATION_INCLUDEDIR ${CMAKE_INSTALL_INCLUDEDIR}/kdsingleapplication)
 
-target_include_directories(kdsingleapplication
-    PUBLIC
-        $
-        $
-    PRIVATE
-        ${CMAKE_CURRENT_SOURCE_DIR}
+target_include_directories(
+    kdsingleapplication
+    PUBLIC $ $
+    PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
-if (WIN32)
-    target_link_libraries(kdsingleapplication kernel32)
-endif()
 target_link_libraries(kdsingleapplication Qt5::Core Qt5::Network)
-
-install (FILES ${KDSINGLEAPPLICATION_INSTALLABLE_INCLUDES} DESTINATION ${KDSINGLEAPPLICATION_INCLUDEDIR})
-
-install (TARGETS kdsingleapplication
-         EXPORT kdsingleapplicationTargets
-         RUNTIME DESTINATION bin
-         LIBRARY DESTINATION lib
-         ARCHIVE DESTINATION lib
-)
-
-include(CMakePackageConfigHelpers)
-
-write_basic_package_version_file(
-    KDSingleApplicationConfigVersion.cmake
-    VERSION ${PACKAGE_VERSION}
-    COMPATIBILITY AnyNewerVersion
-    )
-
-install(EXPORT kdsingleapplicationTargets
-    FILE KDSingleApplicationTargets.cmake
-    NAMESPACE KDAB::
-    DESTINATION lib/cmake/KDSingleApplication
-    )
-configure_file(KDSingleApplicationConfig.cmake.in KDSingleApplicationConfig.cmake @ONLY)
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/KDSingleApplicationConfig.cmake"
-    "${CMAKE_CURRENT_BINARY_DIR}/KDSingleApplicationConfigVersion.cmake"
-    DESTINATION lib/cmake/KDSingleApplication
-    )

From 86d3932a16459768a22073eeed6263a74550ff1b Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Sun, 26 Jun 2022 23:06:31 +0200
Subject: [PATCH 34/91] [calamares] Hook up to KDSAG again (instead of DBus
 activation)

---
 3rdparty/kdsingleapplication/CMakeLists.txt |  3 +++
 CMakeLists.txt                              | 11 ++---------
 src/calamares/CMakeLists.txt                |  6 +-----
 src/calamares/main.cpp                      | 20 ++++++++++++++++----
 4 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/3rdparty/kdsingleapplication/CMakeLists.txt b/3rdparty/kdsingleapplication/CMakeLists.txt
index aca2df70b..6c0b8e9c0 100644
--- a/3rdparty/kdsingleapplication/CMakeLists.txt
+++ b/3rdparty/kdsingleapplication/CMakeLists.txt
@@ -1,3 +1,5 @@
+set(KDSINGLEAPPLICATION_STATIC ON)
+
 set(KDSINGLEAPPLICATION_SRCS kdsingleapplication.cpp kdsingleapplication_localsocket.cpp)
 
 set(KDSINGLEAPPLICATION_INSTALLABLE_INCLUDES kdsingleapplication.h kdsingleapplication_lib.h)
@@ -11,6 +13,7 @@ else()
     add_library(kdsingleapplication SHARED ${KDSINGLEAPPLICATION_INSTALLABLE_INCLUDES} ${KDSINGLEAPPLICATION_SRCS})
     target_compile_definitions(kdsingleapplication PRIVATE KDSINGLEAPPLICATION_SHARED_BUILD)
 endif()
+set_target_properties( kdsingleapplication PROPERTIES AUTOMOC TRUE )
 
 set(KDSINGLEAPPLICATION_INCLUDEDIR ${CMAKE_INSTALL_INCLUDEDIR}/kdsingleapplication)
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 707a45c00..6eaa5cebf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -321,7 +321,7 @@ if(ECM_FOUND)
     include(KDEInstallDirs)
 endif()
 
-find_package(KF5 QUIET COMPONENTS CoreAddons Crash DBusAddons)
+find_package(KF5 QUIET COMPONENTS CoreAddons Crash)
 set_package_properties(
     KF5::CoreAddons
     PROPERTIES
@@ -330,14 +330,6 @@ set_package_properties(
     URL "https://api.kde.org/frameworks/kcoreaddons/"
     PURPOSE "About Calamares"
 )
-set_package_properties(
-    KF5::DBusAddons
-    PROPERTIES
-    TYPE REQUIRED
-    DESCRIPTION "Classes for DBus activation"
-    URL "https://api.kde.org/frameworks/dbusaddons/"
-    PURPOSE "Unique instance of Calamares"
-)
 if(NOT KF5Crash_FOUND)
     if(BUILD_KF5Crash)
         message(WARNING "BUILD_KF5Crash is set, but KF5::Crash is not available.")
@@ -551,6 +543,7 @@ include(GNUInstallDirs)
 # libraries for Calamares.
 set(Calamares_LIBRARIES calamares)
 
+add_subdirectory(3rdparty/kdsingleapplication)
 add_subdirectory(src)
 
 add_feature_info(Python ${WITH_PYTHON} "Python job modules")
diff --git a/src/calamares/CMakeLists.txt b/src/calamares/CMakeLists.txt
index b132f186a..291297494 100644
--- a/src/calamares/CMakeLists.txt
+++ b/src/calamares/CMakeLists.txt
@@ -36,13 +36,9 @@ calamares_automoc( calamares_bin )
 calamares_autouic( calamares_bin )
 calamares_autorcc( calamares_bin )
 
-if(kdsagSources)
-    set_source_files_properties(${kdsagSources} PROPERTIES AUTOMOC OFF)
-endif()
-
 target_link_libraries(
     calamares_bin
-    PRIVATE calamares calamaresui calamares-i18n Qt5::Core Qt5::Widgets KF5::CoreAddons KF5::DBusAddons
+    PRIVATE calamares calamaresui calamares-i18n kdsingleapplication Qt5::Core Qt5::Widgets KF5::CoreAddons
 )
 if(BUILD_KF5Crash)
     target_link_libraries(calamares_bin PRIVATE KF5::Crash)
diff --git a/src/calamares/main.cpp b/src/calamares/main.cpp
index fcc946485..495127881 100644
--- a/src/calamares/main.cpp
+++ b/src/calamares/main.cpp
@@ -16,8 +16,10 @@
 #include "utils/Logger.h"
 #include "utils/Retranslator.h"
 
+// From 3rdparty/
+#include "kdsingleapplication.h"
+
 #include 
-#include 
 #ifdef BUILD_KF5Crash
 #include 
 #endif
@@ -26,6 +28,8 @@
 #include 
 #include 
 
+#include 
+
 /** @brief Gets debug-level from -D command-line-option
  *
  * If unset, use LOGERROR (corresponding to -D1), although
@@ -124,9 +128,17 @@ main( int argc, char* argv[] )
     KCrash::setFlags( KCrash::SaferDialog | KCrash::AlwaysDirectly );
 #endif
 
-    bool is_debug = handle_args( a );
-
-    KDBusService service( is_debug ? KDBusService::Multiple : KDBusService::Unique );
+    std::unique_ptr< KDSingleApplication > possiblyUnique;
+    const bool is_debug = handle_args( a );
+    if ( !is_debug )
+    {
+        possiblyUnique = std::make_unique< KDSingleApplication >();
+        if ( !possiblyUnique->isPrimaryInstance() )
+        {
+            qCritical() << "Calamares is already running.";
+            return 87;  // EUSERS on Linux
+        }
+    }
 
     Calamares::Settings::init( is_debug );
     if ( !Calamares::Settings::instance() || !Calamares::Settings::instance()->isValid() )

From 20d96f9ea3fbf6b518f1e5e2e55cd262bd99c423 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Sun, 26 Jun 2022 23:24:32 +0200
Subject: [PATCH 35/91] [libcalamaresui] More constness

---
 src/libcalamaresui/modulesystem/ModuleManager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libcalamaresui/modulesystem/ModuleManager.cpp b/src/libcalamaresui/modulesystem/ModuleManager.cpp
index 1233b1115..beca304a5 100644
--- a/src/libcalamaresui/modulesystem/ModuleManager.cpp
+++ b/src/libcalamaresui/modulesystem/ModuleManager.cpp
@@ -214,7 +214,7 @@ ModuleManager::loadModules()
                 continue;
             }
 
-            ModuleSystem::Descriptor descriptor
+            const ModuleSystem::Descriptor descriptor
                 = m_availableDescriptorsByModuleName.value( instanceKey.module(), ModuleSystem::Descriptor() );
             if ( !descriptor.isValid() )
             {

From 96fb97d53a0b8e09ab8d192357914761b4c9c708 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Sun, 26 Jun 2022 23:49:11 +0200
Subject: [PATCH 36/91] Changes: pre-release housekeeping

- this would be the first 3.3 release, scripts still needed
  cleanup to handle all the changes in 3.3
- support "-alpha1" kinds of designation
- support more versioning information in the headers
---
 CMakeLists.txt                          | 24 ++++++++++++------------
 ci/RELEASE.sh                           |  2 +-
 src/libcalamares/CalamaresVersionX.h.in |  2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6eaa5cebf..05c68b66c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -43,18 +43,24 @@
 
 cmake_minimum_required(VERSION 3.16 FATAL_ERROR)
 
-set(CALAMARES_VERSION 3.3.0)
-set(CALAMARES_RELEASE_MODE OFF) # Set to ON during a release
+set(CALAMARES_VERSION 3.3.0-alpha1)
+set(CALAMARES_RELEASE_MODE ON) # Set to ON during a release
 
 if(CMAKE_SCRIPT_MODE_FILE)
     include(${CMAKE_CURRENT_LIST_DIR}/CMakeModules/ExtendedVersion.cmake)
     set(CMAKE_SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR})
-    extend_version( ${CALAMARES_VERSION} OFF _vshort _vlong )
+    extend_version( ${CALAMARES_VERSION} ${CALAMARES_RELEASE_MODE}  _vshort _vlong )
     message("${_vlong}")
     return()
 endif()
 
-project(CALAMARES VERSION ${CALAMARES_VERSION} LANGUAGES C CXX HOMEPAGE_URL "https://calamares.io/")
+# Massage the version for CMake if there is a version-suffix
+string(REGEX REPLACE "-.*" "" CALAMARES_VERSION_SHORT "${CALAMARES_VERSION}")
+# And preserve the original version (suffix and all) because project() overwrites
+# .. but if we're doing non-release builds, this gets replaced with git versioning.
+set(CALAMARES_VERSION_LONG "${CALAMARES_VERSION}")
+
+project(CALAMARES VERSION ${CALAMARES_VERSION_SHORT} LANGUAGES C CXX HOMEPAGE_URL "https://calamares.io/")
 
 if(NOT CALAMARES_RELEASE_MODE AND CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR)
     message(FATAL_ERROR "Do not build development versions in the source-directory.")
@@ -497,21 +503,15 @@ add_feature_info(ExampleDistro ${mksquashfs_FOUND} "Create example-distro target
 
 ### CALAMARES PROPER
 #
-set(CALAMARES_VERSION ${CALAMARES_VERSION_MAJOR}.${CALAMARES_VERSION_MINOR}.${CALAMARES_VERSION_PATCH})
-# In rare cases we have hotfix-releases with a tweak
-if(CALAMARES_VERSION_TWEAK)
-    set(CALAMARES_VERSION "${CALAMARES_VERSION}.${CALAMARES_VERSION_TWEAK}")
-endif()
-set(CALAMARES_VERSION_SHORT "${CALAMARES_VERSION}")
 
 # Additional info for non-release builds. The "extended" version information
 # with date and git information (commit, dirty status) is used only
 # by CalamaresVersionX.h, which is included by consumers that need a full
 # version number with all that information; normal consumers can include
 # CalamaresVersion.h with more stable numbers.
-if(NOT BUILD_RELEASE AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git/")
+if(NOT CALAMARES_RELEASE_MODE AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git/")
     include(ExtendedVersion)
-    extend_version( "${CALAMARES_VERSION}" OFF CALAMARES_VERSION_SHORT CALAMARES_VERSION )
+    extend_version( "${CALAMARES_VERSION}" OFF CALAMARES_VERSION_SHORT CALAMARES_VERSION_LONG )
 endif()
 
 # Special define for RC (e.g. not-a-release) builds.
diff --git a/ci/RELEASE.sh b/ci/RELEASE.sh
index 38e108d72..2d7d9a559 100755
--- a/ci/RELEASE.sh
+++ b/ci/RELEASE.sh
@@ -127,7 +127,7 @@ fi
 ### Get version number for this release
 #
 #
-V=$( cd "$BUILDDIR" && make show-version | grep ^CALAMARES_VERSION | sed s/^[A-Z_]*=// )
+V=$( cd "$BUILDDIR" && cmake -P ../CMakeLists.txt | grep ^CALAMARES_VERSION | sed s/^[A-Z_]*=// )
 test -n "$V" || { echo "Could not obtain version in $BUILDDIR ." ; exit 1 ; }
 
 ### Create signed tag
diff --git a/src/libcalamares/CalamaresVersionX.h.in b/src/libcalamares/CalamaresVersionX.h.in
index be3a9ae21..89b1beee8 100644
--- a/src/libcalamares/CalamaresVersionX.h.in
+++ b/src/libcalamares/CalamaresVersionX.h.in
@@ -11,6 +11,6 @@
 #include "CalamaresVersion.h"
 
 #undef CALAMARES_VERSION
-#cmakedefine CALAMARES_VERSION "${CALAMARES_VERSION}"
+#cmakedefine CALAMARES_VERSION "${CALAMARES_VERSION_LONG}"
 
 #endif  // CALAMARES_VERSION_H

From c826e8e78a9ac91205233e6bb15ecd8f600e92a8 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Sun, 26 Jun 2022 23:53:36 +0200
Subject: [PATCH 37/91] CI: replace 'prepare' step with a script in the
 Calamares repo

This applies to the Debian nightly builds; having to go through
external actions doubles the effort to debug these kinds of
scripts, so just slap the actual commands into the workflow.
This also makes it easier to migrate to a different hosting.
---
 .github/workflows/nightly-debian.yml | 44 +++++++++++++++++++++++++++-
 1 file changed, 43 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/nightly-debian.yml b/.github/workflows/nightly-debian.yml
index 87cf5118e..f201729db 100644
--- a/.github/workflows/nightly-debian.yml
+++ b/.github/workflows/nightly-debian.yml
@@ -22,7 +22,49 @@ jobs:
       options: --tmpfs /build:rw --user 0:0
     steps:
       - name: "prepare env"
-        uses: calamares/actions/prepare-debian@v5
+        shell: bash
+        run: |
+          apt-get update
+          # Make sure we can send notices later
+          apt-get -y install git-core jq curl
+          apt-get -y install \
+            build-essential \
+            cmake \
+            extra-cmake-modules \
+            gettext \
+            libatasmart-dev \
+            libappstreamqt-dev \
+            libboost-python-dev \
+            libicu-dev \
+            libparted-dev \
+            libpolkit-qt5-1-dev \
+            libqt5svg5-dev \
+            libqt5webkit5-dev \
+            libyaml-cpp-dev \
+            os-prober \
+            pkg-config \
+            python3-dev \
+            qtbase5-dev \
+            qtdeclarative5-dev \
+            qttools5-dev \
+            qttools5-dev-tools
+          # Same name as on KDE neon, different version
+          apt-get -y install libkpmcore-dev
+          # Additional dependencies (KF5, +)
+          apt-get -y install \
+            libkf5config-dev \
+            libkf5coreaddons-dev \
+            libkf5i18n-dev \
+            libkf5iconthemes-dev \
+            libkf5parts-dev \
+            libkf5service-dev \
+            libkf5solid-dev \
+            libkf5crash-dev \
+            libkf5package-dev \
+            libkf5plasma-dev \
+            libpwquality-dev \
+            libqt5webenginewidgets5 \
+            qtwebengine5-dev
       - name: "prepare source"
         uses: calamares/actions/generic-checkout@v4
       - name: "build"

From 5a14c3c76fbbd72ace798f85ab16906a90ee81d5 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Mon, 27 Jun 2022 00:36:20 +0200
Subject: [PATCH 38/91] [bootloader] Fix schema file for config

A stray "machineid" was added, without a type definition,
so the config file -- which doesn't mention machineid at all
-- was considered invalid. Drop it because the key isn't mentioned
anywhere else.
---
 src/modules/bootloader/bootloader.schema.yaml | 64 ++++++++-----------
 1 file changed, 28 insertions(+), 36 deletions(-)

diff --git a/src/modules/bootloader/bootloader.schema.yaml b/src/modules/bootloader/bootloader.schema.yaml
index 0849f6865..6dc59c2c2 100644
--- a/src/modules/bootloader/bootloader.schema.yaml
+++ b/src/modules/bootloader/bootloader.schema.yaml
@@ -1,39 +1,31 @@
-# SPDX-FileCopyrightText: 2020 Adriaan de Groot 
-# SPDX-License-Identifier: GPL-3.0-or-later
----
-$schema: https://json-schema.org/schema#
-$id: https://calamares.io/schemas/bootloader
-additionalProperties: false
-type: object
-properties:
-    efiBootLoader: { type: string }
-    kernelSearchPath:  { type: string }
-    kernelName:  { type: string }
-    timeout:  { type: string }  # Inserted verbatim
-    additionalInitrdFiles:
-        type: array
-        items:
-            type: string
-    bootloaderEntryName:  { type: string }
-    kernelLine:  { type: string }
-    fallbackKernelLine:  { type: string }
+#SPDX - FileCopyrightText : 2020 Adriaan de Groot < groot @kde.org>
+#SPDX - License - Identifier : GPL - 3.0 - or -later
+-- -$schema : https :  //json-schema.org/schema#
+                       $id : https :  //calamares.io/schemas/bootloader
+                                      additionalProperties : false type : object properties : efiBootLoader
+    : { type : string } kernelSearchPath : { type : string } kernelName : { type : string } timeout:
+{
+type:
+    string
+}
+#Inserted verbatim additionalInitrdFiles : type : array items : type : string bootloaderEntryName : {
+    type : string } kernelLine : { type : string } fallbackKernelLine:
+{
+type:
+    string
+}
 
-    # Programs
-    grubInstall:  { type: string }
-    grubMkconfig:  { type: string }
-    grubCfg:  { type: string }
-    grubProbe: { type: string }
-    efiBootMgr: { type: string }
+#Programs
+grubInstall : { type : string } grubMkconfig : { type : string } grubCfg : { type : string } grubProbe
+    : { type : string } efiBootMgr : { type : string }
 
-    efiBootloaderId:  { type: string }
-    installEFIFallback: { type: boolean }
+                                     efiBootloaderId : { type : string } installEFIFallback : { type : boolean }
 
-required:
-    - efiBootLoader
-    - kernelSearchPath
-    - kernelName
-    - grubInstall
-    - grubMkconfig
-    - grubCfg
-    - grubProbe
-    - machineid
+                                                                                              required
+    : -efiBootLoader
+      - kernelSearchPath
+      - kernelName
+      - grubInstall
+      - grubMkconfig
+      - grubCfg
+      - grubProbe

From 1c7c0b9af8c2aae8835fdecf1f96a583fc56598e Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Mon, 27 Jun 2022 00:37:15 +0200
Subject: [PATCH 39/91] CI: apply coding style (clang-format 13)

---
 src/calamares/CalamaresApplication.h          |  2 +-
 src/calamares/DebugWindow.cpp                 |  3 ++-
 src/calamares/DebugWindow.h                   |  2 +-
 src/libcalamares/PythonHelper.h               |  2 +-
 src/libcalamares/PythonJobApi.h               |  2 +-
 src/libcalamares/locale/Global.h              |  2 +-
 src/libcalamares/modulesystem/Descriptor.h    |  5 +----
 src/libcalamaresui/Branding.h                 |  2 +-
 .../widgets/waitingspinnerwidget.cpp          |  2 +-
 src/modules/contextualprocess/Binding.h       |  4 ++--
 src/modules/finished/FinishedPage.h           |  2 +-
 src/modules/keyboard/KeyboardPage.h           |  2 +-
 src/modules/license/LicensePage.h             |  2 +-
 .../luksbootkeyfile/LuksBootKeyFileJob.cpp    |  8 +++----
 src/modules/netinstall/NetInstallPage.h       |  2 +-
 src/modules/netinstall/PackageModel.h         |  2 +-
 src/modules/packagechooser/ItemAppStream.h    |  2 +-
 .../packagechooser/PackageChooserPage.h       |  2 +-
 src/modules/partition/core/KPMHelpers.cpp     | 21 +++++++------------
 src/modules/partition/core/PartUtils.h        |  2 +-
 src/modules/partition/gui/ChoicePage.h        |  2 +-
 src/modules/partition/gui/EncryptWidget.h     |  2 +-
 .../partition/gui/VolumeGroupBaseDialog.h     |  2 +-
 src/modules/plasmalnf/PlasmaLnfPage.h         |  2 +-
 src/modules/tracking/TrackingPage.h           |  2 +-
 src/modules/users/UsersPage.h                 |  2 +-
 src/modules/welcome/WelcomePage.h             |  2 +-
 src/modules/welcome/WelcomeViewStep.h         |  2 +-
 .../welcome/checker/GeneralRequirements.cpp   |  4 ++--
 src/modules/welcomeq/WelcomeQmlViewStep.h     |  2 +-
 30 files changed, 43 insertions(+), 50 deletions(-)

diff --git a/src/calamares/CalamaresApplication.h b/src/calamares/CalamaresApplication.h
index 5f0037971..77cf3a00b 100644
--- a/src/calamares/CalamaresApplication.h
+++ b/src/calamares/CalamaresApplication.h
@@ -18,7 +18,7 @@ class CalamaresWindow;
 namespace Calamares
 {
 class ModuleManager;
-}
+}  // namespace Calamares
 
 
 /**
diff --git a/src/calamares/DebugWindow.cpp b/src/calamares/DebugWindow.cpp
index feeab833e..826696b4f 100644
--- a/src/calamares/DebugWindow.cpp
+++ b/src/calamares/DebugWindow.cpp
@@ -116,7 +116,8 @@ DebugWindow::DebugWindow()
     connect( m_ui->modulesListView->selectionModel(),
              &QItemSelectionModel::selectionChanged,
              this,
-             [this] {
+             [ this ]
+             {
                  QString moduleName = m_ui->modulesListView->currentIndex().data().toString();
                  Module* module
                      = ModuleManager::instance()->moduleInstance( ModuleSystem::InstanceKey::fromString( moduleName ) );
diff --git a/src/calamares/DebugWindow.h b/src/calamares/DebugWindow.h
index 7bc789a89..83bfb085e 100644
--- a/src/calamares/DebugWindow.h
+++ b/src/calamares/DebugWindow.h
@@ -26,7 +26,7 @@ namespace Calamares
 namespace Ui
 {
 class DebugWindow;
-}
+}  // namespace Ui
 
 class DebugWindow : public QWidget
 {
diff --git a/src/libcalamares/PythonHelper.h b/src/libcalamares/PythonHelper.h
index 0a2127fb0..121806862 100644
--- a/src/libcalamares/PythonHelper.h
+++ b/src/libcalamares/PythonHelper.h
@@ -19,7 +19,7 @@
 namespace Calamares
 {
 class GlobalStorage;
-}
+}  // namespace Calamares
 
 namespace CalamaresPython
 {
diff --git a/src/libcalamares/PythonJobApi.h b/src/libcalamares/PythonJobApi.h
index e61609460..373812187 100644
--- a/src/libcalamares/PythonJobApi.h
+++ b/src/libcalamares/PythonJobApi.h
@@ -18,7 +18,7 @@
 namespace Calamares
 {
 class PythonJob;
-}
+}  // namespace Calamares
 
 namespace CalamaresPython
 {
diff --git a/src/libcalamares/locale/Global.h b/src/libcalamares/locale/Global.h
index cf23ef7df..326fef109 100644
--- a/src/libcalamares/locale/Global.h
+++ b/src/libcalamares/locale/Global.h
@@ -28,7 +28,7 @@
 namespace Calamares
 {
 class GlobalStorage;
-}
+}  // namespace Calamares
 
 namespace CalamaresUtils
 {
diff --git a/src/libcalamares/modulesystem/Descriptor.h b/src/libcalamares/modulesystem/Descriptor.h
index 5b3681336..061d17890 100644
--- a/src/libcalamares/modulesystem/Descriptor.h
+++ b/src/libcalamares/modulesystem/Descriptor.h
@@ -111,10 +111,7 @@ public:
      *
      * Python job modules have one specific script to load and run.
      */
-    QString script() const
-    {
-        return m_interface == Interface::Python ? m_script : QString();
-    }
+    QString script() const { return m_interface == Interface::Python ? m_script : QString(); }
 
 private:
     QString m_name;
diff --git a/src/libcalamaresui/Branding.h b/src/libcalamaresui/Branding.h
index 6e7d780ee..a5a2e535d 100644
--- a/src/libcalamaresui/Branding.h
+++ b/src/libcalamaresui/Branding.h
@@ -28,7 +28,7 @@
 namespace YAML
 {
 class Node;
-}
+}  // namespace YAML
 
 namespace Calamares
 {
diff --git a/src/libcalamaresui/widgets/waitingspinnerwidget.cpp b/src/libcalamaresui/widgets/waitingspinnerwidget.cpp
index 3073e9b97..2ee5a5ea4 100644
--- a/src/libcalamaresui/widgets/waitingspinnerwidget.cpp
+++ b/src/libcalamaresui/widgets/waitingspinnerwidget.cpp
@@ -30,9 +30,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "waitingspinnerwidget.h"
 
-#include 
 #include 
 #include 
+#include 
 
 static bool
 isAlignCenter( Qt::AlignmentFlag a )
diff --git a/src/modules/contextualprocess/Binding.h b/src/modules/contextualprocess/Binding.h
index fc9f65557..77a966caf 100644
--- a/src/modules/contextualprocess/Binding.h
+++ b/src/modules/contextualprocess/Binding.h
@@ -22,11 +22,11 @@
 namespace CalamaresUtils
 {
 class CommandList;
-}
+}  // namespace CalamaresUtils
 namespace Calamares
 {
 class GlobalStorage;
-}
+}  // namespace Calamares
 
 struct ValueCheck : public QPair< QString, CalamaresUtils::CommandList* >
 {
diff --git a/src/modules/finished/FinishedPage.h b/src/modules/finished/FinishedPage.h
index 068efbdb5..7661afa75 100644
--- a/src/modules/finished/FinishedPage.h
+++ b/src/modules/finished/FinishedPage.h
@@ -20,7 +20,7 @@ class Config;
 namespace Ui
 {
 class FinishedPage;
-}
+}  // namespace Ui
 
 class FinishedPage : public QWidget
 {
diff --git a/src/modules/keyboard/KeyboardPage.h b/src/modules/keyboard/KeyboardPage.h
index 1c644cc08..f9870e1c1 100644
--- a/src/modules/keyboard/KeyboardPage.h
+++ b/src/modules/keyboard/KeyboardPage.h
@@ -25,7 +25,7 @@
 namespace Ui
 {
 class Page_Keyboard;
-}
+}  // namespace Ui
 
 class Config;
 class KeyBoardPreview;
diff --git a/src/modules/license/LicensePage.h b/src/modules/license/LicensePage.h
index 73a62defa..cfd991e73 100644
--- a/src/modules/license/LicensePage.h
+++ b/src/modules/license/LicensePage.h
@@ -21,7 +21,7 @@
 namespace Ui
 {
 class LicensePage;
-}
+}  // namespace Ui
 
 class LicenseWidget;
 
diff --git a/src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp b/src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp
index 3dd7fe42a..5b0914595 100644
--- a/src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp
+++ b/src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp
@@ -17,8 +17,8 @@
 #include "GlobalStorage.h"
 #include "JobQueue.h"
 
-#include 
 #include 
+#include 
 
 LuksBootKeyFileJob::LuksBootKeyFileJob( QObject* parent )
     : Calamares::CppJob( parent )
@@ -144,7 +144,7 @@ setupLuks( const LuksDevice& d )
     if ( luks_dump.getExitCode() == 0 )
     {
         QRegularExpression re( QStringLiteral( R"(\d+:\s*enabled)" ), QRegularExpression::CaseInsensitiveOption );
-        int count = luks_dump.getOutput().count(re);
+        int count = luks_dump.getOutput().count( re );
         cDebug() << "Luks Dump slot count: " << count;
         if ( count >= 7 )
         {
@@ -152,8 +152,8 @@ setupLuks( const LuksDevice& d )
                 { "cryptsetup", "luksKillSlot", d.device, "1" }, QString(), d.passphrase, std::chrono::seconds( 60 ) );
             if ( r.getExitCode() != 0 )
             {
-                cWarning() << "Could not kill a slot to make room on" << d.device << ':' << r.getOutput() << "(exit code"
-                   << r.getExitCode() << ')';
+                cWarning() << "Could not kill a slot to make room on" << d.device << ':' << r.getOutput()
+                           << "(exit code" << r.getExitCode() << ')';
                 return false;
             }
         }
diff --git a/src/modules/netinstall/NetInstallPage.h b/src/modules/netinstall/NetInstallPage.h
index 94ce6d4ba..5b10b5ca7 100644
--- a/src/modules/netinstall/NetInstallPage.h
+++ b/src/modules/netinstall/NetInstallPage.h
@@ -29,7 +29,7 @@ class QNetworkReply;
 namespace Ui
 {
 class Page_NetInst;
-}
+}  // namespace Ui
 
 class NetInstallPage : public QWidget
 {
diff --git a/src/modules/netinstall/PackageModel.h b/src/modules/netinstall/PackageModel.h
index cc8668b2f..01334fea8 100644
--- a/src/modules/netinstall/PackageModel.h
+++ b/src/modules/netinstall/PackageModel.h
@@ -20,7 +20,7 @@
 namespace YAML
 {
 class Node;
-}
+}  // namespace YAML
 
 class PackageModel : public QAbstractItemModel
 {
diff --git a/src/modules/packagechooser/ItemAppStream.h b/src/modules/packagechooser/ItemAppStream.h
index 9fa3608c3..5d92ab443 100644
--- a/src/modules/packagechooser/ItemAppStream.h
+++ b/src/modules/packagechooser/ItemAppStream.h
@@ -15,7 +15,7 @@
 namespace AppStream
 {
 class Pool;
-}
+}  // namespace AppStream
 
 /** @brief Loads an item from AppStream data.
  *
diff --git a/src/modules/packagechooser/PackageChooserPage.h b/src/modules/packagechooser/PackageChooserPage.h
index 90c2b28a6..1889ef500 100644
--- a/src/modules/packagechooser/PackageChooserPage.h
+++ b/src/modules/packagechooser/PackageChooserPage.h
@@ -19,7 +19,7 @@
 namespace Ui
 {
 class PackageChooserPage;
-}
+}  // namespace Ui
 
 class PackageChooserPage : public QWidget
 {
diff --git a/src/modules/partition/core/KPMHelpers.cpp b/src/modules/partition/core/KPMHelpers.cpp
index e3985bc40..102d803cb 100644
--- a/src/modules/partition/core/KPMHelpers.cpp
+++ b/src/modules/partition/core/KPMHelpers.cpp
@@ -199,7 +199,8 @@ cryptOpen( Partition* partition )
     const QString deviceNode = partition->partitionPath();
     ExternalCommand openCmd( QStringLiteral( "cryptsetup" ),
                              { QStringLiteral( "open" ), deviceNode, luksFs->suggestedMapperName( deviceNode ) } );
-    if ( ( openCmd.write( luksFs->passphrase().toLocal8Bit() + '\n' ) && openCmd.start( -1 ) && openCmd.exitCode() == 0 ) )
+    if ( ( openCmd.write( luksFs->passphrase().toLocal8Bit() + '\n' ) && openCmd.start( -1 )
+           && openCmd.exitCode() == 0 ) )
     {
         luksFs->scan( deviceNode );
         if ( luksFs->mapperName().isEmpty() )
@@ -252,9 +253,7 @@ cryptLabel( Partition* partition, const QString& label )
         if ( !mappedDevice.isEmpty() )
         {
             // Label mapped device
-            ExternalCommand openCmd( QStringLiteral( "e2label" ),
-                                     { mappedDevice,
-                                     label } );
+            ExternalCommand openCmd( QStringLiteral( "e2label" ), { mappedDevice, label } );
             openCmd.start( -1 );
             cryptClose( partition );
             return true;
@@ -262,11 +261,9 @@ cryptLabel( Partition* partition, const QString& label )
     }
     else
     {
-        ExternalCommand openCmd( QStringLiteral( "cryptsetup" ),
-                                 { QStringLiteral( "config" ),
-                                 partition->partitionPath(),
-                                 QStringLiteral( "--label" ),
-                                 label } );
+        ExternalCommand openCmd(
+            QStringLiteral( "cryptsetup" ),
+            { QStringLiteral( "config" ), partition->partitionPath(), QStringLiteral( "--label" ), label } );
         if ( openCmd.start( -1 ) && openCmd.exitCode() == 0 )
         {
             return true;
@@ -286,12 +283,10 @@ cryptVersion( Partition* partition )
     // Get luks version from header information
     int luksVersion = 1;
     ExternalCommand openCmd( QStringLiteral( "cryptsetup" ),
-                             { QStringLiteral( "luksDump" ),
-                             partition->partitionPath() } );
+                             { QStringLiteral( "luksDump" ), partition->partitionPath() } );
     if ( openCmd.start( -1 ) && openCmd.exitCode() == 0 )
     {
-        QRegularExpression re( QStringLiteral( R"(version:\s+(\d))" ),
-                               QRegularExpression::CaseInsensitiveOption );
+        QRegularExpression re( QStringLiteral( R"(version:\s+(\d))" ), QRegularExpression::CaseInsensitiveOption );
         QRegularExpressionMatch rem = re.match( openCmd.output() );
         if ( rem.hasMatch() )
         {
diff --git a/src/modules/partition/core/PartUtils.h b/src/modules/partition/core/PartUtils.h
index f3c51df45..0ed388ff5 100644
--- a/src/modules/partition/core/PartUtils.h
+++ b/src/modules/partition/core/PartUtils.h
@@ -27,7 +27,7 @@ class Partition;
 namespace Logger
 {
 class Once;
-}
+}  // namespace Logger
 
 namespace PartUtils
 {
diff --git a/src/modules/partition/gui/ChoicePage.h b/src/modules/partition/gui/ChoicePage.h
index ea346f5ad..ee60b4309 100644
--- a/src/modules/partition/gui/ChoicePage.h
+++ b/src/modules/partition/gui/ChoicePage.h
@@ -33,7 +33,7 @@ namespace Calamares
 namespace Widgets
 {
 class PrettyRadioButton;
-}
+}  // namespace Widgets
 }  // namespace Calamares
 
 class Config;
diff --git a/src/modules/partition/gui/EncryptWidget.h b/src/modules/partition/gui/EncryptWidget.h
index 704365817..9a3b8ab1f 100644
--- a/src/modules/partition/gui/EncryptWidget.h
+++ b/src/modules/partition/gui/EncryptWidget.h
@@ -17,7 +17,7 @@
 namespace Ui
 {
 class EncryptWidget;
-}
+}  // namespace Ui
 
 class EncryptWidget : public QWidget
 {
diff --git a/src/modules/partition/gui/VolumeGroupBaseDialog.h b/src/modules/partition/gui/VolumeGroupBaseDialog.h
index 94ed0b98b..56379e75f 100644
--- a/src/modules/partition/gui/VolumeGroupBaseDialog.h
+++ b/src/modules/partition/gui/VolumeGroupBaseDialog.h
@@ -17,7 +17,7 @@
 namespace Ui
 {
 class VolumeGroupBaseDialog;
-}
+}  // namespace Ui
 
 class QComboBox;
 class QLineEdit;
diff --git a/src/modules/plasmalnf/PlasmaLnfPage.h b/src/modules/plasmalnf/PlasmaLnfPage.h
index 0616b1a48..24813239a 100644
--- a/src/modules/plasmalnf/PlasmaLnfPage.h
+++ b/src/modules/plasmalnf/PlasmaLnfPage.h
@@ -15,7 +15,7 @@
 namespace Ui
 {
 class PlasmaLnfPage;
-}
+}  // namespace Ui
 
 class Config;
 
diff --git a/src/modules/tracking/TrackingPage.h b/src/modules/tracking/TrackingPage.h
index eb843b755..d9c5a3ec1 100644
--- a/src/modules/tracking/TrackingPage.h
+++ b/src/modules/tracking/TrackingPage.h
@@ -19,7 +19,7 @@
 namespace Ui
 {
 class TrackingPage;
-}
+}  // namespace Ui
 
 class Config;
 class TrackingStyleConfig;
diff --git a/src/modules/users/UsersPage.h b/src/modules/users/UsersPage.h
index ed537540c..2d48f1fa3 100644
--- a/src/modules/users/UsersPage.h
+++ b/src/modules/users/UsersPage.h
@@ -25,7 +25,7 @@ class QLabel;
 namespace Ui
 {
 class Page_UserSetup;
-}
+}  // namespace Ui
 
 class UsersPage : public QWidget
 {
diff --git a/src/modules/welcome/WelcomePage.h b/src/modules/welcome/WelcomePage.h
index d5741240d..71aebd468 100644
--- a/src/modules/welcome/WelcomePage.h
+++ b/src/modules/welcome/WelcomePage.h
@@ -19,7 +19,7 @@
 namespace Ui
 {
 class WelcomePage;
-}
+}  // namespace Ui
 
 class CheckerContainer;
 class Config;
diff --git a/src/modules/welcome/WelcomeViewStep.h b/src/modules/welcome/WelcomeViewStep.h
index dfc6f1169..effaafcf8 100644
--- a/src/modules/welcome/WelcomeViewStep.h
+++ b/src/modules/welcome/WelcomeViewStep.h
@@ -28,7 +28,7 @@ namespace CalamaresUtils
 namespace GeoIP
 {
 class Handler;
-}
+}  // namespace GeoIP
 }  // namespace CalamaresUtils
 
 class PLUGINDLLEXPORT WelcomeViewStep : public Calamares::ViewStep
diff --git a/src/modules/welcome/checker/GeneralRequirements.cpp b/src/modules/welcome/checker/GeneralRequirements.cpp
index 0c467124f..cebfc1a4b 100644
--- a/src/modules/welcome/checker/GeneralRequirements.cpp
+++ b/src/modules/welcome/checker/GeneralRequirements.cpp
@@ -230,7 +230,7 @@ GeneralRequirements::checkRequirements()
         }
         if ( entry == "slow-false" )
         {
-            sleep(3);
+            sleep( 3 );
             checkEntries.append( { entry,
                                    [] { return tr( "is always false (slowly)" ); },
                                    [] { return tr( "The computer says no (slowly)." ); },
@@ -247,7 +247,7 @@ GeneralRequirements::checkRequirements()
         }
         if ( entry == "slow-true" )
         {
-            sleep(3);
+            sleep( 3 );
             checkEntries.append( { entry,
                                    [] { return tr( "is always true (slowly)" ); },
                                    [] { return tr( "The computer says yes (slowly)." ); },
diff --git a/src/modules/welcomeq/WelcomeQmlViewStep.h b/src/modules/welcomeq/WelcomeQmlViewStep.h
index 1ed90ce05..12beb4dde 100644
--- a/src/modules/welcomeq/WelcomeQmlViewStep.h
+++ b/src/modules/welcomeq/WelcomeQmlViewStep.h
@@ -26,7 +26,7 @@ namespace CalamaresUtils
 namespace GeoIP
 {
 class Handler;
-}
+}  // namespace GeoIP
 }  // namespace CalamaresUtils
 
 

From ef4980448ae9cf38925a76e1e3407714de1535f2 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Mon, 27 Jun 2022 22:50:37 +0200
Subject: [PATCH 40/91] [bootloader] Repair schema file

Looks like clang-format was applied to this JSON schema
file in 5a14c3c76fbbd72ace798f85ab16906a90ee81d5, which is
completely borked. Restore from earlier revision, now
with just `machineid` removed.
---
 src/modules/bootloader/bootloader.schema.yaml | 63 ++++++++++---------
 1 file changed, 35 insertions(+), 28 deletions(-)

diff --git a/src/modules/bootloader/bootloader.schema.yaml b/src/modules/bootloader/bootloader.schema.yaml
index 6dc59c2c2..ef61721c0 100644
--- a/src/modules/bootloader/bootloader.schema.yaml
+++ b/src/modules/bootloader/bootloader.schema.yaml
@@ -1,31 +1,38 @@
-#SPDX - FileCopyrightText : 2020 Adriaan de Groot < groot @kde.org>
-#SPDX - License - Identifier : GPL - 3.0 - or -later
--- -$schema : https :  //json-schema.org/schema#
-                       $id : https :  //calamares.io/schemas/bootloader
-                                      additionalProperties : false type : object properties : efiBootLoader
-    : { type : string } kernelSearchPath : { type : string } kernelName : { type : string } timeout:
-{
-type:
-    string
-}
-#Inserted verbatim additionalInitrdFiles : type : array items : type : string bootloaderEntryName : {
-    type : string } kernelLine : { type : string } fallbackKernelLine:
-{
-type:
-    string
-}
+# SPDX-FileCopyrightText: 2020 Adriaan de Groot 
+# SPDX-License-Identifier: GPL-3.0-or-later
+---
+$schema: https://json-schema.org/schema#
+$id: https://calamares.io/schemas/bootloader
+additionalProperties: false
+type: object
+properties:
+    efiBootLoader: { type: string }
+    kernelSearchPath:  { type: string }
+    kernelName:  { type: string }
+    timeout:  { type: string }  # Inserted verbatim
+    additionalInitrdFiles:
+        type: array
+        items:
+            type: string
+    bootloaderEntryName:  { type: string }
+    kernelLine:  { type: string }
+    fallbackKernelLine:  { type: string }
 
-#Programs
-grubInstall : { type : string } grubMkconfig : { type : string } grubCfg : { type : string } grubProbe
-    : { type : string } efiBootMgr : { type : string }
+    # Programs
+    grubInstall:  { type: string }
+    grubMkconfig:  { type: string }
+    grubCfg:  { type: string }
+    grubProbe: { type: string }
+    efiBootMgr: { type: string }
 
-                                     efiBootloaderId : { type : string } installEFIFallback : { type : boolean }
+    efiBootloaderId:  { type: string }
+    installEFIFallback: { type: boolean }
 
-                                                                                              required
-    : -efiBootLoader
-      - kernelSearchPath
-      - kernelName
-      - grubInstall
-      - grubMkconfig
-      - grubCfg
-      - grubProbe
+required:
+    - efiBootLoader
+    - kernelSearchPath
+    - kernelName
+    - grubInstall
+    - grubMkconfig
+    - grubCfg
+    - grubProbe

From 873d5e352204a5d4ce35f79235f7d845d64fbd59 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Mon, 27 Jun 2022 22:56:07 +0200
Subject: [PATCH 41/91] [fstab] Remove schema-entry for mountOptions

These were removed from the module in commit
	03f2e45605b73bc7304115e63e613497cff06e68
but later restored by a botched merge.
---
 src/modules/fstab/fstab.schema.yaml | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/src/modules/fstab/fstab.schema.yaml b/src/modules/fstab/fstab.schema.yaml
index 62d55c180..e298a9d04 100644
--- a/src/modules/fstab/fstab.schema.yaml
+++ b/src/modules/fstab/fstab.schema.yaml
@@ -6,24 +6,6 @@ $id: https://calamares.io/schemas/fstab
 additionalProperties: false
 type: object
 properties:
-    mountOptions:
-        type: object
-        additionalProperties: true  # we don't know which FS exist
-        properties:
-            "default": { type: string }
-            btrfs: { type: string }
-        required: [ "default" ]
-    ssdExtraMountOptions:
-        type: object
-        additionalProperties: true  # we don't know which FS exist
-        properties:
-            ext4: { type: string }
-            jfs: { type: string }
-            xfs: { type: string }
-            swap: { type: string }
-            btrfs: { type: string }
-            btrfs_swap: { type: string }
-    efiMountOptions: { type: string }
     crypttabOptions: { type: string }
     tmpOptions:
         type: object
@@ -43,5 +25,4 @@ properties:
                     options: { type: string }
         required: [ "default" ]
 required:
-    - mountOptions
     - tmpOptions

From d797aea311075c24cac105b4fa02836e41fc6fcf Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Mon, 27 Jun 2022 23:00:13 +0200
Subject: [PATCH 42/91] [grubcfg] Repair typo in schema key

---
 src/modules/grubcfg/grubcfg.schema.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/grubcfg/grubcfg.schema.yaml b/src/modules/grubcfg/grubcfg.schema.yaml
index f10b03a83..d4d8b5ddb 100644
--- a/src/modules/grubcfg/grubcfg.schema.yaml
+++ b/src/modules/grubcfg/grubcfg.schema.yaml
@@ -7,7 +7,7 @@ additionalProperties: false
 type: object
 properties:
     overwrite: { type: boolean, default: false }
-    keep_istributor: { type: boolean, default: false }
+    keep_distributor: { type: boolean, default: false }
     prefer_grub_d: { type: boolean, default: false }
     kernel_params: { type: array, items: { type: string } }
     defaults:

From cdbc7fffca3b5e5453b8313d3433b9d45db74fa5 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Mon, 27 Jun 2022 23:04:12 +0200
Subject: [PATCH 43/91] [mount] Repair test-config files against schema

- can't use *bogus* as a key unless that's allowed by
  the schema -- and it is not.
- can't supply empty config if there is supposed to be
  an object there.

This makes it a little difficult to allow a config-file
that is actually no-configuration-at-all (or only-defaults).
Put in values for *btrfsSwapSubvol* since it isn't a fragile
setting.
---
 src/modules/mount/tests/1.job | 2 +-
 src/modules/mount/tests/2.job | 1 +
 src/modules/mount/tests/3.job | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/modules/mount/tests/1.job b/src/modules/mount/tests/1.job
index 94b3a1492..5d2365cc6 100644
--- a/src/modules/mount/tests/1.job
+++ b/src/modules/mount/tests/1.job
@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: no
 # SPDX-License-Identifier: CC0-1.0
-bogus: true
+btrfsSwapSubvol: ""
 
 # No configuration needed because the partitions are
 # all filesystems that require no special handling.
diff --git a/src/modules/mount/tests/2.job b/src/modules/mount/tests/2.job
index 40d8c6171..54ff59d4a 100644
--- a/src/modules/mount/tests/2.job
+++ b/src/modules/mount/tests/2.job
@@ -1,5 +1,6 @@
 # SPDX-FileCopyrightText: no
 # SPDX-License-Identifier: CC0-1.0
+btrfsSwapSubvol: ""
 
 # Expect a complaint and a default btrfs layout because the
 # partitions use btrfs
diff --git a/src/modules/mount/tests/3.job b/src/modules/mount/tests/3.job
index 94b3a1492..5d2365cc6 100644
--- a/src/modules/mount/tests/3.job
+++ b/src/modules/mount/tests/3.job
@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: no
 # SPDX-License-Identifier: CC0-1.0
-bogus: true
+btrfsSwapSubvol: ""
 
 # No configuration needed because the partitions are
 # all filesystems that require no special handling.

From bb05deca33f1042bb5706eae1b85bc00a5fc1d14 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Mon, 27 Jun 2022 23:12:31 +0200
Subject: [PATCH 44/91] [netinstall] Repair schema IDs

The schema is considered invalid by **some** versions of
configvalidator (or rather, the underlying jsonschema):

```
128: '#definitions/groups' does not match '^[^#]*#?$'
128:
128: Failed validating 'pattern' in metaschema['properties']['definitions']['additionalProperties']['$dynamicRef']['allOf'][0]['properties']['$id']:
128:     {'$comment': 'Non-empty fragments not allowed.',
128:      '$ref': '#/$defs/uriReferenceString',
128:      'pattern': '^[^#]*#?$'}
```

Remove the `#` from the IDs.
---
 src/modules/netinstall/netinstall.schema.yaml | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/modules/netinstall/netinstall.schema.yaml b/src/modules/netinstall/netinstall.schema.yaml
index 05ab4cd08..3ec63daed 100644
--- a/src/modules/netinstall/netinstall.schema.yaml
+++ b/src/modules/netinstall/netinstall.schema.yaml
@@ -6,7 +6,7 @@ $schema: https://json-schema.org/draft-07/schema#
 $id: https://calamares.io/schemas/netinstall
 definitions:
     package:
-        $id: '#definitions/package'
+        $id: 'definitions/package'
         oneOf:
         -
             type: string
@@ -20,7 +20,7 @@ definitions:
                 name: { type: string }
                 description: { type: string }
     group:
-        $id: '#definitions/group'
+        $id: 'definitions/group'
         type: object
         description: Longer discussion in `netinstall.conf` file under 'Groups Format'
         properties:
@@ -28,7 +28,7 @@ definitions:
             description: { type: string }
             packages:
                 type: array
-                items: { $ref: '#definitions/package' }
+                items: { $ref: 'definitions/package' }
             hidden: { type: boolean, default: false }
             selected: { type: boolean }
             critical: { type: boolean, default: false }
@@ -36,7 +36,7 @@ definitions:
             expanded: { type: boolean }
             subgroups:
                 type: array
-                items: { $ref: '#definitions/group' }
+                items: { $ref: 'definitions/group' }
             pre-install:
                 type: string
                 description: an optional command to run within the new system before the group's
@@ -56,9 +56,9 @@ definitions:
             required: [name, description, packages] # bottom-most (sub)group requires some package (otherwise, why bother?)
     # This should validate `netinstall.yaml` also.
     groups:
-        $id: '#definitions/groups'
+        $id: 'definitions/groups'
         type: array
-        items: { $ref: '#definitions/group' }
+        items: { $ref: 'definitions/group' }
 
 oneOf:
 -   # netinstall.conf
@@ -74,16 +74,16 @@ oneOf:
             properties:
                 sidebar: { type: string }
                 title: { type: string }
-        groups: { $ref: '#definitions/groups' }
+        groups: { $ref: 'definitions/groups' }
     required: [ groupsUrl ]
-    
+
 -   # Groups file with top level *groups* key
     type: object
     description: Groups file with top level *groups* key
     additionalProperties: false
     properties:
-        groups: { $ref: '#definitions/groups' }
+        groups: { $ref: 'definitions/groups' }
     required: [ groups ]
-    
+
 -   # Groups file bare
-    { $ref: '#definitions/groups' }
+    { $ref: 'definitions/groups' }

From 208e7736e649467e6efaf6a30d2a875ab78f4703 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Mon, 27 Jun 2022 23:19:07 +0200
Subject: [PATCH 45/91] [welcome] Repair example config file

Needs quotes for boolean values that are really names.
---
 src/modules/welcome/welcome.conf | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/modules/welcome/welcome.conf b/src/modules/welcome/welcome.conf
index 90bf9d115..b988eb2ff 100644
--- a/src/modules/welcome/welcome.conf
+++ b/src/modules/welcome/welcome.conf
@@ -1,3 +1,4 @@
+
 # SPDX-FileCopyrightText: no
 # SPDX-License-Identifier: CC0-1.0
 #
@@ -76,6 +77,8 @@ requirements:
     # - *slow-true* takes 3 seconds, and then is true
     # - *snark* is a check that is only satisfied once it has been checked
     #   at least three times ("what I tell you three times is true").
+    # Keep in mind that "true" and "false" are YAML keywords for
+    # boolean values, so should be quoted.
     check:
         - storage
         - ram
@@ -83,8 +86,8 @@ requirements:
         - internet
         - root
         - screen
-        - false
-        - true
+        - "false"
+        - slow-true
         - snark
     # List conditions that **must** be satisfied (from the list
     # of conditions, above) for installation to proceed.

From 9d593a2a90829ecb1ffd44c25cacfd43421f90a5 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Mon, 27 Jun 2022 23:19:26 +0200
Subject: [PATCH 46/91] [services-systemd] Repair schema

No # in IDs (see *netinstall* schema for explanation).
---
 .../services-systemd/services-systemd.schema.yaml  | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/modules/services-systemd/services-systemd.schema.yaml b/src/modules/services-systemd/services-systemd.schema.yaml
index 35d34cda8..ee80a80be 100644
--- a/src/modules/services-systemd/services-systemd.schema.yaml
+++ b/src/modules/services-systemd/services-systemd.schema.yaml
@@ -5,7 +5,7 @@ $schema: https://json-schema.org/schema#
 $id: https://calamares.io/schemas/services-systemd
 definitions:
     service:
-        $id: '#definitions/service'
+        $id: 'definitions/service'
         type: object
         description: a name and a flag for services, targets, and others
         additionalProperties: false
@@ -17,9 +17,9 @@ definitions:
 additionalProperties: false
 type: object
 properties:
-    services: { type: array, items: { $ref: '#definitions/service' } }
-    targets: { type: array, items: { $ref: '#definitions/service' } }
-    timers: { type: array, items: { $ref: '#definitions/service' } }
-    disable: { type: array, items: { $ref: '#definitions/service' } }
-    disable-targets: { type: array, items: { $ref: '#definitions/service' } }
-    mask: { type: array, items: { $ref: '#definitions/service' } }
+    services: { type: array, items: { $ref: 'definitions/service' } }
+    targets: { type: array, items: { $ref: 'definitions/service' } }
+    timers: { type: array, items: { $ref: 'definitions/service' } }
+    disable: { type: array, items: { $ref: 'definitions/service' } }
+    disable-targets: { type: array, items: { $ref: 'definitions/service' } }
+    mask: { type: array, items: { $ref: 'definitions/service' } }

From ee848e23671dd3a56a101c1baefbb68d59043dec Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Mon, 27 Jun 2022 00:12:46 +0200
Subject: [PATCH 47/91] [libcalamares] About box should show extended version
 if available

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

diff --git a/src/libcalamares/CalamaresAbout.cpp b/src/libcalamares/CalamaresAbout.cpp
index 08a70968b..86e597b4b 100644
--- a/src/libcalamares/CalamaresAbout.cpp
+++ b/src/libcalamares/CalamaresAbout.cpp
@@ -9,7 +9,7 @@
 
 #include "CalamaresAbout.h"
 
-#include "CalamaresVersion.h"
+#include "CalamaresVersionX.h"
 
 #include 
 

From 3b08ace966de599f88a3a86083651975798a2386 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Mon, 27 Jun 2022 23:52:13 +0200
Subject: [PATCH 48/91] Changes: mention more module-config changes

---
 CHANGES-3.3 | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGES-3.3 b/CHANGES-3.3
index 9debfc8d8..06c058742 100644
--- a/CHANGES-3.3
+++ b/CHANGES-3.3
@@ -19,6 +19,10 @@ large. Configuration files from previous versions of Calamares will
 **certainly** need to be re-validated. Take heed of the many changes
 in the *Modules* heading, below.
 
+Users (distributions) are **strongly** advised to use the tools
+for configuration validation (`ci/configvalidator.py`) to check
+that the distribution configuration files follow the current schema.
+
 ## Project ##
  - The C++ code in the project is now formatted with clang-format 12 or 13,
    with the coding-style as found in `.clang-format`; there are minor
@@ -47,8 +51,12 @@ in the *Modules* heading, below.
  - *bootloader* now supports more options when building the kernel
    command-line. (Thanks Evan)
  - *displaymanager* no longer supports the discontinued *kdm* display manager.
+ - *fstab* configuration has been completely re-done. Many configuration
+   options have moved to the *mount* module. See #1993
  - *grubcfg* changed the key *keepDistributor* to *keep_distributor*.
    Please update configurations.
+ - *mount* now does most of the mounting; options that were in *fstab*
+   have moved here. See #1993
  - *partition* requires KPMCore 21.12 (e.g. KPMCore 4.2 API, or later).
  - *partition* can now skip installing the bootloader in more scenarios.
    #1632 (Thanks Anubhav)

From b0f86d9fb6dd9872d76ec9fe15bba47ad620fbe8 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Mon, 27 Jun 2022 23:53:04 +0200
Subject: [PATCH 49/91] Changes: DBus activation was a mistake, now reverted

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

diff --git a/CHANGES-3.3 b/CHANGES-3.3
index 06c058742..4923dac97 100644
--- a/CHANGES-3.3
+++ b/CHANGES-3.3
@@ -33,11 +33,7 @@ that the distribution configuration files follow the current schema.
 ## Core ##
  - CMake 3.16, Qt 5.15 are now required; the newer CMake is to support
    new features (also for KDE Frameworks), Qt is the current LTS version.
- - KDE Framework "DBusAddons" is now required, and is used to "activate"
-   Calamares; the KDAB Single Application Guard is no longer used.
-   KDSAG needed patching to chase Qt 5.15 deprecations, and the DBus
-   activation code is tried and tested in Frameworks (tier 1).
-   Running `calamares -d` no longer enforces a single-application
+ - Running `calamares -d` no longer enforces a single-application
    (it is for debugging purposes, after all).
  - Python 3.6 or later is now required, to allow for F-strings in
    Python code and allow other tidy-ups in the Python modules.
@@ -45,7 +41,7 @@ that the distribution configuration files follow the current schema.
  - The log file now **always** contains a debug-log, and the `-D` flag
    primarily controls what is printed to stdout. By default, stdout
    only gets errors; use `-D6` to match stdout with the file. Use `-D8`
-   to get a verbose log file **and** verbose stdout.
+   to get an extra-verbose log file **and** verbose stdout.
 
 ## Modules ##
  - *bootloader* now supports more options when building the kernel

From 0c794183936b6d916a109784829e605cc4582e9f Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Mon, 27 Jun 2022 23:54:12 +0200
Subject: [PATCH 50/91] Changes: mention the -alpha1 release

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

diff --git a/CHANGES-3.3 b/CHANGES-3.3
index 4923dac97..d5c9a5e7f 100644
--- a/CHANGES-3.3
+++ b/CHANGES-3.3
@@ -23,6 +23,9 @@ Users (distributions) are **strongly** advised to use the tools
 for configuration validation (`ci/configvalidator.py`) to check
 that the distribution configuration files follow the current schema.
 
+Pre-release versions:
+ - 3.3.0-alpha1 (2022-06-27)
+
 ## Project ##
  - The C++ code in the project is now formatted with clang-format 12 or 13,
    with the coding-style as found in `.clang-format`; there are minor

From 6a9d9700d454a551f00169f75539fb0c165e6b42 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Tue, 28 Jun 2022 23:41:17 +0200
Subject: [PATCH 51/91] [grubcfg] Avoid crashes in tests

- remove "bogus" key when it's not needed
- check for existence of "branding" key in GS before
  subscripting it (this happens in tests, where no
  GS contents are loaded, but not in regular use,
  where startup loads the branding data into GS)
---
 src/modules/grubcfg/main.py        | 5 ++++-
 src/modules/grubcfg/tests/1.global | 3 ++-
 src/modules/grubcfg/tests/2.global | 1 -
 src/modules/grubcfg/tests/3.global | 1 -
 src/modules/grubcfg/tests/4.global | 1 -
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/modules/grubcfg/main.py b/src/modules/grubcfg/main.py
index b992629dd..c9a863ffd 100644
--- a/src/modules/grubcfg/main.py
+++ b/src/modules/grubcfg/main.py
@@ -281,7 +281,10 @@ def run():
     partitions = libcalamares.globalstorage.value("partitions")
     root_mount_point = libcalamares.globalstorage.value("rootMountPoint")
     branding = libcalamares.globalstorage.value("branding")
-    distributor = branding["bootloaderEntryName"]
+    if branding is None:
+        distributor = None
+    else:
+        distributor = branding["bootloaderEntryName"]
 
     if libcalamares.globalstorage.value("bootLoader") is None and fw_type != "efi":
         return None
diff --git a/src/modules/grubcfg/tests/1.global b/src/modules/grubcfg/tests/1.global
index 7dedc1527..504931063 100644
--- a/src/modules/grubcfg/tests/1.global
+++ b/src/modules/grubcfg/tests/1.global
@@ -1,4 +1,5 @@
 # SPDX-FileCopyrightText: no
 # SPDX-License-Identifier: CC0-1.0
 ---
-bogus: true
+branding:
+  bootloaderEntryName: generic
diff --git a/src/modules/grubcfg/tests/2.global b/src/modules/grubcfg/tests/2.global
index 31c6f1166..1e01c6b95 100644
--- a/src/modules/grubcfg/tests/2.global
+++ b/src/modules/grubcfg/tests/2.global
@@ -1,7 +1,6 @@
 # SPDX-FileCopyrightText: no
 # SPDX-License-Identifier: CC0-1.0
 ---
-bogus: true
 firmwareType: bios
 bootLoader: grub
 rootMountPoint: /tmp/calamares/grubcfg-test-2
diff --git a/src/modules/grubcfg/tests/3.global b/src/modules/grubcfg/tests/3.global
index f9e1e6954..3eda6d5a1 100644
--- a/src/modules/grubcfg/tests/3.global
+++ b/src/modules/grubcfg/tests/3.global
@@ -1,7 +1,6 @@
 # SPDX-FileCopyrightText: no
 # SPDX-License-Identifier: CC0-1.0
 ---
-bogus: true
 firmwareType: bios
 bootLoader: grub
 rootMountPoint: /tmp/calamares/grubcfg-test-3
diff --git a/src/modules/grubcfg/tests/4.global b/src/modules/grubcfg/tests/4.global
index 1e8d37fc6..7d4579543 100644
--- a/src/modules/grubcfg/tests/4.global
+++ b/src/modules/grubcfg/tests/4.global
@@ -1,7 +1,6 @@
 # SPDX-FileCopyrightText: no
 # SPDX-License-Identifier: CC0-1.0
 ---
-bogus: true
 firmwareType: bios
 bootLoader: grub
 rootMountPoint: /tmp/calamares/grubcfg-test-4

From b4c23b8b700f78ddfcff62eae86556bbb16d9d2b Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Tue, 28 Jun 2022 23:50:56 +0200
Subject: [PATCH 52/91] [users] In tests, adjust failure expectations

Some distro's let the user change the hostname at will;
others don't, and yet others don't have systemd to change
the hostname with at all. Check if we **can** change the
hostname (as a non-root user), before setting expectations.
---
 src/modules/users/TestSetHostNameJob.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/modules/users/TestSetHostNameJob.cpp b/src/modules/users/TestSetHostNameJob.cpp
index 218eaab7b..8ddc0ade9 100644
--- a/src/modules/users/TestSetHostNameJob.cpp
+++ b/src/modules/users/TestSetHostNameJob.cpp
@@ -131,7 +131,10 @@ UsersTests::testHostnamed()
     // root, assume it will succeed.
     if ( geteuid() != 0 )
     {
-        QEXPECT_FAIL( "", "Hostname changes are access-controlled", Continue );
+        if ( !setSystemdHostname( QStringLiteral( "tubophone.calamares.io" ) ) )
+        {
+            QEXPECT_FAIL( "", "Hostname changes are access-controlled", Continue );
+        }
     }
     QVERIFY( setSystemdHostname( QStringLiteral( "tubophone.calamares.io" ) ) );
     if ( !m_originalHostName.isEmpty() )

From 2d9d65f33ce98cc261557ece7e374e21dfb536cf Mon Sep 17 00:00:00 2001
From: demmm 
Date: Fri, 1 Jul 2022 18:00:21 +0200
Subject: [PATCH 53/91] [webview] remove broken & unused module adjust
 settings.conf to replace webview example & entries this fixes
 https://github.com/calamares/calamares/issues/2003

---
 settings.conf                          |  12 +--
 src/modules/webview/CMakeLists.txt     |  51 -----------
 src/modules/webview/WebViewConfig.h.in |  10 ---
 src/modules/webview/WebViewStep.cpp    | 117 -------------------------
 src/modules/webview/WebViewStep.h      |  71 ---------------
 src/modules/webview/owncloud.conf      |   6 --
 src/modules/webview/webview.conf       |   6 --
 7 files changed, 6 insertions(+), 267 deletions(-)
 delete mode 100644 src/modules/webview/CMakeLists.txt
 delete mode 100644 src/modules/webview/WebViewConfig.h.in
 delete mode 100644 src/modules/webview/WebViewStep.cpp
 delete mode 100644 src/modules/webview/WebViewStep.h
 delete mode 100644 src/modules/webview/owncloud.conf
 delete mode 100644 src/modules/webview/webview.conf

diff --git a/settings.conf b/settings.conf
index 2897da9b6..8f4d60213 100644
--- a/settings.conf
+++ b/settings.conf
@@ -60,8 +60,8 @@ modules-search: [ local ]
 # the instances section can safely be left empty.
 #
 # Module name plus instance name makes an instance key, e.g.
-# "webview@owncloud", where "webview" is the module name (for the webview
-# viewmodule) and "owncloud" is the instance name. In the *sequence*
+# "packagechooserq@licenseq", where "packagechooserq" is the module name (for the packagechooserq
+# viewmodule) and "licenseq" is the instance name. In the *sequence*
 # section below, use instance-keys to name instances (instead of just
 # a module name, for modules which have only a single instance).
 #
@@ -86,9 +86,9 @@ modules-search: [ local ]
 #
 # YAML: list of maps of string:string key-value pairs.
 #instances:
-#- id:       owncloud
-#  module:   webview
-#  config:   owncloud.conf
+#- id:       licenseq
+#  module:   packagechooserq
+#  config:   licenseq.conf
 
 # Sequence section. This section describes the sequence of modules, both
 # viewmodules and jobmodules, as they should appear and/or run.
@@ -116,6 +116,7 @@ sequence:
 - show:
   - welcome
 #  - notesqml
+#  - packagechooserq@licenseq
   - locale
   - keyboard
   - partition
@@ -152,7 +153,6 @@ sequence:
   - bootloader
   - umount
 - show:
-#  - webview@owncloud
   - finished
 
 # A branding component is a directory, either in SHARE/calamares/branding or
diff --git a/src/modules/webview/CMakeLists.txt b/src/modules/webview/CMakeLists.txt
deleted file mode 100644
index b8ef5d7d4..000000000
--- a/src/modules/webview/CMakeLists.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-# === This file is part of Calamares -  ===
-#
-#   SPDX-FileCopyrightText: 2020 Adriaan de Groot 
-#   SPDX-License-Identifier: BSD-2-Clause
-#
-set(CALA_WEBVIEW_LINK_LIBRARIES "")
-
-option(WEBVIEW_FORCE_WEBKIT "Always build webview with WebKit instead of WebEngine regardless of Qt version." OFF)
-
-set(_reason "")
-
-message(STATUS "Found Qt version ${Qt5Core_VERSION}")
-if(Qt5Core_VERSION VERSION_LESS 5.6 OR WEBVIEW_FORCE_WEBKIT)
-    message(STATUS " .. using webkit")
-    find_package(Qt5 ${QT_VERSION} CONFIG COMPONENTS WebKit WebKitWidgets)
-
-    if(Qt5WebKit_FOUND AND Qt5WebKitWidgets_FOUND)
-        list(APPEND CALA_WEBVIEW_INCLUDE_DIRECTORIES ${QT_QTWEBKIT_INCLUDE_DIR})
-        list(APPEND CALA_WEBVIEW_LINK_LIBRARIES Qt5::WebKit Qt5::WebKitWidgets)
-        set(WEBVIEW_WITH_WEBKIT 1)
-    else()
-        set(_reason "No suitable WebKit")
-    endif()
-else()
-    message(STATUS " .. using webengine")
-    find_package(Qt5 ${QT_VERSION} CONFIG COMPONENTS WebEngine WebEngineWidgets)
-
-    if(Qt5WebEngine_FOUND AND Qt5WebEngineWidgets_FOUND)
-        list(APPEND CALA_WEBVIEW_INCLUDE_DIRECTORIES ${QT_QTWEBENGINE_INCLUDE_DIR})
-        list(APPEND CALA_WEBVIEW_LINK_LIBRARIES Qt5::WebEngine Qt5::WebEngineWidgets)
-        set(WEBVIEW_WITH_WEBENGINE 1)
-    else()
-        set(_reason "No suitable WebEngine")
-    endif()
-endif()
-
-if(NOT _reason)
-    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/WebViewConfig.h.in ${CMAKE_CURRENT_BINARY_DIR}/WebViewConfig.h)
-
-    calamares_add_plugin(webview
-        TYPE viewmodule
-        EXPORT_MACRO PLUGINDLLEXPORT_PRO
-        SOURCES
-            WebViewStep.cpp
-        LINK_PRIVATE_LIBRARIES
-            ${CALA_WEBVIEW_LINK_LIBRARIES}
-        SHARED_LIB
-    )
-else()
-    calamares_skip_module( "webview (${_reason})" )
-endif()
diff --git a/src/modules/webview/WebViewConfig.h.in b/src/modules/webview/WebViewConfig.h.in
deleted file mode 100644
index ddc07b31c..000000000
--- a/src/modules/webview/WebViewConfig.h.in
+++ /dev/null
@@ -1,10 +0,0 @@
-/* SPDX-FileCopyrightText: no
-   SPDX-License-Identifier: CC0-1.0
-*/
-#ifndef CALAMARESWEBVIEWCONFIG_H
-#define CALAMARESWEBVIEWCONFIG_H
-
-#cmakedefine WEBVIEW_WITH_WEBENGINE
-#cmakedefine WEBVIEW_WITH_WEBKIT
-
-#endif // CALAMARESWEBVIEWCONFIG_H
diff --git a/src/modules/webview/WebViewStep.cpp b/src/modules/webview/WebViewStep.cpp
deleted file mode 100644
index d787b8ec6..000000000
--- a/src/modules/webview/WebViewStep.cpp
+++ /dev/null
@@ -1,117 +0,0 @@
-/* === This file is part of Calamares -  ===
- *
- *   SPDX-FileCopyrightText: 2015 Rohan Garg 
- *   SPDX-FileCopyrightText: 2016 Teo Mrnjavac 
- *   SPDX-License-Identifier: GPL-3.0-or-later
- *
- *   Calamares is Free Software: see the License-Identifier above.
- *
- */
-
-#include "WebViewStep.h"
-
-#include 
-
-#ifdef WEBVIEW_WITH_WEBKIT
-#include 
-#else
-#include 
-#include 
-#endif
-
-CALAMARES_PLUGIN_FACTORY_DEFINITION( WebViewStepFactory, registerPlugin< WebViewStep >(); )
-
-WebViewStep::WebViewStep( QObject* parent )
-    : Calamares::ViewStep( parent )
-{
-    emit nextStatusChanged( true );
-#ifdef WEBVIEW_WITH_WEBENGINE
-    QtWebEngine::initialize();
-#endif
-    m_view = new WebViewWidget();
-#ifdef WEBVIEW_WITH_WEBKIT
-    m_view->settings()->setFontFamily( QWebSettings::StandardFont,
-                                       m_view->settings()->fontFamily( QWebSettings::SansSerifFont ) );
-    m_view->setRenderHints( QPainter::Antialiasing | QPainter::TextAntialiasing | QPainter::SmoothPixmapTransform );
-#endif
-}
-
-
-WebViewStep::~WebViewStep()
-{
-    if ( m_view && m_view->parent() == nullptr )
-    {
-        m_view->deleteLater();
-    }
-}
-
-
-QString
-WebViewStep::prettyName() const
-{
-    return m_prettyName;
-}
-
-
-QWidget*
-WebViewStep::widget()
-{
-    return m_view;
-}
-
-
-bool
-WebViewStep::isNextEnabled() const
-{
-    return true;
-}
-
-
-bool
-WebViewStep::isBackEnabled() const
-{
-    return true;
-}
-
-
-bool
-WebViewStep::isAtBeginning() const
-{
-    return true;
-}
-
-
-bool
-WebViewStep::isAtEnd() const
-{
-    return true;
-}
-
-void
-WebViewStep::onActivate()
-{
-    m_view->load( QUrl( m_url ) );
-    m_view->show();
-}
-
-QList< Calamares::job_ptr >
-WebViewStep::jobs() const
-{
-    return QList< Calamares::job_ptr >();
-}
-
-
-void
-WebViewStep::setConfigurationMap( const QVariantMap& configurationMap )
-{
-    if ( configurationMap.contains( "url" ) && configurationMap.value( "url" ).type() == QVariant::String )
-    {
-        m_url = configurationMap.value( "url" ).toString();
-    }
-
-    if ( configurationMap.contains( "prettyName" )
-         && configurationMap.value( "prettyName" ).type() == QVariant::String )
-    {
-        m_prettyName = configurationMap.value( "prettyName" ).toString();
-    }
-}
diff --git a/src/modules/webview/WebViewStep.h b/src/modules/webview/WebViewStep.h
deleted file mode 100644
index 700da2856..000000000
--- a/src/modules/webview/WebViewStep.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* === This file is part of Calamares -  ===
- *
- *   SPDX-FileCopyrightText: 2015 Rohan Garg 
- *   SPDX-FileCopyrightText: 2016 Teo Mrnjavac 
- *   SPDX-FileCopyrightText: 2017 Adriaan de Groot 
- *   SPDX-License-Identifier: GPL-3.0-or-later
- *
- *   Calamares is Free Software: see the License-Identifier above.
- *
- */
-
-#ifndef WEBVIEWPLUGIN_H
-#define WEBVIEWPLUGIN_H
-
-#include "WebViewConfig.h"
-
-#include "DllMacro.h"
-#include "utils/PluginFactory.h"
-#include "viewpages/ViewStep.h"
-
-#include 
-
-#if defined( WEBVIEW_WITH_WEBKIT ) && defined( WEBVIEW_WITH_WEBENGINE )
-#error Both WEBENGINE and WEBKIT enabled
-#endif
-#if !defined( WEBVIEW_WITH_WEBKIT ) && !defined( WEBVIEW_WITH_WEBENGINE )
-#error Neither WEBENGINE nor WEBKIT enabled
-#endif
-
-#ifdef WEBVIEW_WITH_WEBKIT
-class QWebView;
-using WebViewWidget = QWebView;
-#endif
-#ifdef WEBVIEW_WITH_WEBENGINE
-class QWebEngineView;
-using WebViewWidget = QWebEngineView;
-#endif
-
-class PLUGINDLLEXPORT WebViewStep : public Calamares::ViewStep
-{
-    Q_OBJECT
-
-public:
-    explicit WebViewStep( QObject* parent = nullptr );
-    ~WebViewStep() override;
-
-    QString prettyName() const override;
-
-    QWidget* widget() override;
-
-    void onActivate() override;
-
-    bool isNextEnabled() const override;
-    bool isBackEnabled() const override;
-
-    bool isAtBeginning() const override;
-    bool isAtEnd() const override;
-
-    QList< Calamares::job_ptr > jobs() const override;
-
-    void setConfigurationMap( const QVariantMap& configurationMap ) override;
-
-private:
-    WebViewWidget* m_view;
-    QString m_url;
-    QString m_prettyName;
-};
-
-CALAMARES_PLUGIN_FACTORY_DECLARATION( WebViewStepFactory )
-
-#endif  // WEBVIEWPLUGIN_H
diff --git a/src/modules/webview/owncloud.conf b/src/modules/webview/owncloud.conf
deleted file mode 100644
index 4e2930919..000000000
--- a/src/modules/webview/owncloud.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# SPDX-FileCopyrightText: no
-# SPDX-License-Identifier: CC0-1.0
-#
----
-prettyName: "OwnCloud"
-url:        "https://owncloud.org"
diff --git a/src/modules/webview/webview.conf b/src/modules/webview/webview.conf
deleted file mode 100644
index 353f81488..000000000
--- a/src/modules/webview/webview.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# SPDX-FileCopyrightText: no
-# SPDX-License-Identifier: CC0-1.0
-#
----
-prettyName: "Webview"
-url:        "https://calamares.io"

From 273941f451ac9b5264a3e19ea0e84ae18cd46346 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Sat, 2 Jul 2022 15:56:21 +0200
Subject: [PATCH 54/91] [libcalamares] Add convenience for building
 macro-expanders

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

diff --git a/src/libcalamares/utils/StringExpander.h b/src/libcalamares/utils/StringExpander.h
index 9168621f0..e0b21bee8 100644
--- a/src/libcalamares/utils/StringExpander.h
+++ b/src/libcalamares/utils/StringExpander.h
@@ -48,6 +48,14 @@ public:
     virtual ~DictionaryExpander() override;
 
     void insert( const QString& key, const QString& value );
+    /** @brief As insert(), but supports method-chaining.
+     *
+     */
+    DictionaryExpander& add( const QString& key, const QString& value )
+    {
+        insert( key, value );
+        return *this;
+    }
 
     void clearErrors();
     bool hasErrors() const;

From f8a845d996650766161714d014272aa97dd73051 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Sat, 2 Jul 2022 15:56:59 +0200
Subject: [PATCH 55/91] [users] Use DictionaryExpander instead of raw
 KMacroExpander

---
 src/modules/users/Config.cpp | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/modules/users/Config.cpp b/src/modules/users/Config.cpp
index f55c4fd99..20c9dea6f 100644
--- a/src/modules/users/Config.cpp
+++ b/src/modules/users/Config.cpp
@@ -18,10 +18,9 @@
 #include "JobQueue.h"
 #include "utils/Logger.h"
 #include "utils/String.h"
+#include "utils/StringExpander.h"
 #include "utils/Variant.h"
 
-#include 
-
 #include 
 #include 
 #include 
@@ -415,20 +414,20 @@ invalidEmpty( const QString& s )
 STATICTEST QString
 makeHostnameSuggestion( const QString& templateString, const QStringList& fullNameParts, const QString& loginName )
 {
-    QHash< QString, QString > replace;
+    Calamares::String::DictionaryExpander d;
     // User data
-    replace.insert( QStringLiteral( "first" ),
-                    invalidEmpty( fullNameParts.isEmpty() ? QString() : cleanupForHostname( fullNameParts.first() ) ) );
-    replace.insert( QStringLiteral( "name" ), invalidEmpty( cleanupForHostname( fullNameParts.join( QString() ) ) ) );
-    replace.insert( QStringLiteral( "login" ), invalidEmpty( cleanupForHostname( loginName ) ) );
-    // Hardware data
-    replace.insert( QStringLiteral( "product" ), guessProductName() );
-    replace.insert( QStringLiteral( "product2" ), cleanupForHostname( QSysInfo::prettyProductName() ) );
-    replace.insert( QStringLiteral( "cpu" ), cleanupForHostname( QSysInfo::currentCpuArchitecture() ) );
-    // Hostname data
-    replace.insert( QStringLiteral( "host" ), invalidEmpty( cleanupForHostname( QSysInfo::machineHostName() ) ) );
+    d.add( QStringLiteral( "first" ),
+           invalidEmpty( fullNameParts.isEmpty() ? QString() : cleanupForHostname( fullNameParts.first() ) ) )
+        .add( QStringLiteral( "name" ), invalidEmpty( cleanupForHostname( fullNameParts.join( QString() ) ) ) )
+        .add( QStringLiteral( "login" ), invalidEmpty( cleanupForHostname( loginName ) ) )
+        // Hardware data
+        .add( QStringLiteral( "product" ), guessProductName() )
+        .add( QStringLiteral( "product2" ), cleanupForHostname( QSysInfo::prettyProductName() ) )
+        .add( QStringLiteral( "cpu" ), cleanupForHostname( QSysInfo::currentCpuArchitecture() ) )
+        // Hostname data
+        .add( QStringLiteral( "host" ), invalidEmpty( cleanupForHostname( QSysInfo::machineHostName() ) ) );
 
-    QString hostnameSuggestion = KMacroExpander::expandMacros( templateString, replace, '$' );
+    QString hostnameSuggestion = d.expand( templateString );
 
     // RegExp for valid hostnames; if the suggestion produces a valid name, return it
     static const QRegExp HOSTNAME_RX( "^[a-zA-Z0-9][-a-zA-Z0-9_]*$" );

From a7b3ccf1982319688c978c15f4f012c340520cc9 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Sat, 2 Jul 2022 16:00:42 +0200
Subject: [PATCH 56/91] [oemid] Use consistent ${} substitution

SEE #1438
---
 CHANGES-3.3                       |  2 ++
 src/modules/oemid/OEMViewStep.cpp | 11 ++++-------
 src/modules/oemid/oemid.conf      |  6 +++---
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/CHANGES-3.3 b/CHANGES-3.3
index d5c9a5e7f..f2059f700 100644
--- a/CHANGES-3.3
+++ b/CHANGES-3.3
@@ -56,6 +56,8 @@ Pre-release versions:
    Please update configurations.
  - *mount* now does most of the mounting; options that were in *fstab*
    have moved here. See #1993
+ - *oemid* now uses consistent variable replacement (e.g. KMacroExpander)
+   and does not support `@@DATE@@` anymore (use `${DATE}`).
  - *partition* requires KPMCore 21.12 (e.g. KPMCore 4.2 API, or later).
  - *partition* can now skip installing the bootloader in more scenarios.
    #1632 (Thanks Anubhav)
diff --git a/src/modules/oemid/OEMViewStep.cpp b/src/modules/oemid/OEMViewStep.cpp
index 0c1bdd1d8..0663efdbd 100644
--- a/src/modules/oemid/OEMViewStep.cpp
+++ b/src/modules/oemid/OEMViewStep.cpp
@@ -14,6 +14,7 @@
 #include "IDJob.h"
 
 #include "utils/Retranslator.h"
+#include "utils/StringExpander.h"
 #include "utils/Variant.h"
 
 #include 
@@ -82,14 +83,10 @@ OEMViewStep::isAtEnd() const
 static QString
 substitute( QString s )
 {
-    QString t_date = QStringLiteral( "@@DATE@@" );
-    if ( s.contains( t_date ) )
-    {
-        auto date = QDate::currentDate();
-        s = s.replace( t_date, date.toString( Qt::ISODate ) );
-    }
+    Calamares::String::DictionaryExpander d;
+    d.insert( QStringLiteral( "DATE" ), QDate::currentDate().toString( Qt::ISODate ) );
 
-    return s;
+    return d.expand( s );
 }
 
 void
diff --git a/src/modules/oemid/oemid.conf b/src/modules/oemid/oemid.conf
index 921fb3b30..4fb14d931 100644
--- a/src/modules/oemid/oemid.conf
+++ b/src/modules/oemid/oemid.conf
@@ -5,12 +5,12 @@
 ---
 # The batch-identifier is written to /var/log/installer/oem-id.
 # This value is put into the text box as the **suggested**
-# OEM ID. If @@DATE@@ is included in the identifier, then
+# OEM ID. If ${DATE} is included in the identifier, then
 # that is replaced by the current date in yyyy-MM-dd (ISO) format.
 #
-# it is ok for the identifier to be empty.
+# It is ok for the identifier to be empty.
 #
 # The identifier is written to the file as UTF-8 (this will be no
 # different from ASCII, for most inputs) and followed by a newline.
 # If the identifier is empty, only a newline is written.
-batch-identifier: neon-@@DATE@@
+batch-identifier: neon-${DATE}

From 3d901637d118c4c904862468c9227882b5b470bd Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Sat, 2 Jul 2022 16:03:36 +0200
Subject: [PATCH 57/91] [preservefiles] Use ${} expansion instead of @@

SEE #1438
---
 CHANGES-3.3                                  | 1 +
 src/modules/preservefiles/PreserveFiles.cpp  | 4 +++-
 src/modules/preservefiles/preservefiles.conf | 9 ++++++---
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/CHANGES-3.3 b/CHANGES-3.3
index f2059f700..3769a6ef4 100644
--- a/CHANGES-3.3
+++ b/CHANGES-3.3
@@ -61,4 +61,5 @@ Pre-release versions:
  - *partition* requires KPMCore 21.12 (e.g. KPMCore 4.2 API, or later).
  - *partition* can now skip installing the bootloader in more scenarios.
    #1632 (Thanks Anubhav)
+ - *preservefiles* follows `${}` variable syntax instead of `@@`.
 
diff --git a/src/modules/preservefiles/PreserveFiles.cpp b/src/modules/preservefiles/PreserveFiles.cpp
index f904ded8c..8cbeee75f 100644
--- a/src/modules/preservefiles/PreserveFiles.cpp
+++ b/src/modules/preservefiles/PreserveFiles.cpp
@@ -15,6 +15,7 @@
 #include "utils/CalamaresUtilsSystem.h"
 #include "utils/CommandList.h"
 #include "utils/Logger.h"
+#include "utils/StringExpander.h"
 #include "utils/Units.h"
 
 #include 
@@ -37,7 +38,8 @@ atReplacements( QString s )
         user = gs->value( "username" ).toString();
     }
 
-    return s.replace( "@@ROOT@@", root ).replace( "@@USER@@", user );
+    Calamares::String::DictionaryExpander d;
+    return d.add( QStringLiteral( "ROOT" ), root ).add( QStringLiteral( "USER" ), user ).expand( s );
 }
 
 PreserveFiles::PreserveFiles( QObject* parent )
diff --git a/src/modules/preservefiles/preservefiles.conf b/src/modules/preservefiles/preservefiles.conf
index 4fb393b2e..75584f566 100644
--- a/src/modules/preservefiles/preservefiles.conf
+++ b/src/modules/preservefiles/preservefiles.conf
@@ -40,11 +40,11 @@
 #     not exist in the host system (e.g. nvidia configuration files that
 #     are created in some boot scenarios and not in others).
 #
-# The target path (*dest*) is modified as follows:
-#   - `@@ROOT@@` is replaced by the path to the target root (may be /).
+# The target path (*dest*) is modified by expanding variables in `${}`:
+#   - `ROOT` is replaced by the path to the target root (may be /).
 #     There is never any reason to use this, since the *dest* is already
 #     interpreted in the target system.
-#   - `@@USER@@` is replaced by the username entered by on the user
+#   - `USER` is replaced by the username entered by on the user
 #       page (may be empty, for instance if no user page is enabled)
 #
 #
@@ -53,6 +53,9 @@ files:
   - from: log
     dest: /var/log/Calamares.log
     perm: root:wheel:600
+  - from: log
+    dest: /home/${USER}/installation.log
+    optional: true
   - from: config
     dest: /var/log/Calamares-install.json
     perm: root:wheel:600

From 66002f375cef75f32ffbeacd2df8520e0cf57a2f Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Sat, 2 Jul 2022 16:48:02 +0200
Subject: [PATCH 58/91] [bootloader] Don't use @@ replacements

SEE #1438
---
 CHANGES-3.3                                   |  5 +++
 src/modules/bootloader/bootloader.conf        |  6 +--
 src/modules/bootloader/main.py                | 40 +++++++++----------
 .../tests/test-bootloader-efiname.py          | 16 ++++----
 4 files changed, 36 insertions(+), 31 deletions(-)

diff --git a/CHANGES-3.3 b/CHANGES-3.3
index 3769a6ef4..ec2abd12c 100644
--- a/CHANGES-3.3
+++ b/CHANGES-3.3
@@ -25,6 +25,9 @@ that the distribution configuration files follow the current schema.
 
 Pre-release versions:
  - 3.3.0-alpha1 (2022-06-27)
+   Initial 3.3.0 release to check the release scripts &c.
+ - 3.3.0-alpha2 (unreleased)
+   Incompatible module-configuration changes, see #1438.
 
 ## Project ##
  - The C++ code in the project is now formatted with clang-format 12 or 13,
@@ -49,6 +52,8 @@ Pre-release versions:
 ## Modules ##
  - *bootloader* now supports more options when building the kernel
    command-line. (Thanks Evan)
+ - *bootloader* no longer supports `@@`-style suffixes for unique-EFI-id
+   generation. Use `${}` instead.
  - *displaymanager* no longer supports the discontinued *kdm* display manager.
  - *fstab* configuration has been completely re-done. Many configuration
    options have moved to the *mount* module. See #1993
diff --git a/src/modules/bootloader/bootloader.conf b/src/modules/bootloader/bootloader.conf
index bac9e517f..c5b94bbc7 100644
--- a/src/modules/bootloader/bootloader.conf
+++ b/src/modules/bootloader/bootloader.conf
@@ -53,10 +53,10 @@ efiBootMgr: "efibootmgr"
 # (problematic characters, see above, are replaced).
 #
 # There are some special words possible at the end of *efiBootloaderId*:
-#   @@SERIAL@@ can be used to obtain a uniquely-numbered suffix
+#   ${SERIAL} can be used to obtain a uniquely-numbered suffix
 #       that is added to the Id (yielding, e.g., `dirname1` or `dirname72`)
-#   @@RANDOM@@ can be used to obtain a unique 4-digit hex suffix
-#   @@PHRASE@@ can be used to obtain a unique 1-to-3-word suffix
+#   ${RANDOM} can be used to obtain a unique 4-digit hex suffix
+#   ${PHRASE} can be used to obtain a unique 1-to-3-word suffix
 #       from a dictionary of space-themed words
 # These words must be at the **end** of the *efiBootloaderId* value.
 # There must also be at most one of them. If there is none, no suffix-
diff --git a/src/modules/bootloader/main.py b/src/modules/bootloader/main.py
index dd4b41823..afb312051 100644
--- a/src/modules/bootloader/main.py
+++ b/src/modules/bootloader/main.py
@@ -393,28 +393,28 @@ class phraseEfi(object):
 
 def get_efi_suffix_generator(name):
     """
-    Handle EFI bootloader Ids with @@@@ for suffix-processing.
+    Handle EFI bootloader Ids with ${} for suffix-processing.
     """
-    if "@@" not in name:
-        raise ValueError("Misplaced call to get_efi_suffix_generator, no @@")
-    parts = name.split("@@")
-    if len(parts) != 3:
-        raise ValueError("EFI Id {!r} is malformed".format(name))
-    if parts[2]:
-        # Supposed to be empty because the string ends with "@@"
-        raise ValueError("EFI Id {!r} is malformed".format(name))
-    if parts[1] not in ("SERIAL", "RANDOM", "PHRASE"):
-        raise ValueError("EFI suffix {!r} is unknown".format(parts[1]))
+    if "${" not in name:
+        raise ValueError("Misplaced call to get_efi_suffix_generator, no ${}")
+    if not name.endswith("}"):
+        raise ValueError("Misplaced call to get_efi_suffix_generator, no trailing ${}")
+    if name.count("${") > 1:
+        raise ValueError("EFI ID {!r} contains multiple generators".format(name))
+    import re
+    prefix, generator_name = re.match("(.*)\${([^}]*)}$", name).groups()
+    if generator_name not in ("SERIAL", "RANDOM", "PHRASE"):
+        raise ValueError("EFI suffix {!r} is unknown".format(generator_name))
 
     generator = None
-    if parts[1] == "SERIAL":
-        generator = serialEfi(parts[0])
-    elif parts[1] == "RANDOM":
-        generator = randomEfi(parts[0])
-    elif parts[1] == "PHRASE":
-        generator = phraseEfi(parts[0])
+    if generator_name == "SERIAL":
+        generator = serialEfi(prefix)
+    elif generator_name == "RANDOM":
+        generator = randomEfi(prefix)
+    elif generator_name == "PHRASE":
+        generator = phraseEfi(prefix)
     if generator is None:
-        raise ValueError("EFI suffix {!r} is unsupported".format(parts[1]))
+        raise ValueError("EFI suffix {!r} is unsupported".format(generator_name))
 
     return generator
 
@@ -422,10 +422,10 @@ def get_efi_suffix_generator(name):
 def change_efi_suffix(efi_directory, bootloader_id):
     """
     Returns a label based on @p bootloader_id that is usable within
-    @p efi_directory. If there is a @@@@ suffix marker
+    @p efi_directory. If there is a ${} suffix marker
     in the given id, tries to generate a unique label.
     """
-    if bootloader_id.endswith("@@"):
+    if bootloader_id.endswith("}") and "${" in bootloader_id:
         # Do 10 attempts with any suffix generator
         g = suffix_iterator(10, get_efi_suffix_generator(bootloader_id))
     else:
diff --git a/src/modules/bootloader/tests/test-bootloader-efiname.py b/src/modules/bootloader/tests/test-bootloader-efiname.py
index 8957733ca..4756fd7fd 100644
--- a/src/modules/bootloader/tests/test-bootloader-efiname.py
+++ b/src/modules/bootloader/tests/test-bootloader-efiname.py
@@ -10,7 +10,7 @@ libcalamares.globalstorage.insert("testing", True)
 from src.modules.bootloader import main
 
 # Specific Bootloader test
-g = main.get_efi_suffix_generator("derp@@SERIAL@@")
+g = main.get_efi_suffix_generator("derp${SERIAL}")
 assert g is not None
 assert g.next() == "derp"  # First time, no suffix
 for n in range(9):
@@ -18,13 +18,13 @@ for n in range(9):
 # We called next() 10 times in total, starting from 0
 assert g.next() == "derp10"
 
-g = main.get_efi_suffix_generator("derp@@RANDOM@@")
+g = main.get_efi_suffix_generator("derp${RANDOM}")
 assert g is not None
 for n in range(10):
     print(g.next())
 # it's random, nothing to assert
 
-g = main.get_efi_suffix_generator("derp@@PHRASE@@")
+g = main.get_efi_suffix_generator("derp${PHRASE}")
 assert g is not None
 for n in range(10):
     print(g.next())
@@ -38,19 +38,19 @@ except ValueError as e:
     pass
 
 try:
-    g = main.get_efi_suffix_generator("derp@@HEX@@")
+    g = main.get_efi_suffix_generator("derp${HEX}")
     raise TypeError("Shouldn't get generator (unknown indicator)")
 except ValueError as e:
     pass
 
 try:
-    g = main.get_efi_suffix_generator("derp@@SERIAL@@x")
+    g = main.get_efi_suffix_generator("derp${SERIAL}x")
     raise TypeError("Shouldn't get generator (trailing garbage)")
 except ValueError as e:
     pass
 
 try:
-    g = main.get_efi_suffix_generator("derp@@SERIAL@@@@RANDOM@@")
+    g = main.get_efi_suffix_generator("derp${SERIAL}${RANDOM}")
     raise TypeError("Shouldn't get generator (multiple indicators)")
 except ValueError as e:
     pass
@@ -59,9 +59,9 @@ except ValueError as e:
 # Try the generator (assuming no calamares- test files exist in /tmp)
 import os
 assert "calamares-single" == main.change_efi_suffix("/tmp", "calamares-single")
-assert "calamares-serial" == main.change_efi_suffix("/tmp", "calamares-serial@@SERIAL@@")
+assert "calamares-serial" == main.change_efi_suffix("/tmp", "calamares-serial${SERIAL}")
 try:
     os.makedirs("/tmp/calamares-serial", exist_ok=True)
-    assert "calamares-serial1" == main.change_efi_suffix("/tmp", "calamares-serial@@SERIAL@@")
+    assert "calamares-serial1" == main.change_efi_suffix("/tmp", "calamares-serial${SERIAL}")
 finally:
     os.rmdir("/tmp/calamares-serial")

From c03850a302f5cf1894d5c53c83baa704decc51c1 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Sat, 2 Jul 2022 17:19:11 +0200
Subject: [PATCH 59/91] CI: notify on pull-requests

---
 .github/workflows/pullrequest.yml | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 .github/workflows/pullrequest.yml

diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml
new file mode 100644
index 000000000..5394a268a
--- /dev/null
+++ b/.github/workflows/pullrequest.yml
@@ -0,0 +1,24 @@
+name: pullrequest
+
+on:
+  pull_request:
+    types: [opened, closed]
+
+jobs:
+  notify:
+    runs-on: ubuntu-latest
+    steps:
+      - name: "notify: new"
+        if: github.event.pull_request.action == 'opened'
+        uses: calamares/actions/matrix-notify@v4
+        with:
+          token: ${{ secrets.MATRIX_TOKEN }}
+          room: ${{ secrets.MATRIX_ROOM }}
+          message: "NEW PR ${{ github.event.pull_request.html_url }} by ${{ github.actor }} ${{ github.event.pull_request.title }}"
+      - name: "notify: closed"
+        if: github.event.pull_request.action == 'closed'
+        uses: calamares/actions/matrix-notify@v4
+        with:
+          token: ${{ secrets.MATRIX_TOKEN }}
+          room: ${{ secrets.MATRIX_ROOM }}
+          message: "CLOSED ${{ github.event.pull_request.html_url }} by ${{ github.actor }} ${{ github.event.pull_request.title }}"

From 2322f12b59bed2ed60f03d3e76f2769facfbfabc Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Sat, 2 Jul 2022 17:41:41 +0200
Subject: [PATCH 60/91] [libcalamares] Remove translation-languages define

This doesn't compile, since it doesn't provide any replacement
for the translations define.
---
 src/libcalamares/CalamaresVersion.h.in | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/libcalamares/CalamaresVersion.h.in b/src/libcalamares/CalamaresVersion.h.in
index 09ef9ae2c..5a83d467f 100644
--- a/src/libcalamares/CalamaresVersion.h.in
+++ b/src/libcalamares/CalamaresVersion.h.in
@@ -14,6 +14,4 @@
 #cmakedefine CALAMARES_VERSION_PATCH "${CALAMARES_VERSION_PATCH}"
 #cmakedefine CALAMARES_VERSION_RC "${CALAMARES_VERSION_RC}"
 
-#cmakedefine CALAMARES_TRANSLATION_LANGUAGES "${CALAMARES_TRANSLATION_LANGUAGES}"
-
 #endif  // CALAMARES_VERSION_H

From f5891e1c8cdfc8d27a6e11cb64314345a3c5a052 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Sat, 2 Jul 2022 22:33:22 +0200
Subject: [PATCH 61/91] CI: try to get useful notification from pull request
 change

---
 .github/workflows/pullrequest.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml
index 5394a268a..dbf9cd6da 100644
--- a/.github/workflows/pullrequest.yml
+++ b/.github/workflows/pullrequest.yml
@@ -8,6 +8,14 @@ jobs:
   notify:
     runs-on: ubuntu-latest
     steps:
+      - name: "notify: any"
+        uses: calamares/actions/matrix-notify@v4
+        with:
+          token: ${{ secrets.MATRIX_TOKEN }}
+          room: ${{ secrets.MATRIX_ROOM }}
+          message: |
+            PR something ${{ github.event.pull_request.html_url }} by ${{ github.actor }} ${{ github.event.pull_request.action }}
+            .. ${{ github.event.pull_request.title }}
       - name: "notify: new"
         if: github.event.pull_request.action == 'opened'
         uses: calamares/actions/matrix-notify@v4

From 42f4cdd40cc89e0d72b3ff6753d1b11b31207d15 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Sat, 2 Jul 2022 22:37:52 +0200
Subject: [PATCH 62/91] CMake: remove redundant comments (they're at top-level
 too)

---
 CMakeModules/ExtendedVersion.cmake | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/CMakeModules/ExtendedVersion.cmake b/CMakeModules/ExtendedVersion.cmake
index b737dd2e2..87bf892e1 100644
--- a/CMakeModules/ExtendedVersion.cmake
+++ b/CMakeModules/ExtendedVersion.cmake
@@ -57,11 +57,6 @@ function( extend_version version short_only short_var long_var )
     set( ${short_var} "${version}" PARENT_SCOPE )
     set( _v "${version}" )
     if ( NOT short_only )
-        # Additional info for non-release builds which want "long" version info
-        # with date and git information (commit, dirty status). That is used only
-        # by CalamaresVersionX.h, which is included by consumers that need a full
-        # version number with all that information; normal consumers can include
-        # CalamaresVersion.h with more stable numbers.
         string( TIMESTAMP CALAMARES_VERSION_DATE "%Y%m%d" )
         if( CALAMARES_VERSION_DATE GREATER 0 )
             set( _v ${_v}.${CALAMARES_VERSION_DATE} )

From f53f83be5685a3ec9994f8ada53fc38de67b6d6a Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Sat, 2 Jul 2022 23:00:33 +0200
Subject: [PATCH 63/91] CMake: create header with available languages

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

diff --git a/src/libcalamares/CMakeLists.txt b/src/libcalamares/CMakeLists.txt
index 181ec2b30..0a8b0b570 100644
--- a/src/libcalamares/CMakeLists.txt
+++ b/src/libcalamares/CMakeLists.txt
@@ -17,6 +17,22 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/CalamaresConfig.h.in ${CMAKE_CURRENT_
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/CalamaresVersion.h.in ${CMAKE_CURRENT_BINARY_DIR}/CalamaresVersion.h)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/CalamaresVersionX.h.in ${CMAKE_CURRENT_BINARY_DIR}/CalamaresVersionX.h)
 
+# Map the available translations names into a suitable constexpr list
+# of names in C++. This gets us Calamares::Locale::availableLanguages,
+# a QStringList of names.
+set(_names_tu "#ifndef CALAMARES_TRANSLATIONS_H
+#define CALAMARES_TRANSLATIONS_H
+#include 
+namespace Calamares {
+namespace Locale {
+static const QStringList availableLanguages{
+")
+foreach( l ${CALAMARES_TRANSLATION_LANGUAGES})
+    string(APPEND _names_tu "\"${l}\",\n")
+endforeach()
+string(APPEND _names_tu "};\n}} // namespaces\n#endif\n\n")
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/CalamaresTranslations.h "${_names_tu}")
+
 add_library(
     calamares
     SHARED

From d7e35d2ad253e40c7de8089899022808935c5fde Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Sat, 2 Jul 2022 23:10:06 +0200
Subject: [PATCH 64/91] [libcalamares] Use newly-generated table of language
 names

---
 src/calamares/CalamaresApplication.cpp        | 3 ++-
 src/libcalamares/locale/Tests.cpp             | 6 +++---
 src/libcalamares/locale/TranslationsModel.cpp | 5 ++---
 src/libcalamares/locale/TranslationsModel.h   | 2 ++
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/calamares/CalamaresApplication.cpp b/src/calamares/CalamaresApplication.cpp
index c06e13aa3..979ee8cfe 100644
--- a/src/calamares/CalamaresApplication.cpp
+++ b/src/calamares/CalamaresApplication.cpp
@@ -10,6 +10,7 @@
 #include "CalamaresApplication.h"
 
 #include "CalamaresConfig.h"
+#include "CalamaresTranslations.h"
 #include "CalamaresVersionX.h"
 #include "CalamaresWindow.h"
 #include "progresstree/ProgressTreeView.h"
@@ -67,7 +68,7 @@ CalamaresApplication::init()
 {
     Logger::setupLogfile();
     cDebug() << "Calamares version:" << CALAMARES_VERSION;
-    cDebug() << Logger::SubEntry << "languages:" << QString( CALAMARES_TRANSLATION_LANGUAGES ).replace( ";", ", " );
+    cDebug() << Logger::SubEntry << "languages:" << Calamares::Locale::availableLanguages;
 
     if ( !Calamares::Settings::instance() )
     {
diff --git a/src/libcalamares/locale/Tests.cpp b/src/libcalamares/locale/Tests.cpp
index f234c1596..fa8ea3342 100644
--- a/src/libcalamares/locale/Tests.cpp
+++ b/src/libcalamares/locale/Tests.cpp
@@ -13,6 +13,7 @@
 #include "locale/TranslatableConfiguration.h"
 #include "locale/TranslationsModel.h"
 
+#include "CalamaresTranslations.h"
 #include "CalamaresVersion.h"
 #include "GlobalStorage.h"
 #include "utils/Logger.h"
@@ -153,12 +154,11 @@ someLanguages()
 void
 LocaleTests::testTranslatableLanguages()
 {
-    QStringList availableLanguages = QString( CALAMARES_TRANSLATION_LANGUAGES ).split( ';' );
-    cDebug() << "Translation languages:" << availableLanguages;
+    cDebug() << "Translation languages:" << Calamares::Locale::availableLanguages;
     for ( const auto& language : someLanguages() )
     {
         // Could be QVERIFY, but then we don't see what language code fails
-        QCOMPARE( availableLanguages.contains( language ) ? language : QString(), language );
+        QCOMPARE( Calamares::Locale::availableLanguages.contains( language ) ? language : QString(), language );
     }
 }
 
diff --git a/src/libcalamares/locale/TranslationsModel.cpp b/src/libcalamares/locale/TranslationsModel.cpp
index 0ffa6f9c5..e8cc5130e 100644
--- a/src/libcalamares/locale/TranslationsModel.cpp
+++ b/src/libcalamares/locale/TranslationsModel.cpp
@@ -13,7 +13,7 @@
 
 #include "Lookup.h"
 
-#include "CalamaresVersion.h"  // For the list of translations
+#include "CalamaresTranslations.h"  // For the list of translations
 
 namespace CalamaresUtils
 {
@@ -139,8 +139,7 @@ TranslationsModel::find( const Translation::Id& id ) const
 TranslationsModel*
 availableTranslations()
 {
-    static TranslationsModel* model
-        = new TranslationsModel( QStringLiteral( CALAMARES_TRANSLATION_LANGUAGES ).split( ';' ) );
+    static TranslationsModel* model = new TranslationsModel( Calamares::Locale::availableLanguages );
     return model;
 }
 
diff --git a/src/libcalamares/locale/TranslationsModel.h b/src/libcalamares/locale/TranslationsModel.h
index 3cd7c61dc..f95b756a8 100644
--- a/src/libcalamares/locale/TranslationsModel.h
+++ b/src/libcalamares/locale/TranslationsModel.h
@@ -75,6 +75,8 @@ private:
  *
  * The translations are set when Calamares is compiled; the list
  * is provided by CMake via the CALAMARES_TRANSLATION_LANGUAGES
+ * CMake variable (top-level CMakeLists.txt in Calamares) and
+ * compiled into the CalamaresTranslations.h internal header.
  * #define.
  *
  * This model is a singleton and can be shared.

From 18a3092aa1941546c1464446767d5b9857ff6c05 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Sat, 2 Jul 2022 23:18:38 +0200
Subject: [PATCH 65/91] [libcalamares] Use namespace Calamares

The distinction CalamaresUtils and Calamares is old-fashioned,
since we can use nested namespaces (and already do) for a lot
of things; make libcalamares/locale/ a bit more consistent
by using namespace Calamares::Locale for everything.
---
 src/libcalamares/locale/Lookup.cpp            |  4 ++--
 src/libcalamares/locale/Lookup.h              |  4 ++--
 src/libcalamares/locale/Tests.cpp             |  4 ++--
 src/libcalamares/locale/Translation.cpp       |  4 ++--
 src/libcalamares/locale/Translation.h         |  4 ++--
 src/libcalamares/locale/TranslationsModel.cpp |  4 ++--
 src/libcalamares/locale/TranslationsModel.h   |  4 ++--
 src/libcalamares/utils/Retranslator.cpp       |  8 ++++----
 src/libcalamares/utils/Retranslator.h         |  6 +++---
 src/modules/locale/Config.cpp                 |  2 +-
 src/modules/welcome/Config.cpp                | 14 +++++++-------
 src/modules/welcome/Config.h                  |  6 +++---
 src/modules/welcome/WelcomePage.cpp           |  2 +-
 src/modules/welcome/WelcomePage.h             |  2 +-
 14 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/src/libcalamares/locale/Lookup.cpp b/src/libcalamares/locale/Lookup.cpp
index 3dba50898..60c36fdf6 100644
--- a/src/libcalamares/locale/Lookup.cpp
+++ b/src/libcalamares/locale/Lookup.cpp
@@ -12,7 +12,7 @@
 
 #include "CountryData_p.cpp"
 
-namespace CalamaresUtils
+namespace Calamares
 {
 namespace Locale
 {
@@ -95,4 +95,4 @@ languageForCountry( QLocale::Country country )
 }
 
 }  // namespace Locale
-}  // namespace CalamaresUtils
+}  // namespace Calamares
diff --git a/src/libcalamares/locale/Lookup.h b/src/libcalamares/locale/Lookup.h
index 4095fd097..d026f9343 100644
--- a/src/libcalamares/locale/Lookup.h
+++ b/src/libcalamares/locale/Lookup.h
@@ -16,7 +16,7 @@
 #include 
 #include 
 
-namespace CalamaresUtils
+namespace Calamares
 {
 namespace Locale
 {
@@ -42,6 +42,6 @@ DLLEXPORT QPair< QLocale::Country, QLocale::Language > countryData( const QStrin
 /// @brief Get a likely locale for a 2-letter country code
 DLLEXPORT QLocale countryLocale( const QString& code );
 }  // namespace Locale
-}  // namespace CalamaresUtils
+}  // namespace Calamares
 
 #endif
diff --git a/src/libcalamares/locale/Tests.cpp b/src/libcalamares/locale/Tests.cpp
index fa8ea3342..d32d8fafb 100644
--- a/src/libcalamares/locale/Tests.cpp
+++ b/src/libcalamares/locale/Tests.cpp
@@ -72,7 +72,7 @@ LocaleTests::initTestCase()
 void
 LocaleTests::testLanguageModelCount()
 {
-    const auto* m = CalamaresUtils::Locale::availableTranslations();
+    const auto* m = Calamares::Locale::availableTranslations();
 
     QVERIFY( m );
     QVERIFY( m->rowCount( QModelIndex() ) > 1 );
@@ -91,7 +91,7 @@ LocaleTests::testLanguageModelCount()
 void
 LocaleTests::testLanguageScripts()
 {
-    const auto* m = CalamaresUtils::Locale::availableTranslations();
+    const auto* m = Calamares::Locale::availableTranslations();
 
     QVERIFY( m );
 
diff --git a/src/libcalamares/locale/Translation.cpp b/src/libcalamares/locale/Translation.cpp
index 279949d3f..9d2beafb8 100644
--- a/src/libcalamares/locale/Translation.cpp
+++ b/src/libcalamares/locale/Translation.cpp
@@ -128,7 +128,7 @@ specialCaseSystemLanguage()
     return ( it != std::cend( special_cases ) ) ? QString::fromLatin1( it->id ) : QString();
 }
 
-namespace CalamaresUtils
+namespace Calamares
 {
 namespace Locale
 {
@@ -187,4 +187,4 @@ Translation::getLocale( const Id& localeId )
 }
 
 }  // namespace Locale
-}  // namespace CalamaresUtils
+}  // namespace Calamares
diff --git a/src/libcalamares/locale/Translation.h b/src/libcalamares/locale/Translation.h
index 912a509ac..e7f066475 100644
--- a/src/libcalamares/locale/Translation.h
+++ b/src/libcalamares/locale/Translation.h
@@ -18,7 +18,7 @@
 #include 
 #include 
 
-namespace CalamaresUtils
+namespace Calamares
 {
 namespace Locale
 {
@@ -124,6 +124,6 @@ operator==( const Translation::Id& lhs, const Translation::Id& rhs )
 }
 
 }  // namespace Locale
-}  // namespace CalamaresUtils
+}  // namespace Calamares
 
 #endif
diff --git a/src/libcalamares/locale/TranslationsModel.cpp b/src/libcalamares/locale/TranslationsModel.cpp
index e8cc5130e..304246053 100644
--- a/src/libcalamares/locale/TranslationsModel.cpp
+++ b/src/libcalamares/locale/TranslationsModel.cpp
@@ -15,7 +15,7 @@
 
 #include "CalamaresTranslations.h"  // For the list of translations
 
-namespace CalamaresUtils
+namespace Calamares
 {
 namespace Locale
 {
@@ -144,4 +144,4 @@ availableTranslations()
 }
 
 }  // namespace Locale
-}  // namespace CalamaresUtils
+}  // namespace Calamares
diff --git a/src/libcalamares/locale/TranslationsModel.h b/src/libcalamares/locale/TranslationsModel.h
index f95b756a8..6982f871f 100644
--- a/src/libcalamares/locale/TranslationsModel.h
+++ b/src/libcalamares/locale/TranslationsModel.h
@@ -19,7 +19,7 @@
 #include 
 
 
-namespace CalamaresUtils
+namespace Calamares
 {
 namespace Locale
 {
@@ -85,5 +85,5 @@ private:
  */
 DLLEXPORT TranslationsModel* availableTranslations();
 }  // namespace Locale
-}  // namespace CalamaresUtils
+}  // namespace Calamares
 #endif
diff --git a/src/libcalamares/utils/Retranslator.cpp b/src/libcalamares/utils/Retranslator.cpp
index f3ae93836..5af975002 100644
--- a/src/libcalamares/utils/Retranslator.cpp
+++ b/src/libcalamares/utils/Retranslator.cpp
@@ -178,7 +178,7 @@ static QTranslator* s_tztranslator = nullptr;
 static QString s_translatorLocaleName;
 
 void
-installTranslator( const CalamaresUtils::Locale::Translation::Id& locale, const QString& brandingTranslationsPrefix )
+installTranslator( const Calamares::Locale::Translation::Id& locale, const QString& brandingTranslationsPrefix )
 {
     s_translatorLocaleName = locale.name;
 
@@ -190,17 +190,17 @@ installTranslator( const CalamaresUtils::Locale::Translation::Id& locale, const
 void
 installTranslator()
 {
-    installTranslator( CalamaresUtils::Locale::Translation().id(), QString() );
+    installTranslator( Calamares::Locale::Translation().id(), QString() );
 }
 
-CalamaresUtils::Locale::Translation::Id
+Calamares::Locale::Translation::Id
 translatorLocaleName()
 {
     return { s_translatorLocaleName };
 }
 
 bool
-loadTranslator( const CalamaresUtils::Locale::Translation::Id& locale, const QString& prefix, QTranslator* translator )
+loadTranslator( const Calamares::Locale::Translation::Id& locale, const QString& prefix, QTranslator* translator )
 {
     return ::tryLoad( translator, prefix, locale.name );
 }
diff --git a/src/libcalamares/utils/Retranslator.h b/src/libcalamares/utils/Retranslator.h
index 94eba8b1c..33106d4c8 100644
--- a/src/libcalamares/utils/Retranslator.h
+++ b/src/libcalamares/utils/Retranslator.h
@@ -29,7 +29,7 @@ namespace CalamaresUtils
  * @param locale the new locale (names as defined by Calamares).
  * @param brandingTranslationsPrefix the branding path prefix, from Calamares::Branding.
  */
-DLLEXPORT void installTranslator( const CalamaresUtils::Locale::Translation::Id& locale,
+DLLEXPORT void installTranslator( const Calamares::Locale::Translation::Id& locale,
                                   const QString& brandingTranslationsPrefix );
 
 /** @brief Initializes the translations with the current system settings
@@ -42,7 +42,7 @@ DLLEXPORT void installTranslator();
  * QLocale passed in, because Calamares will munge some names and
  * may remap translations.
  */
-DLLEXPORT CalamaresUtils::Locale::Translation::Id translatorLocaleName();
+DLLEXPORT Calamares::Locale::Translation::Id translatorLocaleName();
 
 /** @brief Loads  translations into the given @p translator
  *
@@ -58,7 +58,7 @@ DLLEXPORT CalamaresUtils::Locale::Translation::Id translatorLocaleName();
  * @returns @c true on success
  */
 DLLEXPORT bool
-loadTranslator( const CalamaresUtils::Locale::Translation::Id& locale, const QString& prefix, QTranslator* translator );
+loadTranslator( const Calamares::Locale::Translation::Id& locale, const QString& prefix, QTranslator* translator );
 
 /** @brief Set @p allow to true to load translations from current dir.
  *
diff --git a/src/modules/locale/Config.cpp b/src/modules/locale/Config.cpp
index 2357019a7..8167aaec2 100644
--- a/src/modules/locale/Config.cpp
+++ b/src/modules/locale/Config.cpp
@@ -399,7 +399,7 @@ Config::currentTimezoneName() const
 static inline QString
 localeLabel( const QString& s )
 {
-    using CalamaresUtils::Locale::Translation;
+    using Calamares::Locale::Translation;
 
     Translation lang( { s }, Translation::LabelFormat::AlwaysWithCountry );
     return lang.label();
diff --git a/src/modules/welcome/Config.cpp b/src/modules/welcome/Config.cpp
index 0e692637b..ca907d384 100644
--- a/src/modules/welcome/Config.cpp
+++ b/src/modules/welcome/Config.cpp
@@ -26,7 +26,7 @@
 
 Config::Config( QObject* parent )
     : QObject( parent )
-    , m_languages( CalamaresUtils::Locale::availableTranslations() )
+    , m_languages( Calamares::Locale::availableTranslations() )
     , m_filtermodel( std::make_unique< QSortFilterProxyModel >() )
     , m_requirementsChecker( std::make_unique< GeneralRequirements >( this ) )
 {
@@ -84,7 +84,7 @@ Config::retranslate()
     emit warningMessageChanged( m_warningMessage );
 }
 
-CalamaresUtils::Locale::TranslationsModel*
+Calamares::Locale::TranslationsModel*
 Config::languagesModel() const
 {
     return m_languages;
@@ -120,7 +120,7 @@ void
 Config::initLanguages()
 {
     // Find the best initial translation
-    CalamaresUtils::Locale::Translation defaultTranslation;
+    Calamares::Locale::Translation defaultTranslation;
 
     cDebug() << "Trying to match locale" << defaultTranslation.id();
     int matchedLocaleIndex = m_languages->find( defaultTranslation.id() );
@@ -172,7 +172,7 @@ void
 Config::setCountryCode( const QString& countryCode )
 {
     m_countryCode = countryCode;
-    setLocaleIndex( CalamaresUtils::Locale::availableTranslations()->find( m_countryCode ) );
+    setLocaleIndex( Calamares::Locale::availableTranslations()->find( m_countryCode ) );
 
     emit countryCodeChanged( m_countryCode );
 }
@@ -186,7 +186,7 @@ Config::setLanguageIcon( const QString& languageIcon )
 void
 Config::setLocaleIndex( int index )
 {
-    if ( index == m_localeIndex || index > CalamaresUtils::Locale::availableTranslations()->rowCount( QModelIndex() )
+    if ( index == m_localeIndex || index > Calamares::Locale::availableTranslations()->rowCount( QModelIndex() )
          || index < 0 )
     {
         return;
@@ -347,7 +347,7 @@ setCountry( Config* config, const QString& countryCode, CalamaresUtils::GeoIP::H
         return;
     }
 
-    auto c_l = CalamaresUtils::Locale::countryData( countryCode );
+    auto c_l = Calamares::Locale::countryData( countryCode );
     if ( c_l.first == QLocale::Country::AnyCountry )
     {
         cDebug() << "Unusable country code" << countryCode;
@@ -356,7 +356,7 @@ setCountry( Config* config, const QString& countryCode, CalamaresUtils::GeoIP::H
     }
     else
     {
-        int r = CalamaresUtils::Locale::availableTranslations()->find( countryCode );
+        int r = Calamares::Locale::availableTranslations()->find( countryCode );
         if ( r < 0 )
         {
             cDebug() << "Unusable country code" << countryCode << "(no suitable translation)";
diff --git a/src/modules/welcome/Config.h b/src/modules/welcome/Config.h
index 49d9a1b11..276f0cc33 100644
--- a/src/modules/welcome/Config.h
+++ b/src/modules/welcome/Config.h
@@ -28,7 +28,7 @@ class Config : public QObject
      * This is a list-model, with names and descriptions for the translations
      * available to Calamares.
      */
-    Q_PROPERTY( CalamaresUtils::Locale::TranslationsModel* languagesModel READ languagesModel CONSTANT FINAL )
+    Q_PROPERTY( Calamares::Locale::TranslationsModel* languagesModel READ languagesModel CONSTANT FINAL )
     /** @brief The requirements (from modules) and their checked-status
      *
      * The model grows rows over time as each module is checked and its
@@ -95,7 +95,7 @@ public:
     QString warningMessage() const;
 
 public slots:
-    CalamaresUtils::Locale::TranslationsModel* languagesModel() const;
+    Calamares::Locale::TranslationsModel* languagesModel() const;
     void retranslate();
 
     ///@brief The **global** requirements model, from ModuleManager
@@ -122,7 +122,7 @@ signals:
 private:
     void initLanguages();
 
-    CalamaresUtils::Locale::TranslationsModel* m_languages = nullptr;
+    Calamares::Locale::TranslationsModel* m_languages = nullptr;
     std::unique_ptr< QSortFilterProxyModel > m_filtermodel;
     std::unique_ptr< GeneralRequirements > m_requirementsChecker;
 
diff --git a/src/modules/welcome/WelcomePage.cpp b/src/modules/welcome/WelcomePage.cpp
index 597317069..96675261b 100644
--- a/src/modules/welcome/WelcomePage.cpp
+++ b/src/modules/welcome/WelcomePage.cpp
@@ -222,5 +222,5 @@ LocaleTwoColumnDelegate::paint( QPainter* painter, const QStyleOptionViewItem& o
         Qt::AlignRight | Qt::AlignVCenter,
         option.palette,
         false,
-        index.data( CalamaresUtils::Locale::TranslationsModel::EnglishLabelRole ).toString() );
+        index.data( Calamares::Locale::TranslationsModel::EnglishLabelRole ).toString() );
 }
diff --git a/src/modules/welcome/WelcomePage.h b/src/modules/welcome/WelcomePage.h
index 71aebd468..163d13eb1 100644
--- a/src/modules/welcome/WelcomePage.h
+++ b/src/modules/welcome/WelcomePage.h
@@ -63,7 +63,7 @@ private:
 
     Ui::WelcomePage* ui;
     CheckerContainer* m_checkingWidget;
-    CalamaresUtils::Locale::TranslationsModel* m_languages;
+    Calamares::Locale::TranslationsModel* m_languages;
 
     Config* m_conf;
 };

From 170a5a869766b3fed1b4a4a1ac3153ec020fad6d Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Sun, 3 Jul 2022 00:05:40 +0200
Subject: [PATCH 66/91] [libcalamares] Factor out the list of translations

The list of translation codes lives in one place, make it accessible
through a function in Calamares::Locale.
---
 src/calamares/CalamaresApplication.cpp        |  4 ++--
 src/libcalamares/CMakeLists.txt               |  9 ++++-----
 src/libcalamares/locale/Tests.cpp             |  5 ++---
 src/libcalamares/locale/TranslationsModel.cpp | 10 ++++++++--
 src/libcalamares/locale/TranslationsModel.h   | 14 ++++++++++----
 5 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/src/calamares/CalamaresApplication.cpp b/src/calamares/CalamaresApplication.cpp
index 979ee8cfe..88e8e2919 100644
--- a/src/calamares/CalamaresApplication.cpp
+++ b/src/calamares/CalamaresApplication.cpp
@@ -10,7 +10,6 @@
 #include "CalamaresApplication.h"
 
 #include "CalamaresConfig.h"
-#include "CalamaresTranslations.h"
 #include "CalamaresVersionX.h"
 #include "CalamaresWindow.h"
 #include "progresstree/ProgressTreeView.h"
@@ -19,6 +18,7 @@
 #include "JobQueue.h"
 #include "Settings.h"
 #include "ViewManager.h"
+#include "locale/TranslationsModel.h"
 #include "modulesystem/ModuleManager.h"
 #include "utils/CalamaresUtilsGui.h"
 #include "utils/CalamaresUtilsSystem.h"
@@ -68,7 +68,7 @@ CalamaresApplication::init()
 {
     Logger::setupLogfile();
     cDebug() << "Calamares version:" << CALAMARES_VERSION;
-    cDebug() << Logger::SubEntry << "languages:" << Calamares::Locale::availableLanguages;
+    cDebug() << Logger::SubEntry << "languages:" << Calamares::Locale::availableLanguages();
 
     if ( !Calamares::Settings::instance() )
     {
diff --git a/src/libcalamares/CMakeLists.txt b/src/libcalamares/CMakeLists.txt
index 0a8b0b570..2a0738ec0 100644
--- a/src/libcalamares/CMakeLists.txt
+++ b/src/libcalamares/CMakeLists.txt
@@ -23,15 +23,14 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/CalamaresVersionX.h.in ${CMAKE_CURREN
 set(_names_tu "#ifndef CALAMARES_TRANSLATIONS_H
 #define CALAMARES_TRANSLATIONS_H
 #include 
-namespace Calamares {
-namespace Locale {
-static const QStringList availableLanguages{
+namespace {
+static const QStringList availableLanguageList{
 ")
 foreach( l ${CALAMARES_TRANSLATION_LANGUAGES})
     string(APPEND _names_tu "\"${l}\",\n")
 endforeach()
-string(APPEND _names_tu "};\n}} // namespaces\n#endif\n\n")
-file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/CalamaresTranslations.h "${_names_tu}")
+string(APPEND _names_tu "};\n} // namespace\n#endif\n\n")
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/CalamaresTranslations.cc "${_names_tu}")
 
 add_library(
     calamares
diff --git a/src/libcalamares/locale/Tests.cpp b/src/libcalamares/locale/Tests.cpp
index d32d8fafb..80ae195c6 100644
--- a/src/libcalamares/locale/Tests.cpp
+++ b/src/libcalamares/locale/Tests.cpp
@@ -13,7 +13,6 @@
 #include "locale/TranslatableConfiguration.h"
 #include "locale/TranslationsModel.h"
 
-#include "CalamaresTranslations.h"
 #include "CalamaresVersion.h"
 #include "GlobalStorage.h"
 #include "utils/Logger.h"
@@ -154,11 +153,11 @@ someLanguages()
 void
 LocaleTests::testTranslatableLanguages()
 {
-    cDebug() << "Translation languages:" << Calamares::Locale::availableLanguages;
+    cDebug() << "Translation languages:" << Calamares::Locale::availableLanguages();
     for ( const auto& language : someLanguages() )
     {
         // Could be QVERIFY, but then we don't see what language code fails
-        QCOMPARE( Calamares::Locale::availableLanguages.contains( language ) ? language : QString(), language );
+        QCOMPARE( Calamares::Locale::availableLanguages().contains( language ) ? language : QString(), language );
     }
 }
 
diff --git a/src/libcalamares/locale/TranslationsModel.cpp b/src/libcalamares/locale/TranslationsModel.cpp
index 304246053..a222a02d4 100644
--- a/src/libcalamares/locale/TranslationsModel.cpp
+++ b/src/libcalamares/locale/TranslationsModel.cpp
@@ -13,7 +13,7 @@
 
 #include "Lookup.h"
 
-#include "CalamaresTranslations.h"  // For the list of translations
+#include "CalamaresTranslations.cc"  // For the list of translations, generated at build time
 
 namespace Calamares
 {
@@ -139,9 +139,15 @@ TranslationsModel::find( const Translation::Id& id ) const
 TranslationsModel*
 availableTranslations()
 {
-    static TranslationsModel* model = new TranslationsModel( Calamares::Locale::availableLanguages );
+    static TranslationsModel* model = new TranslationsModel( availableLanguageList );
     return model;
 }
 
+const QStringList&
+availableLanguages()
+{
+    return availableLanguageList;
+}
+
 }  // namespace Locale
 }  // namespace Calamares
diff --git a/src/libcalamares/locale/TranslationsModel.h b/src/libcalamares/locale/TranslationsModel.h
index 6982f871f..c755f6dca 100644
--- a/src/libcalamares/locale/TranslationsModel.h
+++ b/src/libcalamares/locale/TranslationsModel.h
@@ -74,16 +74,22 @@ private:
 /** @brief Returns a model with all available translations.
  *
  * The translations are set when Calamares is compiled; the list
- * is provided by CMake via the CALAMARES_TRANSLATION_LANGUAGES
- * CMake variable (top-level CMakeLists.txt in Calamares) and
- * compiled into the CalamaresTranslations.h internal header.
- * #define.
+ * of names used can be queried with avalableLanguages().
  *
  * This model is a singleton and can be shared.
  *
  * NOTE: While the model is not typed const, it should be. Do not modify.
  */
 DLLEXPORT TranslationsModel* availableTranslations();
+
+/** @brief The list of names (e.g. en, pt_BR) of available translations.
+ *
+ * The translations are set when Calamares is compiled.
+ * At CMake-time, the list CALAMARES_TRANSLATION_LANGUAGES
+ * is used to create the table.
+ */
+DLLEXPORT const QStringList& availableLanguages();
+
 }  // namespace Locale
 }  // namespace Calamares
 #endif

From 4935da8fe4a8548ebe307e4f7c99f096aa993043 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Sun, 3 Jul 2022 00:14:35 +0200
Subject: [PATCH 67/91] CMake: support Esperanto

Since the minimum Qt version is 5.15.0, we always have a version
that can support Esperanto in QLocale, so drop the checks.
---
 CMakeLists.txt | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 05c68b66c..d68c771ef 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -139,8 +139,6 @@ set(CALAMARES_DESCRIPTION_SUMMARY "The distribution-independent installer framew
 # (sr@latin in particular) or location (ca@valencia) need special
 # handling in libcalamares/locale/Translation.h .
 #
-# NOTE: move eo (Esperanto) to _ok once Qt can actually create a
-#       locale for it. (Qt 5.12.2 can, see Translation Status section).
 # NOTE: move ie (Interlingue) to _ok once Qt supports it.
 # NOTE: update these lines by running `txstats.py`, or for full automation
 #       `txstats.py -e`. See also
@@ -411,19 +409,10 @@ set(Calamares_WITH_QML ${WITH_QML})
 
 ### Transifex Translation status
 #
-# Construct language lists for use. This massages the language lists
-# for use with older Qt (which does not support Esperanto) and checks
-# for some obvious error. The actual work of compiling translations
-# is done in the lang/ directory.
+# Construct language lists for use. This massages the language lists if
+# needed and checks for some obvious errors. The actual work of
+# compiling translations is done in the lang/ directory.
 #
-if(Qt5_VERSION VERSION_GREATER 5.12.1)
-    # At least Qt 5.12.2 seems to support Esperanto in QLocale
-    if("eo" IN_LIST _tx_incomplete)
-        message(STATUS "Esperanto support since Qt 5.12.2, enabling Esperanto locale")
-        list(REMOVE_ITEM _tx_incomplete "eo")
-        list(APPEND _tx_ok "eo")
-    endif()
-endif()
 
 set(curr_tx ${_tx_complete} ${_tx_good} ${_tx_ok} ${_tx_incomplete})
 set(tx_errors OFF)

From 6e950cf49c7a0d9a2586489d7c925a6bf73a3c43 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Sun, 3 Jul 2022 00:15:56 +0200
Subject: [PATCH 68/91] CI: update translation-fetching to remove Esperanto
 special case

---
 ci/txstats.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/ci/txstats.py b/ci/txstats.py
index 696a4b828..5fddc6bd6 100755
--- a/ci/txstats.py
+++ b/ci/txstats.py
@@ -177,11 +177,9 @@ def get_tx_stats(languages, outputter, verbose):
     # Some languages go into the "incomplete" list by definition,
     # regardless of their completion status: this can have various reasons.
     #
-    # Note that Esperanto (eo) is special-cased in CMakeLists.txt
-    # during the build; recent Qt releases *do* support the language,
-    # and it's at-the-least ok.
+    # - (Esperanto wasn't supported until Qt 5.12.2)
+    # - Interlingue still is not supported by the minimum Qt version
     incomplete_languages = (
-        "eo",   # Not supported by QLocale < 5.12.1
         "ie",   # Not supported by Qt at least through 5.15.0
         )
 

From 24652abe8ab29637d20b252df9b3929aea8858d5 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Sun, 3 Jul 2022 00:28:38 +0200
Subject: [PATCH 69/91] CI: another stab at PR notifications

---
 .github/workflows/pullrequest.yml | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml
index dbf9cd6da..5026a4444 100644
--- a/.github/workflows/pullrequest.yml
+++ b/.github/workflows/pullrequest.yml
@@ -8,25 +8,20 @@ jobs:
   notify:
     runs-on: ubuntu-latest
     steps:
-      - name: "notify: any"
+      - name: "notify: new"
+        if: github.event.action == 'opened'
         uses: calamares/actions/matrix-notify@v4
         with:
           token: ${{ secrets.MATRIX_TOKEN }}
           room: ${{ secrets.MATRIX_ROOM }}
           message: |
-            PR something ${{ github.event.pull_request.html_url }} by ${{ github.actor }} ${{ github.event.pull_request.action }}
-            .. ${{ github.event.pull_request.title }}
-      - name: "notify: new"
-        if: github.event.pull_request.action == 'opened'
-        uses: calamares/actions/matrix-notify@v4
-        with:
-          token: ${{ secrets.MATRIX_TOKEN }}
-          room: ${{ secrets.MATRIX_ROOM }}
-          message: "NEW PR ${{ github.event.pull_request.html_url }} by ${{ github.actor }} ${{ github.event.pull_request.title }}"
+            PR OPENED ${{ github.event.pull_request.html_url }} by ${{ github.actor }}
+            .. ${{ github.event.pull_request.title }}"
       - name: "notify: closed"
-        if: github.event.pull_request.action == 'closed'
+        if: github.event.action == 'closed'
         uses: calamares/actions/matrix-notify@v4
         with:
           token: ${{ secrets.MATRIX_TOKEN }}
           room: ${{ secrets.MATRIX_ROOM }}
-          message: "CLOSED ${{ github.event.pull_request.html_url }} by ${{ github.actor }} ${{ github.event.pull_request.title }}"
+          message: |
+            PR CLOSED ${{ github.event.pull_request.html_url }} by ${{ github.actor }}

From 781ced1a59cc34bf7ceba7153b2e2a6d1b63f4cd Mon Sep 17 00:00:00 2001
From: shivanandvp 
Date: Tue, 5 Jul 2022 23:08:43 -0500
Subject: [PATCH 70/91] feat: feat: Ungroup systemd units in services-systemd
 module

---
 src/modules/services-systemd/main.py          | 107 ++++++------------
 .../services-systemd/services-systemd.conf    |  84 +++++---------
 .../services-systemd.schema.yaml              |  14 +--
 3 files changed, 70 insertions(+), 135 deletions(-)

diff --git a/src/modules/services-systemd/main.py b/src/modules/services-systemd/main.py
index 6501aa44c..4eef3f096 100644
--- a/src/modules/services-systemd/main.py
+++ b/src/modules/services-systemd/main.py
@@ -7,10 +7,10 @@
 #   SPDX-FileCopyrightText: 2014 Teo Mrnjavac 
 #   SPDX-FileCopyrightText: 2017 Alf Gaida 
 #   SPDX-FileCopyrightText: 2018-2019 Adriaan de Groot 
+#   SPDX-FileCopyrightText: 2022 shivanandvp 
 #   SPDX-License-Identifier: GPL-3.0-or-later
 #
 #   Calamares is Free Software: see the License-Identifier above.
-#
 
 import libcalamares
 
@@ -23,96 +23,61 @@ _ = gettext.translation("calamares-python",
 
 
 def pretty_name():
-    return _("Configure systemd services")
+    return _("Configure systemd units")
 
 
-def systemctl(targets, command, suffix):
+def systemctl(units):
     """
-    For each entry in @p targets, run "systemctl  ",
-    where  is the entry's name plus the given @p suffix.
-    (No dot is added between name and suffix; suffix may be empty)
+    For each entry in @p units, run "systemctl  ",
+    where each unit is a map of unit name, action, and a flag.
 
     Returns a failure message, or None if this was successful.
-    Services that are not mandatory have their failures suppressed
+    Units that are not mandatory have their failures suppressed
     silently.
     """
-    for svc in targets:
-        if isinstance(svc, str):
-            name = svc
+
+    for unit in units:
+        if isinstance(unit, str):
+            name = unit
+            action = "enable"
             mandatory = False
         else:
-            name = svc["name"]
-            mandatory = svc.get("mandatory", False)
+            name = unit["name"]
+            action = unit.get("action", "enable")
+            mandatory = unit.get("mandatory", False)
 
-        ec = libcalamares.utils.target_env_call(
-            ['systemctl', command, "{}{}".format(name, suffix)]
+        exit_code = libcalamares.utils.target_env_call(
+            ['systemctl', action, name]
+        )
+
+        if exit_code != 0:
+            libcalamares.utils.warning(
+                "Cannot {} systemd unit {}".format(action, name)
             )
-
-        if ec != 0:
             libcalamares.utils.warning(
-                "Cannot {} systemd {} {}".format(command, suffix, name)
-                )
-            libcalamares.utils.warning(
-                "systemctl {} call in chroot returned error code {}".format(command, ec)
-                )
+                "systemctl {} call in chroot returned error code {}".format(action, exit_code)
+            )
             if mandatory:
-                title = _("Cannot modify service")
-                diagnostic = _("systemctl {arg!s} call in chroot returned error code {num!s}.").format(arg=command, num=ec)
-
-                if command == "enable" and suffix == ".service":
-                    description = _("Cannot enable systemd service {name!s}.")
-                elif command == "enable" and suffix == ".target":
-                    description = _("Cannot enable systemd target {name!s}.")
-                elif command == "enable" and suffix == ".timer":
-                    description = _("Cannot enable systemd timer {name!s}.")
-                elif command == "disable" and suffix == ".service":
-                    description = _("Cannot enable systemd service {name!s}.")
-                elif command == "disable" and suffix == ".target":
-                    description = _("Cannot disable systemd target {name!s}.")
-                elif command == "mask":
-                    description = _("Cannot mask systemd unit {name!s}.")
-                else:
-                    description = _("Unknown systemd commands {command!s} and {suffix!s} for unit {name!s}.")
-
-                return (title,
-                        description.format(name=name, command=command, suffix=suffix) + " " + diagnostic
-                        )
+                title = _("Cannot modify unit")
+                diagnostic = _("systemctl {_action!s} call in chroot returned error code {_exit_code!s}.").format(_action=action, _exit_code=exit_code)
+                description = _("Cannot {_action!s} systemd unit {_name!s}.").format(_action=action, _name=name)
+                return (
+                    title,
+                    description + " " + diagnostic
+                )
     return None
 
 
 def run():
     """
-    Setup systemd services
+    Setup systemd units
     """
     cfg = libcalamares.job.configuration
 
-    # note that the "systemctl enable" and "systemctl disable" commands used
-    # here will work in a chroot; in fact, they are the only systemctl commands
-    # that support that, see:
-    # http://0pointer.de/blog/projects/changing-roots.html
-
-    r = systemctl(cfg.get("services", []), "enable", ".service")
-    if r is not None:
-        return r
-
-    r = systemctl(cfg.get("targets", []), "enable", ".target")
-    if r is not None:
-        return r
-
-    r = systemctl(cfg.get("timers", []), "enable", ".timer")
-    if r is not None:
-        return r
-
-    r = systemctl(cfg.get("disable", []), "disable", ".service")
-    if r is not None:
-        return r
-
-    r = systemctl(cfg.get("disable-targets", []), "disable", ".target")
-    if r is not None:
-        return r
-
-    r = systemctl(cfg.get("mask", []), "mask", "")
-    if r is not None:
-        return r
+    return_value = systemctl(
+        cfg.get("units", [])
+    )
+    if return_value is not None:
+        return return_value
 
     return None
diff --git a/src/modules/services-systemd/services-systemd.conf b/src/modules/services-systemd/services-systemd.conf
index 05583967f..d84cd1349 100644
--- a/src/modules/services-systemd/services-systemd.conf
+++ b/src/modules/services-systemd/services-systemd.conf
@@ -1,79 +1,53 @@
 # SPDX-FileCopyrightText: no
 # SPDX-License-Identifier: CC0-1.0
 #
-# Systemd services manipulation.
+# Systemd units manipulation.
 #
-# This module can enable services, timers and targets for systemd
-# (if packaging doesn't already do that). It can also
-# disable services and targets as well as mask units.
-#
-# The order of operations is fixed.  Enable services, enable targets,
-# enable timers, disable services, disable targets and finally apply masks.
+# This module can perform actions using systemd units, 
+# (for example, enabling, disabling, or masking services, sockets, paths, etc.)
 ---
 
-# There are several configuration keys for this module:
-# *services*, *targets*, *timers*, *disable*, *disable-targets* and *mask*.
-# The value of each key is a list of entries. Each entry has two keys:
-#   - *name* is the (string) name of the service or target that is being
-#     changed. Use quotes. Don't include unit suffix in the name. For
-#     example, it should be "NetworkManager", not "NetworkManager.service"
+# There is one key for this module: *units*. Its value is a list of entries.
+# Each entry has three keys:
+#   - *name* is the (string) name of the systemd unit that is being changed.
+#     Use quotes. You can use any valid systemd unit here (for example, 
+#     "NetworkManager.service", "cups.socket", "lightdm", "gdm", etc.)
+#   - *action* is the (string) action that you want to perform over the unit
+#     (for example, "enable", "disable", "mask", "unmask", etc.). Please 
+#     ensure that the action can actually run under chroot (otherwise it is
+#     pointless)      
 #   - *mandatory* is a boolean option, which states whether the change
 #     must be done successfully. If systemd reports an error while changing
 #     a mandatory entry, the installation will fail. When mandatory is false,
 #     errors for that systemd unit are ignored. If mandatory
 #     is not specified, the default is false.
 #
-# An entry may also be given as a single string, which is then
-# interpreted as the name of the service. In this case, mandatory
-# is also set to the default of false.
-#
-# Use [] to express an empty list.
+# The order of operations is the same as the order in which entries
+# appear in the list
 
-# # This example enables NetworkManager (and fails if it can't),
-# # disables cups (and ignores failure). Then it enables the
+# # This example enables NetworkManager.service (and fails if it can't),
+# # disables cups.socket (and ignores failure). Then it enables the
 # # graphical target (e.g. so that SDDM runs for login), and
-# # finally disables pacman-init (an ArchLinux-only service).
+# # finally masks pacman-init (an ArchLinux-only service).
 # #
-# # Enables .service
-# services:
+# units:
 #   - name: "NetworkManager"
+#     action: "enable" 
 #     mandatory: true
-#   - name: "cups"
+#
+#   - name: "cups.socket"
+#     action: "disable" 
 #     mandatory: false
 #
-# # Enables .target
-# targets:
 #   - name: "graphical"
-#     mandatory: true
+#     action: "enable" 
+#     # The property "mandatory" is taken to be false by default here
+#     # because it is not specified
 #
-# # Enables .timer
-# timers:
-#   - name: "fstrim"
-#     mandatory: false
-#
-# # Disables .service
-# disable:
 #   - name: "pacman-init"
-#     mandatory: false
-#
-# # Disables .target
-# #     .. this shows how to use just the name
-# disable-targets:
-#   - graphical
-#
-# # Masks (stronger version of disable). This section
-# # is unusual because you **must** include the suffix
-# # (e.g. ".service") as part of the name, so, e.g. to mask
-# # NetworkManager (rather than just disable it) you must
-# # specify "NetworkManager.service" as name.
-# mask:
-#  - name: "NetworkManager.service"
-#  - mandatory: true
+#     action: "mask"
+#     # The property "mandatory" is taken to be false by default here
+#     # because it is not specified
 
 # By default, no changes are made.
-services: []
-targets: []
-timers: []
-disable: []
-disable-targets: []
-mask: []
+units: []
diff --git a/src/modules/services-systemd/services-systemd.schema.yaml b/src/modules/services-systemd/services-systemd.schema.yaml
index ee80a80be..7e1fe052e 100644
--- a/src/modules/services-systemd/services-systemd.schema.yaml
+++ b/src/modules/services-systemd/services-systemd.schema.yaml
@@ -4,22 +4,18 @@
 $schema: https://json-schema.org/schema#
 $id: https://calamares.io/schemas/services-systemd
 definitions:
-    service:
-        $id: 'definitions/service'
+    unit:
+        $id: 'definitions/unit'
         type: object
-        description: a name and a flag for services, targets, and others
+        description: a map containing a unit name, an action, and whether it is mandatory
         additionalProperties: false
         properties:
             name: { type: string }
+            action: { type: string, default: "enable" }
             mandatory: { type: boolean, default: false }
         required: [ name ]
 
 additionalProperties: false
 type: object
 properties:
-    services: { type: array, items: { $ref: 'definitions/service' } }
-    targets: { type: array, items: { $ref: 'definitions/service' } }
-    timers: { type: array, items: { $ref: 'definitions/service' } }
-    disable: { type: array, items: { $ref: 'definitions/service' } }
-    disable-targets: { type: array, items: { $ref: 'definitions/service' } }
-    mask: { type: array, items: { $ref: 'definitions/service' } }
+    units: { type: array, items: { $ref: 'definitions/unit' } }

From 27c187084bd705a9aaa7cddc7d2d4bc663b4bc0e Mon Sep 17 00:00:00 2001
From: shivanandvp 
Date: Wed, 6 Jul 2022 20:01:50 -0500
Subject: [PATCH 71/91] fix: Check for name key based on comments on PR

---
 src/modules/services-systemd/main.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/modules/services-systemd/main.py b/src/modules/services-systemd/main.py
index 4eef3f096..ef2984fba 100644
--- a/src/modules/services-systemd/main.py
+++ b/src/modules/services-systemd/main.py
@@ -29,7 +29,7 @@ def pretty_name():
 def systemctl(units):
     """
     For each entry in @p units, run "systemctl  ",
-    where each unit is a map of unit name, action, and a flag.
+    where each unit is a mapping of unit name, action, and a flag.
 
     Returns a failure message, or None if this was successful.
     Units that are not mandatory have their failures suppressed
@@ -42,6 +42,9 @@ def systemctl(units):
             action = "enable"
             mandatory = False
         else:
+            if not unit.has_key("name"):
+                libcalamares.utils.error("The key 'name' is missing from the mapping {_unit!s}. Continuing to the next unit.".format(_unit=str(unit)))
+                continue 
             name = unit["name"]
             action = unit.get("action", "enable")
             mandatory = unit.get("mandatory", False)

From ab813b607f0973b764fa96826a0ae4a8599c2b03 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Sun, 3 Jul 2022 11:31:32 +0200
Subject: [PATCH 72/91] CMake: move kpmcore support into the
 helper-CMake-module

- find the dependencies just once
- fix the interface for kpmcore so it can find its own
  includes (this is mostly relevant for Debian)
---
 CMakeModules/KPMcoreHelper.cmake | 7 +++++++
 src/libcalamares/CMakeLists.txt  | 7 -------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/CMakeModules/KPMcoreHelper.cmake b/CMakeModules/KPMcoreHelper.cmake
index 05dff18dd..3d4f520f5 100644
--- a/CMakeModules/KPMcoreHelper.cmake
+++ b/CMakeModules/KPMcoreHelper.cmake
@@ -18,10 +18,17 @@ if ( NOT KPMcore_searched_for )
         TYPE RECOMMENDED
         PURPOSE "For disk partitioning support"
     )
+    find_package(Qt5 REQUIRED DBus) # Needed for KPMCore
+    find_package(KF5 REQUIRED I18n WidgetsAddons) # Needed for KPMCore
 
     if( KPMcore_FOUND )
         set( KPMcore_API_DEFINITIONS "" )
     else()
         set( KPMcore_API_DEFINITIONS WITHOUT_KPMcore )
     endif()
+
+    foreach(d ${KPMcore_API_DEFINITIONS})
+        target_compile_definitions(kpmcore INTERFACE ${d})
+    endforeach()
+    target_include_directories(kpmcore INTERFACE ${KPMCORE_INCLUDE_DIR})
 endif()
diff --git a/src/libcalamares/CMakeLists.txt b/src/libcalamares/CMakeLists.txt
index 181ec2b30..09291707c 100644
--- a/src/libcalamares/CMakeLists.txt
+++ b/src/libcalamares/CMakeLists.txt
@@ -115,13 +115,6 @@ endif()
 include(KPMcoreHelper)
 
 if(KPMcore_FOUND)
-    find_package(Qt5 REQUIRED DBus) # Needed for KPMCore
-    find_package(KF5 REQUIRED I18n WidgetsAddons) # Needed for KPMCore
-
-    foreach(d ${KPMcore_API_DEFINITIONS})
-        add_definitions(-D${d})
-    endforeach()
-    include_directories(${KPMCORE_INCLUDE_DIR})
     target_sources(
         calamares
         PRIVATE

From fb620464d78c710bb3d0f8232ec08e5e2bc53074 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Sun, 3 Jul 2022 11:39:57 +0200
Subject: [PATCH 73/91] CMake: create an alias for KPMcore that fixes its
 interface

- kpmcore (when used as target "kpmcore") has an interface
  include directory that does not contain the "kpmcore/"
  subdirectory. But the headers it has installed, assume it
  is there (e.g. kpmcore internals use #include ).
- add an alias at Calamares level that sticks in some more
  includes, adds the relevant WITHOUT_kpmcore when it's
  not there, etc.
---
 CMakeModules/KPMcoreHelper.cmake | 43 ++++++++++++++++++++++++--------
 1 file changed, 32 insertions(+), 11 deletions(-)

diff --git a/CMakeModules/KPMcoreHelper.cmake b/CMakeModules/KPMcoreHelper.cmake
index 3d4f520f5..d0cb95239 100644
--- a/CMakeModules/KPMcoreHelper.cmake
+++ b/CMakeModules/KPMcoreHelper.cmake
@@ -7,28 +7,49 @@
 #
 # Finds KPMcore and consistently sets API flags based on the version.
 #
-if ( NOT KPMcore_searched_for )
-    set( KPMcore_searched_for TRUE )
+# If KPMcore is not found, still create calamares::kpmcore interface
+# library, which will add definition WITHOUT_KPMcore.
+#
+if(NOT KPMcore_searched_for AND NOT TARGET calapmcore)
+    set(KPMcore_searched_for TRUE)
 
-    find_package( KPMcore 21.12.0 )
+    find_package(KPMcore 20.04.0)
     set_package_properties(
-        KPMcore PROPERTIES
+        KPMcore
+        PROPERTIES
         URL "https://invent.kde.org/kde/kpmcore"
         DESCRIPTION "KDE Partitioning library"
         TYPE RECOMMENDED
         PURPOSE "For disk partitioning support"
     )
-    find_package(Qt5 REQUIRED DBus) # Needed for KPMCore
-    find_package(KF5 REQUIRED I18n WidgetsAddons) # Needed for KPMCore
 
-    if( KPMcore_FOUND )
-        set( KPMcore_API_DEFINITIONS "" )
+    # Create an internal Calamares interface to KPMcore
+    # and give it a nice alias name. If kpmcore is not found,
+    # then make a "no KPMcore" library.
+    add_library(calapmcore INTERFACE)
+
+    if(KPMcore_FOUND)
+        find_package(Qt5 REQUIRED DBus) # Needed for KPMCore
+        find_package(KF5 REQUIRED I18n WidgetsAddons) # Needed for KPMCore
+
+        target_link_libraries(calapmcore INTERFACE kpmcore Qt5::DBus KF5::I18n KF5::WidgetsAddons)
+        target_include_directories(calapmcore INTERFACE ${KPMCORE_INCLUDE_DIR})
+        set(KPMcore_API_DEFINITIONS "")
     else()
-        set( KPMcore_API_DEFINITIONS WITHOUT_KPMcore )
+        set(KPMcore_API_DEFINITIONS WITHOUT_KPMcore)
     endif()
 
     foreach(d ${KPMcore_API_DEFINITIONS})
-        target_compile_definitions(kpmcore INTERFACE ${d})
+        target_compile_definitions(calapmcore INTERFACE ${d})
     endforeach()
-    target_include_directories(kpmcore INTERFACE ${KPMCORE_INCLUDE_DIR})
+
+    add_library(calamares::kpmcore ALIAS calapmcore)
+else()
+    if(TARGET calapmcore)
+        message(STATUS "KPMcore has already been found")
+        set(KPMcore_FOUND TRUE)
+    else()
+        message(STATUS "KPMcore has been searched-for and not found")
+        set(KPMcore_FOUND FALSE)
+    endif()
 endif()

From 3360ad612e19ed47ec903607ccf0280a667d15c4 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Sun, 3 Jul 2022 11:43:01 +0200
Subject: [PATCH 74/91] [libcalamares] Use Calamares interface-library to
 kpmcore

---
 src/libcalamares/CMakeLists.txt            | 6 +++---
 src/modules/fsresizer/CMakeLists.txt       | 4 ++--
 src/modules/partition/CMakeLists.txt       | 6 ++----
 src/modules/partition/tests/CMakeLists.txt | 8 ++++----
 4 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/libcalamares/CMakeLists.txt b/src/libcalamares/CMakeLists.txt
index 09291707c..1798d2ee4 100644
--- a/src/libcalamares/CMakeLists.txt
+++ b/src/libcalamares/CMakeLists.txt
@@ -123,7 +123,7 @@ if(KPMcore_FOUND)
             partition/PartitionIterator.cpp
             partition/PartitionQuery.cpp
     )
-    target_link_libraries(calamares PRIVATE kpmcore)
+    target_link_libraries(calamares PRIVATE calamares::kpmcore)
 endif()
 
 ### LIBRARY
@@ -238,8 +238,8 @@ calamares_add_test(libcalamaresnetworktest SOURCES network/Tests.cpp)
 calamares_add_test(libcalamarespackagestest SOURCES packages/Tests.cpp)
 
 if(KPMcore_FOUND)
-    calamares_add_test(libcalamarespartitiontest SOURCES partition/Global.cpp partition/Tests.cpp LIBRARIES kpmcore)
-    calamares_add_test(libcalamarespartitionkpmtest SOURCES partition/KPMTests.cpp LIBRARIES kpmcore)
+    calamares_add_test(libcalamarespartitiontest SOURCES partition/Global.cpp partition/Tests.cpp LIBRARIES calamares::kpmcore)
+    calamares_add_test(libcalamarespartitionkpmtest SOURCES partition/KPMTests.cpp LIBRARIES calamares::kpmcore)
 endif()
 
 calamares_add_test(libcalamaresutilstest SOURCES utils/Tests.cpp utils/Runner.cpp)
diff --git a/src/modules/fsresizer/CMakeLists.txt b/src/modules/fsresizer/CMakeLists.txt
index 189e7c1dc..f4c94bc8b 100644
--- a/src/modules/fsresizer/CMakeLists.txt
+++ b/src/modules/fsresizer/CMakeLists.txt
@@ -9,7 +9,7 @@ find_package(KF5WidgetsAddons CONFIG)
 
 include(KPMcoreHelper)
 
-if(KPMcore_FOUND AND Qt5DBus_FOUND AND KF5CoreAddons_FOUND AND KF5Config_FOUND)
+if(KPMcore_FOUND)
     include_directories(${KPMCORE_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/src/modules/partition)
 
     # The PartitionIterator is a small class, and it's easiest -- but also a
@@ -20,7 +20,7 @@ if(KPMcore_FOUND AND Qt5DBus_FOUND AND KF5CoreAddons_FOUND AND KF5Config_FOUND)
         SOURCES
             ResizeFSJob.cpp
         LINK_PRIVATE_LIBRARIES
-            kpmcore
+            calamares::kpmcore
         COMPILE_DEFINITIONS ${KPMcore_API_DEFINITIONS}
         SHARED_LIB
     )
diff --git a/src/modules/partition/CMakeLists.txt b/src/modules/partition/CMakeLists.txt
index 6d07ec281..3b6269854 100644
--- a/src/modules/partition/CMakeLists.txt
+++ b/src/modules/partition/CMakeLists.txt
@@ -49,9 +49,7 @@ find_package(KF5Config CONFIG)
 find_package(KF5I18n CONFIG)
 find_package(KF5WidgetsAddons CONFIG)
 
-if(KPMcore_FOUND AND Qt5DBus_FOUND AND KF5CoreAddons_FOUND AND KF5Config_FOUND)
-    list(APPEND _partition_defs ${KPMcore_API_DEFINITIONS})
-    include_directories(${KPMCORE_INCLUDE_DIR})
+if(KPMcore_FOUND)
     include_directories(${PROJECT_BINARY_DIR}/src/libcalamaresui)
 
     add_subdirectory(tests)
@@ -118,7 +116,7 @@ if(KPMcore_FOUND AND Qt5DBus_FOUND AND KF5CoreAddons_FOUND AND KF5Config_FOUND)
             gui/ReplaceWidget.ui
             gui/VolumeGroupBaseDialog.ui
         LINK_PRIVATE_LIBRARIES
-            kpmcore
+            calamares::kpmcore
             KF5::CoreAddons
         COMPILE_DEFINITIONS ${_partition_defs}
         SHARED_LIB
diff --git a/src/modules/partition/tests/CMakeLists.txt b/src/modules/partition/tests/CMakeLists.txt
index 26a1d83f9..9c5dd3257 100644
--- a/src/modules/partition/tests/CMakeLists.txt
+++ b/src/modules/partition/tests/CMakeLists.txt
@@ -25,14 +25,14 @@ calamares_add_test(
         ${PartitionModule_SOURCE_DIR}/jobs/DeletePartitionJob.cpp
         ${PartitionModule_SOURCE_DIR}/jobs/PartitionJob.cpp
         ${PartitionModule_SOURCE_DIR}/jobs/ResizePartitionJob.cpp
-    LIBRARIES kpmcore
+    LIBRARIES calamares::kpmcore
     DEFINITIONS ${_partition_defs}
 )
 
 calamares_add_test(
     partitionclearmountsjobtest
     SOURCES ${PartitionModule_SOURCE_DIR}/jobs/ClearMountsJob.cpp ClearMountsJobTests.cpp
-    LIBRARIES kpmcore
+    LIBRARIES calamares::kpmcore
     DEFINITIONS ${_partition_defs}
 )
 
@@ -45,7 +45,7 @@ calamares_add_test(
         ${PartitionModule_SOURCE_DIR}/core/PartitionLayout.cpp
         ${PartitionModule_SOURCE_DIR}/core/PartUtils.cpp
         ${PartitionModule_SOURCE_DIR}/core/DeviceModel.cpp
-    LIBRARIES kpmcore Calamares::calamaresui
+    LIBRARIES calamares::kpmcore Calamares::calamaresui
     DEFINITIONS ${_partition_defs}
 )
 
@@ -58,6 +58,6 @@ calamares_add_test(
 calamares_add_test(
     partitiondevicestest
     SOURCES DevicesTests.cpp ${PartitionModule_SOURCE_DIR}/core/DeviceList.cpp
-    LIBRARIES kpmcore
+    LIBRARIES calamares::kpmcore
     DEFINITIONS ${_partition_defs}
 )

From eccfdbd9867f5dd1b79844a5a7ebad0dfd0e6709 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Sun, 3 Jul 2022 12:01:39 +0200
Subject: [PATCH 75/91] [libcalamares] Mark a TODO that is causing build
 failures

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

diff --git a/src/libcalamares/partition/Global.h b/src/libcalamares/partition/Global.h
index b76c74c58..64c221240 100644
--- a/src/libcalamares/partition/Global.h
+++ b/src/libcalamares/partition/Global.h
@@ -20,6 +20,8 @@
 #include "FileSystem.h"
 #include "JobQueue.h"
 
+// TODO: this assumes KPMcore is present, but the header and TU
+//       are used always.
 #include 
 
 namespace CalamaresUtils

From bb0a2d3bd4a52856c62207b1cfcb0589378b4fff Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Thu, 14 Jul 2022 10:15:28 +0200
Subject: [PATCH 76/91] Changes: stray space in the 3.2 changelog

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

diff --git a/CHANGES-3.2 b/CHANGES-3.2
index 3e5cc3db1..1c342b3a1 100644
--- a/CHANGES-3.2
+++ b/CHANGES-3.2
@@ -22,7 +22,7 @@ This release contains contributions from (alphabetically by first name):
  - No module changes yet
 
 
- # 3.2.60 (2022-06-19) #
+# 3.2.60 (2022-06-19) #
 
 This is the first community-maintainence release of Calamares 3.2.
 Somewhat ironically, all the commits in the branch come from

From 56e37d0abb3f295bb0401c149aa5117c0ab4c869 Mon Sep 17 00:00:00 2001
From: dalto 
Date: Sun, 17 Jul 2022 14:16:42 -0500
Subject: [PATCH 77/91] [partition] Fix encryption being shown when not
 available

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

diff --git a/src/modules/partition/gui/ChoicePage.cpp b/src/modules/partition/gui/ChoicePage.cpp
index 2730e069f..d08c07d57 100644
--- a/src/modules/partition/gui/ChoicePage.cpp
+++ b/src/modules/partition/gui/ChoicePage.cpp
@@ -467,18 +467,6 @@ ChoicePage::onActionChanged()
         applyActionChoice( m_config->installChoice() );
     }
 
-    // Whole disk encryption isn't implemented for zfs so disable the option for now
-    if ( m_eraseFsTypesChoiceComboBox != nullptr && m_enableEncryptionWidget )
-    {
-        if ( m_eraseFsTypesChoiceComboBox->currentText() == "zfs" )
-        {
-            m_encryptWidget->hide();
-        }
-        else
-        {
-            m_encryptWidget->show();
-        }
-    }
     updateNextEnabled();
 }
 
@@ -1075,10 +1063,7 @@ ChoicePage::updateActionChoicePreview( InstallChoice choice )
     case InstallChoice::Erase:
     case InstallChoice::Replace:
     {
-        if ( m_enableEncryptionWidget )
-        {
-            m_encryptWidget->show();
-        }
+        m_encryptWidget->setVisible( m_enableEncryptionWidget && m_eraseFsTypesChoiceComboBox->currentText() != "zfs" && choice == InstallChoice::Erase );
         m_previewBeforeLabel->setText( tr( "Current:" ) );
         m_afterPartitionBarsView = new PartitionBarsView( m_previewAfterFrame );
         m_afterPartitionBarsView->setNestedPartitionsMode( mode );

From 250678627a2be509c1a43d986e609960b9755ad9 Mon Sep 17 00:00:00 2001
From: dalto 
Date: Sun, 17 Jul 2022 14:53:11 -0500
Subject: [PATCH 78/91] [partition] Apply format

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

diff --git a/src/modules/partition/gui/ChoicePage.cpp b/src/modules/partition/gui/ChoicePage.cpp
index d08c07d57..a00297269 100644
--- a/src/modules/partition/gui/ChoicePage.cpp
+++ b/src/modules/partition/gui/ChoicePage.cpp
@@ -1063,7 +1063,8 @@ ChoicePage::updateActionChoicePreview( InstallChoice choice )
     case InstallChoice::Erase:
     case InstallChoice::Replace:
     {
-        m_encryptWidget->setVisible( m_enableEncryptionWidget && m_eraseFsTypesChoiceComboBox->currentText() != "zfs" && choice == InstallChoice::Erase );
+        m_encryptWidget->setVisible( m_enableEncryptionWidget && m_eraseFsTypesChoiceComboBox->currentText() != "zfs"
+                                     && choice == InstallChoice::Erase );
         m_previewBeforeLabel->setText( tr( "Current:" ) );
         m_afterPartitionBarsView = new PartitionBarsView( m_previewAfterFrame );
         m_afterPartitionBarsView->setNestedPartitionsMode( mode );

From 64eed3a40cc72e0db0c2f0d12bd470751efdeb3b Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Mon, 18 Jul 2022 23:17:08 +0200
Subject: [PATCH 79/91] CI: remove nonsense CMake flags

---
 .github/workflows/nightly-debian.yml   | 2 --
 .github/workflows/nightly-neon.yml     | 2 --
 .github/workflows/nightly-opensuse.yml | 2 --
 3 files changed, 6 deletions(-)

diff --git a/.github/workflows/nightly-debian.yml b/.github/workflows/nightly-debian.yml
index f201729db..d24df05a0 100644
--- a/.github/workflows/nightly-debian.yml
+++ b/.github/workflows/nightly-debian.yml
@@ -9,9 +9,7 @@ env:
   BUILDDIR: /build
   SRCDIR: ${{ github.workspace }}
   CMAKE_ARGS: |
-    -DWEBVIEW_FORCE_WEBKIT=1
     -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
-    -DWITH_PYTHONQT=OFF"
     -DCMAKE_BUILD_TYPE=Debug
 
 jobs:
diff --git a/.github/workflows/nightly-neon.yml b/.github/workflows/nightly-neon.yml
index b0c576721..daa04a215 100644
--- a/.github/workflows/nightly-neon.yml
+++ b/.github/workflows/nightly-neon.yml
@@ -9,9 +9,7 @@ env:
   BUILDDIR: /build
   SRCDIR: ${{ github.workspace }}
   CMAKE_ARGS: |
-    -DWEBVIEW_FORCE_WEBKIT=1
     -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
-    -DWITH_PYTHONQT=OFF"
     -DCMAKE_BUILD_TYPE=Debug
 
 jobs:
diff --git a/.github/workflows/nightly-opensuse.yml b/.github/workflows/nightly-opensuse.yml
index 0bc0e74e7..0ad5d058e 100644
--- a/.github/workflows/nightly-opensuse.yml
+++ b/.github/workflows/nightly-opensuse.yml
@@ -9,9 +9,7 @@ env:
   BUILDDIR: /build
   SRCDIR: ${{ github.workspace }}
   CMAKE_ARGS: |
-    -DWEBVIEW_FORCE_WEBKIT=1
     -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
-    -DWITH_PYTHONQT=OFF"
     -DCMAKE_BUILD_TYPE=Debug
 
 jobs:

From 04e93f513c42893a0c4005b12771634baf7b3bea Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Tue, 19 Jul 2022 11:41:01 +0200
Subject: [PATCH 80/91] [libcalamares] Always use the calamares::kpmcore
 library

When KPMcore is present, the calamares::kpmcore wraps that
and provides suitable API detection. If KPMcore is not
present, the same interface library provides -DWITHOUT_KPMcore.
---
 src/libcalamares/CMakeLists.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/libcalamares/CMakeLists.txt b/src/libcalamares/CMakeLists.txt
index c12bcf2bd..e2c9805ad 100644
--- a/src/libcalamares/CMakeLists.txt
+++ b/src/libcalamares/CMakeLists.txt
@@ -138,8 +138,9 @@ if(KPMcore_FOUND)
             partition/PartitionIterator.cpp
             partition/PartitionQuery.cpp
     )
-    target_link_libraries(calamares PRIVATE calamares::kpmcore)
 endif()
+# Always, since this also handles the no-KPMcore case
+target_link_libraries(calamares PRIVATE calamares::kpmcore)
 
 ### LIBRARY
 #

From 97cbebc0f7fa3a65517ac7af7d3a9e349c51b4e9 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Tue, 19 Jul 2022 11:46:57 +0200
Subject: [PATCH 81/91] [libcalamares] Move KPMcore-dependencies

- FileSystem.h depends on KPMcore and only compiles when
  KPMcore is present; it can use KPMcore identifiers.
- Global.h doesn't.
- Move the few functions introduced into Global.h that need
  KPMcore, to FileSystem.h instead.
---
 src/libcalamares/partition/FileSystem.h | 23 ++++++++++++++++++++
 src/libcalamares/partition/Global.h     | 28 +------------------------
 2 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/src/libcalamares/partition/FileSystem.h b/src/libcalamares/partition/FileSystem.h
index 6696f0df9..0f16c2979 100644
--- a/src/libcalamares/partition/FileSystem.h
+++ b/src/libcalamares/partition/FileSystem.h
@@ -19,6 +19,7 @@
 #define PARTITION_FILESYSTEM_H
 
 #include "DllMacro.h"
+#include "partition/Global.h"
 
 #include 
 
@@ -70,6 +71,28 @@ userVisibleFS( FileSystem* fs )
     return fs ? userVisibleFS( *fs ) : QString();
 }
 
+/** @brief Mark a particular filesystem type as used (or not)
+ *
+ * See useFilesystemGS(const QString&, bool); this method uses the filesystem type
+ * enumeration to pick the name. (The other implementation is in `Global.h`
+ * because it touches Global Storage, but this one needs KPMcore)
+ */
+inline void
+useFilesystemGS( FileSystem::Type filesystem, bool used )
+{
+    useFilesystemGS( untranslatedFS( filesystem ), used );
+}
+
+/* @brief Reads from global storage whether the typesystem type is used
+ *
+ * See isFilesystemUsedGS(const QString&). (The other implementation is in `Global.h`
+ * because it touches Global Storage, but this one needs KPMcore)
+ */
+inline bool
+isFilesystemUsedGS( FileSystem::Type filesystem )
+{
+    return isFilesystemUsedGS( untranslatedFS( filesystem ) );
+}
 
 }  // namespace Partition
 }  // namespace CalamaresUtils
diff --git a/src/libcalamares/partition/Global.h b/src/libcalamares/partition/Global.h
index 64c221240..efdec5bd0 100644
--- a/src/libcalamares/partition/Global.h
+++ b/src/libcalamares/partition/Global.h
@@ -10,20 +10,15 @@
 
 /*
  * This is the API for manipulating Global Storage keys related to
- * filesystems and partitions.
+ * filesystems and partitions. This does **not** depend on KPMcore.
  */
 
 #ifndef PARTITION_GLOBAL_H
 #define PARTITION_GLOBAL_H
 
 #include "DllMacro.h"
-#include "FileSystem.h"
 #include "JobQueue.h"
 
-// TODO: this assumes KPMcore is present, but the header and TU
-//       are used always.
-#include 
-
 namespace CalamaresUtils
 {
 namespace Partition
@@ -77,27 +72,6 @@ isFilesystemUsedGS( const QString& filesystemType )
     return isFilesystemUsedGS( Calamares::JobQueue::instanceGlobalStorage(), filesystemType );
 }
 
-/** @brief Mark a particular filesystem type as used (or not)
- *
- * See useFilesystemGS(const QString&, bool); this method uses the filesystem type
- * enumeration to pick the name.
- */
-inline void
-useFilesystemGS( FileSystem::Type filesystem, bool used )
-{
-    useFilesystemGS( untranslatedFS( filesystem ), used );
-}
-
-/* @brief Reads from global storage whether the typesystem type is used
- *
- * See isFilesystemUsedGS(const QString&).
- */
-inline bool
-isFilesystemUsedGS( FileSystem::Type filesystem )
-{
-    return isFilesystemUsedGS( untranslatedFS( filesystem ) );
-}
-
 }  // namespace Partition
 }  // namespace CalamaresUtils
 

From 908928b41c1b20a123b548356c6ed92de1ee8886 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Tue, 19 Jul 2022 11:54:26 +0200
Subject: [PATCH 82/91] CMake: repair broken logic around finding KPMcore

- the alias libraries calapmcore and calamares::kpmcore
  are always created; if there is no KPMcore, they handle
  definitions to signal that.
- upstream kpmcore target is the one we should be testing
  to see if KPMcore itself is there (or, use KPMcore_FOUND).
---
 CMakeModules/KPMcoreHelper.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeModules/KPMcoreHelper.cmake b/CMakeModules/KPMcoreHelper.cmake
index d0cb95239..654fa8b0d 100644
--- a/CMakeModules/KPMcoreHelper.cmake
+++ b/CMakeModules/KPMcoreHelper.cmake
@@ -45,7 +45,7 @@ if(NOT KPMcore_searched_for AND NOT TARGET calapmcore)
 
     add_library(calamares::kpmcore ALIAS calapmcore)
 else()
-    if(TARGET calapmcore)
+    if(TARGET kpmcore)
         message(STATUS "KPMcore has already been found")
         set(KPMcore_FOUND TRUE)
     else()

From 8cefb59efb3459e9fbea22c53b74fc797e807146 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Tue, 19 Jul 2022 12:00:05 +0200
Subject: [PATCH 83/91] [packagechooser] Repair namespace-changed build error

FIXES #2021
---
 src/modules/packagechooser/ItemAppStream.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/packagechooser/ItemAppStream.cpp b/src/modules/packagechooser/ItemAppStream.cpp
index dbd1db4bc..e286bd1ff 100644
--- a/src/modules/packagechooser/ItemAppStream.cpp
+++ b/src/modules/packagechooser/ItemAppStream.cpp
@@ -72,7 +72,7 @@ fromComponent( AppStream::Component& component )
     map.insert( "name", en_name );
     map.insert( "description", en_description );
 
-    for ( const QString& locale : CalamaresUtils::Locale::availableTranslations()->localeIds() )
+    for ( const QString& locale : Calamares::Locale::availableTranslations()->localeIds() )
     {
         component.setActiveLocale( locale );
         QString name = component.name();

From f30d568f10fdeffd9151553667a5fd9b61158ba5 Mon Sep 17 00:00:00 2001
From: demmm 
Date: Wed, 20 Jul 2022 20:22:04 +0200
Subject: [PATCH 84/91] [luksopenswaphookcfg] fix for
 https://github.com/calamares/calamares/issues/1659

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

diff --git a/src/modules/luksopenswaphookcfg/LOSHJob.cpp b/src/modules/luksopenswaphookcfg/LOSHJob.cpp
index ad3b0abea..219c89b49 100644
--- a/src/modules/luksopenswaphookcfg/LOSHJob.cpp
+++ b/src/modules/luksopenswaphookcfg/LOSHJob.cpp
@@ -165,7 +165,7 @@ globalStoragePartitionInfo( Calamares::GlobalStorage* gs, LOSHInfo& info )
     {
         Calamares::String::removeLeading( btrfsRootSubvolume, '/' );
         info.keyfile_device_mount_options
-            = QStringLiteral( "keyfile_device_mount_options=--options=subvol=" ) + btrfsRootSubvolume;
+            = QStringLiteral( "--options=subvol=" ) + btrfsRootSubvolume;
     }
 }
 

From f42f2514cb492c13b547851f937beb448d967e6a Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Thu, 21 Jul 2022 13:19:19 +0200
Subject: [PATCH 85/91] CMake: simplify the KPMcore helper

---
 CMakeModules/KPMcoreHelper.cmake | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/CMakeModules/KPMcoreHelper.cmake b/CMakeModules/KPMcoreHelper.cmake
index 654fa8b0d..d1bfec684 100644
--- a/CMakeModules/KPMcoreHelper.cmake
+++ b/CMakeModules/KPMcoreHelper.cmake
@@ -10,9 +10,7 @@
 # If KPMcore is not found, still create calamares::kpmcore interface
 # library, which will add definition WITHOUT_KPMcore.
 #
-if(NOT KPMcore_searched_for AND NOT TARGET calapmcore)
-    set(KPMcore_searched_for TRUE)
-
+if(NOT TARGET calapmcore)
     find_package(KPMcore 20.04.0)
     set_package_properties(
         KPMcore
@@ -34,15 +32,12 @@ if(NOT KPMcore_searched_for AND NOT TARGET calapmcore)
 
         target_link_libraries(calapmcore INTERFACE kpmcore Qt5::DBus KF5::I18n KF5::WidgetsAddons)
         target_include_directories(calapmcore INTERFACE ${KPMCORE_INCLUDE_DIR})
-        set(KPMcore_API_DEFINITIONS "")
+        # If there were KPMcore API variations, figure them out here
+        # target_compile_definitions(calapmcore INTERFACE WITH_KPMcore)
     else()
-        set(KPMcore_API_DEFINITIONS WITHOUT_KPMcore)
+        target_compile_definitions(calapmcore INTERFACE WITHOUT_KPMcore)
     endif()
 
-    foreach(d ${KPMcore_API_DEFINITIONS})
-        target_compile_definitions(calapmcore INTERFACE ${d})
-    endforeach()
-
     add_library(calamares::kpmcore ALIAS calapmcore)
 else()
     if(TARGET kpmcore)

From 0688c7f4e79543c40c87d85f05047dac0eac9e2a Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Tue, 28 Jun 2022 00:12:33 +0200
Subject: [PATCH 86/91] CMake: target kpmcore doesn't exist elsewhere, so check
 was failing

Consumers of calapmcode couldn't tell if KPMcore was found.
Pass it around as a property of calapmcore, rather than
anything else.

FIXES #2026
---
 CMakeModules/KPMcoreHelper.cmake | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/CMakeModules/KPMcoreHelper.cmake b/CMakeModules/KPMcoreHelper.cmake
index d1bfec684..694ac13d6 100644
--- a/CMakeModules/KPMcoreHelper.cmake
+++ b/CMakeModules/KPMcoreHelper.cmake
@@ -34,13 +34,16 @@ if(NOT TARGET calapmcore)
         target_include_directories(calapmcore INTERFACE ${KPMCORE_INCLUDE_DIR})
         # If there were KPMcore API variations, figure them out here
         # target_compile_definitions(calapmcore INTERFACE WITH_KPMcore)
+        set_target_properties(calapmcore PROPERTIES KPMcore_FOUND TRUE)
     else()
         target_compile_definitions(calapmcore INTERFACE WITHOUT_KPMcore)
+        set_target_properties(calapmcore PROPERTIES KPMcore_FOUND FALSE)
     endif()
 
     add_library(calamares::kpmcore ALIAS calapmcore)
 else()
-    if(TARGET kpmcore)
+    get_target_property(KPMcore_FOUND calapmcore KPMcore_FOUND)
+    if(KPMcore_FOUND)
         message(STATUS "KPMcore has already been found")
         set(KPMcore_FOUND TRUE)
     else()

From 8a43ed99ed371ab5e8ef9d0cdb6d633d5238f2d8 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Sat, 23 Jul 2022 23:45:14 +0200
Subject: [PATCH 87/91] CMake: provide calamares::kpmcore only when kpmcore was
 found

This works around older CMakes that refuse to set arbitrary
properties on a target. Instead, use calamares::kpmcore
as the specific indicator that kpmcore was found.

Breaks build of libcalamares, since that needs **something**
regardless of whether KPMcore was found.
---
 CMakeModules/KPMcoreHelper.cmake | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/CMakeModules/KPMcoreHelper.cmake b/CMakeModules/KPMcoreHelper.cmake
index 694ac13d6..ceef32dab 100644
--- a/CMakeModules/KPMcoreHelper.cmake
+++ b/CMakeModules/KPMcoreHelper.cmake
@@ -34,16 +34,18 @@ if(NOT TARGET calapmcore)
         target_include_directories(calapmcore INTERFACE ${KPMCORE_INCLUDE_DIR})
         # If there were KPMcore API variations, figure them out here
         # target_compile_definitions(calapmcore INTERFACE WITH_KPMcore)
-        set_target_properties(calapmcore PROPERTIES KPMcore_FOUND TRUE)
+
+        # Flag that this library has KPMcore support. A variable
+        # set here has the wrong scope. ENV{} would be visible
+        # everywhere but seems the wrong thing to do. Setting
+        # properties on calapmcore requires a newer CMake than
+        # Debian 11 has, so runs into support issues.
+        add_library(calamares::kpmcore ALIAS calapmcore)
     else()
         target_compile_definitions(calapmcore INTERFACE WITHOUT_KPMcore)
-        set_target_properties(calapmcore PROPERTIES KPMcore_FOUND FALSE)
     endif()
-
-    add_library(calamares::kpmcore ALIAS calapmcore)
 else()
-    get_target_property(KPMcore_FOUND calapmcore KPMcore_FOUND)
-    if(KPMcore_FOUND)
+    if(TARGET calamares::kpmcore)
         message(STATUS "KPMcore has already been found")
         set(KPMcore_FOUND TRUE)
     else()

From ba96f7ddc261c63b8814777d05c0356124b49514 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Sat, 23 Jul 2022 23:48:21 +0200
Subject: [PATCH 88/91] CMake: build libcalamares with an internal name for
 KPMcore

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

diff --git a/src/libcalamares/CMakeLists.txt b/src/libcalamares/CMakeLists.txt
index e2c9805ad..86e03f071 100644
--- a/src/libcalamares/CMakeLists.txt
+++ b/src/libcalamares/CMakeLists.txt
@@ -139,8 +139,10 @@ if(KPMcore_FOUND)
             partition/PartitionQuery.cpp
     )
 endif()
-# Always, since this also handles the no-KPMcore case
-target_link_libraries(calamares PRIVATE calamares::kpmcore)
+# Always, since this also handles the no-KPMcore case; we don't
+# call it calamares::kpmcore because that name exists only
+# when KPMcore is actually found.
+target_link_libraries(calamares PRIVATE calapmcore)
 
 ### LIBRARY
 #

From be54cd24de7c22ba9a4521bb8d8aeb7fea89c983 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Tue, 26 Jul 2022 17:33:39 +0200
Subject: [PATCH 89/91] [partition] Factor out visibility of encryption widget

- Put this in a method of its own even though it's used
  only once, so we can put a good name on it.
- If there are no FS choices (e.g. the sample settings file)
  then there is no combo-box, and the check was crashing.

FIXES #2029
---
 src/modules/partition/gui/ChoicePage.cpp | 11 +++++++++--
 src/modules/partition/gui/ChoicePage.h   |  3 ++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/modules/partition/gui/ChoicePage.cpp b/src/modules/partition/gui/ChoicePage.cpp
index a00297269..c5e44aaec 100644
--- a/src/modules/partition/gui/ChoicePage.cpp
+++ b/src/modules/partition/gui/ChoicePage.cpp
@@ -1063,8 +1063,7 @@ ChoicePage::updateActionChoicePreview( InstallChoice choice )
     case InstallChoice::Erase:
     case InstallChoice::Replace:
     {
-        m_encryptWidget->setVisible( m_enableEncryptionWidget && m_eraseFsTypesChoiceComboBox->currentText() != "zfs"
-                                     && choice == InstallChoice::Erase );
+        m_encryptWidget->setVisible( shouldShowEncryptWidget( choice ) );
         m_previewBeforeLabel->setText( tr( "Current:" ) );
         m_afterPartitionBarsView = new PartitionBarsView( m_previewAfterFrame );
         m_afterPartitionBarsView->setNestedPartitionsMode( mode );
@@ -1731,3 +1730,11 @@ ChoicePage::createBootloaderPanel()
 
     return panelWidget;
 }
+
+bool ChoicePage::shouldShowEncryptWidget( Config::InstallChoice choice ) const
+{
+    // If there are any choices for FS, check it's not ZFS because that doesn't
+    // support the kind of encryption we enable here.
+    const bool suitableFS = m_eraseFsTypesChoiceComboBox ? m_eraseFsTypesChoiceComboBox->currentText() != "zfs" : true;
+    return (choice == InstallChoice::Erase) && m_enableEncryptionWidget && suitableFS;
+}
diff --git a/src/modules/partition/gui/ChoicePage.h b/src/modules/partition/gui/ChoicePage.h
index ee60b4309..6d77629d4 100644
--- a/src/modules/partition/gui/ChoicePage.h
+++ b/src/modules/partition/gui/ChoicePage.h
@@ -126,6 +126,7 @@ private:
 
     void updateDeviceStatePreview();
     void updateActionChoicePreview( Config::InstallChoice choice );
+    bool shouldShowEncryptWidget( Config::InstallChoice choice ) const;
     void setupActions();
     OsproberEntryList getOsproberEntriesForDevice( Device* device ) const;
     void doAlongsideApply();
@@ -167,7 +168,7 @@ private:
     int m_lastSelectedDeviceIndex = -1;
     int m_lastSelectedActionIndex = -1;
 
-    bool m_enableEncryptionWidget;
+    bool m_enableEncryptionWidget = false;
 
     QMutex m_coreMutex;
 };

From 42386c520dbd4f1cada2a1ff699abdd9b61ef631 Mon Sep 17 00:00:00 2001
From: demmm 
Date: Thu, 28 Jul 2022 17:50:05 +0200
Subject: [PATCH 90/91] [calamares] fix for
 https://github.com/calamares/calamares/issues/2030 adjust CalamaresWindow.cpp
 so About & Debug buttons pick needd translation for widget sidebar

---
 src/calamares/CalamaresWindow.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/calamares/CalamaresWindow.cpp b/src/calamares/CalamaresWindow.cpp
index c79e17d58..e00615bf2 100644
--- a/src/calamares/CalamaresWindow.cpp
+++ b/src/calamares/CalamaresWindow.cpp
@@ -145,8 +145,8 @@ getWidgetSidebar( Calamares::DebugWindowManager* debug,
         CALAMARES_RETRANSLATE_FOR(
             aboutDialog,
             aboutDialog->setText(
-                QCoreApplication::translate( CalamaresWindow::staticMetaObject.className(), "About" ) );
-            aboutDialog->setToolTip( QCoreApplication::translate( CalamaresWindow::staticMetaObject.className(),
+                QCoreApplication::translate( "calamares-sidebar", "About" ) );
+            aboutDialog->setToolTip( QCoreApplication::translate( "calamares-sidebar",
                                                                   "Show information about Calamares" ) ); );
         extraButtons->addWidget( aboutDialog );
         aboutDialog->setFlat( true );
@@ -161,9 +161,9 @@ getWidgetSidebar( Calamares::DebugWindowManager* debug,
             CalamaresUtils::Bugs, CalamaresUtils::Original, 2 * QSize( defaultFontHeight, defaultFontHeight ) ) );
         CALAMARES_RETRANSLATE_FOR( debugWindowBtn,
                                    debugWindowBtn->setText( QCoreApplication::translate(
-                                       CalamaresWindow::staticMetaObject.className(), "Debug" ) );
+                                       "calamares-sidebar", "Debug" ) );
                                    debugWindowBtn->setToolTip( QCoreApplication::translate(
-                                       CalamaresWindow::staticMetaObject.className(), "Show debug information" ) ); );
+                                       "calamares-sidebar", "Show debug information" ) ); );
         extraButtons->addWidget( debugWindowBtn );
         debugWindowBtn->setFlat( true );
         debugWindowBtn->setCheckable( true );

From 8c873e0f49cef09a83a26c4ffc073925e1a91d4d Mon Sep 17 00:00:00 2001
From: Vitor Lopes 
Date: Fri, 29 Jul 2022 18:03:44 +0100
Subject: [PATCH 91/91] add HDPI support

---
 src/calamares/main.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/calamares/main.cpp b/src/calamares/main.cpp
index 495127881..80a2b3a62 100644
--- a/src/calamares/main.cpp
+++ b/src/calamares/main.cpp
@@ -107,6 +107,7 @@ handle_args( CalamaresApplication& a )
 int
 main( int argc, char* argv[] )
 {
+    QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
     CalamaresApplication a( argc, argv );
 
     KAboutData aboutData( "calamares",