diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index cf1505f17d5c793eef00aea9ae0bd55541d87e50..8861efa48139c955d12e9e568ea5dc6055217b5a 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
diff --git a/CHANGES-3.2 b/CHANGES-3.2
index 13b806b26589bc92175954c2641cf17993486cec..b897c1b353eb07b9296cd75edc19c060ba057063 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 d006faaf0c6597b3f98cfd19d80d988583c2fb30..80a8170bd217423dfc2094b37da7807dec81546f 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." )
@@ -134,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
 #
diff --git a/lang/calamares_ar.ts b/lang/calamares_ar.ts
index 7d12a26b447e820a5a7a105c73f1efe7e9b37495..dddf401e6464a775873be221bdc887c59c01431a 100644
--- a/lang/calamares_ar.ts
+++ b/lang/calamares_ar.ts
@@ -156,7 +156,7 @@
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/calamares/DebugWindow.cpp" line="239"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="244"/>
       <source>Debug information</source>
       <translation>معلومات التّنقيح</translation>
     </message>
@@ -511,12 +511,12 @@ The installer will quit and all changes will be lost.</source>
   <context>
     <name>CalamaresWindow</name>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="369"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
       <source>%1 Setup Program</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="370"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
       <source>%1 Installer</source>
       <translation>%1 المثبت</translation>
     </message>
@@ -1461,7 +1461,7 @@ The installer will quit and all changes will be lost.</source>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="260"/>
-      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphraseor delete and create a new encrypted partition.</source>
+      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphrase or delete and create a new encrypted partition.</source>
       <translation type="unfinished"/>
     </message>
   </context>
@@ -4054,61 +4054,56 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.ui" line="140"/>
-      <source>&amp;About</source>
-      <translation>&amp;حول</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="150"/>
       <source>Open donations website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="143"/>
       <source>&amp;Donate</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="163"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
       <source>Open help and support website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="156"/>
       <source>&amp;Support</source>
       <translation>&amp;الدعم</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="176"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
       <source>Open issues and bug-tracking website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="169"/>
       <source>&amp;Known issues</source>
       <translation>&amp;مشاكل معروفة</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="189"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
       <source>Open release notes website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="192"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="182"/>
       <source>&amp;Release notes</source>
       <translation>&amp;ملاحظات الإصدار</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="216"/>
+      <location filename="../src/modules/welcome/WelcomePage.cpp" line="212"/>
       <source>%1 support</source>
       <translation>%1  الدعم</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="319"/>
       <source>About %1 setup</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="320"/>
       <source>About %1 installer</source>
       <translation>حول 1% المثبت</translation>
     </message>
@@ -4174,19 +4169,16 @@ Output:
     </message>
   </context>
   <context>
-    <name>about</name>
+    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/modules/welcomeq/about.qml" line="79"/>
-      <source>Back</source>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+      <source>About</source>
       <translation type="unfinished"/>
     </message>
-  </context>
-  <context>
-    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/calamares/calamares-sidebar.qml" line="79"/>
-      <source>Show debug information</source>
-      <translation>أظهر معلومات التّنقيح</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+      <source>Debug</source>
+      <translation>التدقيق</translation>
     </message>
   </context>
   <context>
@@ -4523,26 +4515,21 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcomeq/welcomeq.qml" line="66"/>
-      <source>About</source>
-      <translation type="unfinished"/>
-    </message>
-    <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="80"/>
       <source>Support</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="91"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="77"/>
       <source>Known issues</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="102"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="88"/>
       <source>Release notes</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="114"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="100"/>
       <source>Donate</source>
       <translation type="unfinished"/>
     </message>
diff --git a/lang/calamares_as.ts b/lang/calamares_as.ts
index da7b42ec03f3e9437b2f8cf54418d7518b8f8fb9..522894af46c2341e38c522887724baeca2eb8190 100644
--- a/lang/calamares_as.ts
+++ b/lang/calamares_as.ts
@@ -156,7 +156,7 @@
       <translation>ৱিজেত্ ত্ৰি</translation>
     </message>
     <message>
-      <location filename="../src/calamares/DebugWindow.cpp" line="239"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="244"/>
       <source>Debug information</source>
       <translation>ডিবাগ তথ্য</translation>
     </message>
@@ -503,12 +503,12 @@ The installer will quit and all changes will be lost.</source>
   <context>
     <name>CalamaresWindow</name>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="369"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
       <source>%1 Setup Program</source>
       <translation>%1 চেত্ আপ প্ৰোগ্ৰেম</translation>
     </message>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="370"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
       <source>%1 Installer</source>
       <translation>%1 ইনস্তলাৰ</translation>
     </message>
@@ -1453,7 +1453,7 @@ The installer will quit and all changes will be lost.</source>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="260"/>
-      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphraseor delete and create a new encrypted partition.</source>
+      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphrase or delete and create a new encrypted partition.</source>
       <translation type="unfinished"/>
     </message>
   </context>
@@ -4016,61 +4016,56 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.ui" line="140"/>
-      <source>&amp;About</source>
-      <translation>সম্পর্কে (&amp;A)</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="150"/>
       <source>Open donations website</source>
       <translation>দান কৰা ৱেবচাইট খোলক</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="143"/>
       <source>&amp;Donate</source>
       <translation>দান কৰক (&amp;D)</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="163"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
       <source>Open help and support website</source>
       <translation>সহায়ক ৱেবচাইট খোলক</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="156"/>
       <source>&amp;Support</source>
       <translation>সহায় (&amp;S)</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="176"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
       <source>Open issues and bug-tracking website</source>
       <translation>সমস্যা আৰু ক্ৰুটি অনুসৰণৰ ৱেবচাইট খোলক</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="169"/>
       <source>&amp;Known issues</source>
       <translation>জ্ঞাত সমস্যা (&amp;K)</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="189"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
       <source>Open release notes website</source>
       <translation>মুক্তি টোকাৰ ৱেবচাইট খোলক</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="192"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="182"/>
       <source>&amp;Release notes</source>
       <translation>মুক্তি টোকা (&amp;R)</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="216"/>
+      <location filename="../src/modules/welcome/WelcomePage.cpp" line="212"/>
       <source>%1 support</source>
       <translation>%1 সহায়</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="319"/>
       <source>About %1 setup</source>
       <translation>%1 চেত্ আপ প্ৰগ্ৰামৰ বিষয়ে</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="320"/>
       <source>About %1 installer</source>
       <translation>%1 ইনস্তলাৰৰ বিষয়ে</translation>
     </message>
@@ -4136,19 +4131,16 @@ Output:
     </message>
   </context>
   <context>
-    <name>about</name>
+    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/modules/welcomeq/about.qml" line="79"/>
-      <source>Back</source>
-      <translation>পাছলৈ</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+      <source>About</source>
+      <translation>সম্পর্কে</translation>
     </message>
-  </context>
-  <context>
-    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/calamares/calamares-sidebar.qml" line="79"/>
-      <source>Show debug information</source>
-      <translation>দিবাগ তথ্য দেখাওক</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+      <source>Debug</source>
+      <translation type="unfinished"/>
     </message>
   </context>
   <context>
@@ -4489,26 +4481,21 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcomeq/welcomeq.qml" line="66"/>
-      <source>About</source>
-      <translation>সম্পর্কে</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="80"/>
       <source>Support</source>
       <translation>সহায়</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="91"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="77"/>
       <source>Known issues</source>
       <translation>জ্ঞাত সমস্যা</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="102"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="88"/>
       <source>Release notes</source>
       <translation>মুক্তি টোকা </translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="114"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="100"/>
       <source>Donate</source>
       <translation>দান কৰক </translation>
     </message>
diff --git a/lang/calamares_ast.ts b/lang/calamares_ast.ts
index 1a510b3f5ebe9fbb0461339a775b7b4d8557b05e..86ced11f3992e8f136608723ed2e3572a7694d2e 100644
--- a/lang/calamares_ast.ts
+++ b/lang/calamares_ast.ts
@@ -156,7 +156,7 @@
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/calamares/DebugWindow.cpp" line="239"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="244"/>
       <source>Debug information</source>
       <translation>Información de la depuración</translation>
     </message>
@@ -503,12 +503,12 @@ L'instalador va colar y van perdese tolos cambeos.</translation>
   <context>
     <name>CalamaresWindow</name>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="369"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
       <source>%1 Setup Program</source>
       <translation>Programa de configuración de %1</translation>
     </message>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="370"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
       <source>%1 Installer</source>
       <translation>Instalador de %1</translation>
     </message>
@@ -1453,7 +1453,7 @@ L'instalador va colar y van perdese tolos cambeos.</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="260"/>
-      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphraseor delete and create a new encrypted partition.</source>
+      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphrase or delete and create a new encrypted partition.</source>
       <translation type="unfinished"/>
     </message>
   </context>
@@ -4016,61 +4016,56 @@ Salida:
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.ui" line="140"/>
-      <source>&amp;About</source>
-      <translation>&amp;Tocante a</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="150"/>
       <source>Open donations website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="143"/>
       <source>&amp;Donate</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="163"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
       <source>Open help and support website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="156"/>
       <source>&amp;Support</source>
       <translation>&amp;Sofitu</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="176"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
       <source>Open issues and bug-tracking website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="169"/>
       <source>&amp;Known issues</source>
       <translation>&amp;Problemes conocíos</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="189"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
       <source>Open release notes website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="192"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="182"/>
       <source>&amp;Release notes</source>
       <translation>Notes de &amp;llanzamientu</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="216"/>
+      <location filename="../src/modules/welcome/WelcomePage.cpp" line="212"/>
       <source>%1 support</source>
       <translation>Sofitu de %1</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="319"/>
       <source>About %1 setup</source>
       <translation>Tocante a la configuración de %1</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="320"/>
       <source>About %1 installer</source>
       <translation>Tocante al instalador de %1</translation>
     </message>
@@ -4136,19 +4131,16 @@ Salida:
     </message>
   </context>
   <context>
-    <name>about</name>
+    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/modules/welcomeq/about.qml" line="79"/>
-      <source>Back</source>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+      <source>About</source>
       <translation type="unfinished"/>
     </message>
-  </context>
-  <context>
-    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/calamares/calamares-sidebar.qml" line="79"/>
-      <source>Show debug information</source>
-      <translation>Amosar la depuración</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+      <source>Debug</source>
+      <translation type="unfinished"/>
     </message>
   </context>
   <context>
@@ -4485,26 +4477,21 @@ Salida:
     </message>
     <message>
       <location filename="../src/modules/welcomeq/welcomeq.qml" line="66"/>
-      <source>About</source>
-      <translation type="unfinished"/>
-    </message>
-    <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="80"/>
       <source>Support</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="91"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="77"/>
       <source>Known issues</source>
       <translation>Problemes conocíos</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="102"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="88"/>
       <source>Release notes</source>
       <translation>Notes del llanzamientu</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="114"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="100"/>
       <source>Donate</source>
       <translation type="unfinished"/>
     </message>
diff --git a/lang/calamares_az.ts b/lang/calamares_az.ts
index 3954fdcef0aec6ac79ca72ae41a006f163536475..45e5d6c9050fdf088875d84b4916b2538433105f 100644
--- a/lang/calamares_az.ts
+++ b/lang/calamares_az.ts
@@ -6,18 +6,18 @@
     <message>
       <location filename="../src/libcalamares/CalamaresAbout.cpp" line="17"/>
       <source>&lt;h1&gt;%1&lt;/h1&gt;&lt;br/&gt;&lt;strong&gt;%2&lt;br/&gt; for %3&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;</source>
-      <translation type="unfinished"/>
+      <translation>%3 &lt;strong&gt;&lt;br/&gt;&lt;br/&gt; üçün &lt;h1&gt;%1&lt;/h1&gt; &lt;/strong&gt;%2&lt;br/&gt;</translation>
     </message>
     <message>
       <location filename="../src/libcalamares/CalamaresAbout.cpp" line="20"/>
       <source>Thanks to &lt;a href="https://calamares.io/team/"&gt;the Calamares team&lt;/a&gt; and the &lt;a href="https://www.transifex.com/calamares/calamares/"&gt;Calamares translators team&lt;/a&gt;.&lt;br/&gt;&lt;br/&gt;&lt;a href="https://calamares.io/"&gt;Calamares&lt;/a&gt; development is sponsored by &lt;br/&gt;&lt;a href="http://www.blue-systems.com/"&gt;Blue Systems&lt;/a&gt; - Liberating Software.</source>
-      <translation type="unfinished"/>
+      <translation>&lt;a href="https://calamares.io/team/"&gt; Calamares komandası&lt;/a&gt;na və &lt;a href="https://www.transifex.com/calamares/calamares/"&gt;Calamares tərcüməçilər komandası&lt;/a&gt;na təşəkkürlər. &lt;br/&gt;&lt;br/&gt;&lt;a href="https://calamares.io/"&gt;Calamres-in inkişafı&lt;br/&gt; &lt;a href="http://www.blue-systems.com/"&gt;Blue Sytems&lt;/a&gt; Azad proqram təminatı tərəfindən dəstəklənir.</translation>
     </message>
     <message>
       <location filename="../src/libcalamares/CalamaresAbout.cpp" line="38"/>
       <source>Copyright %1-%2 %3 &amp;lt;%4&amp;gt;&lt;br/&gt;</source>
       <extracomment>Copyright year-year Name &lt;email-address&gt;</extracomment>
-      <translation type="unfinished"/>
+      <translation>Müəllif  Hüquqları %1-%2 %3 &amp;lt;%4&amp;gt; &lt;br/&gt;</translation>
     </message>
   </context>
   <context>
@@ -156,7 +156,7 @@
       <translation>Vidjetlər ağacı</translation>
     </message>
     <message>
-      <location filename="../src/calamares/DebugWindow.cpp" line="239"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="244"/>
       <source>Debug information</source>
       <translation>Sazlama məlumatları</translation>
     </message>
@@ -292,7 +292,7 @@
       <source>(%n second(s))</source>
       <translation>
         <numerusform>(%n saniyə(lər))</numerusform>
-        <numerusform>(%n saniyə(lər))</numerusform>
+        <numerusform>(%n saniyə)</numerusform>
       </translation>
     </message>
     <message>
@@ -507,12 +507,12 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.</transl
   <context>
     <name>CalamaresWindow</name>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="369"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
       <source>%1 Setup Program</source>
       <translation>%1 Quraşdırıcı proqram</translation>
     </message>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="370"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
       <source>%1 Installer</source>
       <translation>%1 Quraşdırıcı</translation>
     </message>
@@ -1453,12 +1453,12 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.</transl
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="259"/>
       <source>Passphrase for existing partition</source>
-      <translation type="unfinished"/>
+      <translation>Mövcud bölmə üçün şifrəli ifadə</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="260"/>
-      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphraseor delete and create a new encrypted partition.</source>
-      <translation type="unfinished"/>
+      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphrase or delete and create a new encrypted partition.</source>
+      <translation>%1 bölmənin şifrəsi verilmiş şifrəli ifadə ilə açıla bilmədi. &lt;br/&gt;&lt;br/&gt;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. </translation>
     </message>
   </context>
   <context>
@@ -4023,61 +4023,56 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.ui" line="140"/>
-      <source>&amp;About</source>
-      <translation>H&amp;aqqında</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="150"/>
       <source>Open donations website</source>
       <translation>Maddi dəstək üçün veb səhifəsi</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="143"/>
       <source>&amp;Donate</source>
       <translation>Ma&amp;ddi dəstək</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="163"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
       <source>Open help and support website</source>
       <translation>Kömək və dəstək veb səhifəsi</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="156"/>
       <source>&amp;Support</source>
       <translation>Də&amp;stək</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="176"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
       <source>Open issues and bug-tracking website</source>
       <translation>Problemlər və xəta izləmə veb səhifəsi</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="169"/>
       <source>&amp;Known issues</source>
       <translation>&amp;Məlum problemlər</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="189"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
       <source>Open release notes website</source>
       <translation>Buraxılış haqqında qeydlər veb səhifəsi</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="192"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="182"/>
       <source>&amp;Release notes</source>
       <translation>Bu&amp;raxılış haqqında qeydlər</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="216"/>
+      <location filename="../src/modules/welcome/WelcomePage.cpp" line="212"/>
       <source>%1 support</source>
       <translation>%1 dəstəyi</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="319"/>
       <source>About %1 setup</source>
       <translation>%1 quraşdırması haqqında</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="320"/>
       <source>About %1 installer</source>
       <translation>%1 quraşdırıcısı haqqında</translation>
     </message>
@@ -4143,19 +4138,16 @@ Output:
     </message>
   </context>
   <context>
-    <name>about</name>
+    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/modules/welcomeq/about.qml" line="79"/>
-      <source>Back</source>
-      <translation>Geriyə</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+      <source>About</source>
+      <translation>Haqqında</translation>
     </message>
-  </context>
-  <context>
-    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/calamares/calamares-sidebar.qml" line="79"/>
-      <source>Show debug information</source>
-      <translation>Sazlama məlumatlarını göstərmək</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+      <source>Debug</source>
+      <translation>Sazlama</translation>
     </message>
   </context>
   <context>
@@ -4520,26 +4512,21 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcomeq/welcomeq.qml" line="66"/>
-      <source>About</source>
-      <translation>Haqqında</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="80"/>
       <source>Support</source>
       <translation>Dəstək</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="91"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="77"/>
       <source>Known issues</source>
       <translation>Məlum problemlər</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="102"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="88"/>
       <source>Release notes</source>
       <translation>Buraxılış qeydləri</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="114"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="100"/>
       <source>Donate</source>
       <translation>Maddi dəstək</translation>
     </message>
diff --git a/lang/calamares_az_AZ.ts b/lang/calamares_az_AZ.ts
index 98b3dbb2cbcb93e5890432abca98dfb4996e61fd..7949ea4a8a6de82ace54e8c8894da890a6530f33 100644
--- a/lang/calamares_az_AZ.ts
+++ b/lang/calamares_az_AZ.ts
@@ -6,18 +6,18 @@
     <message>
       <location filename="../src/libcalamares/CalamaresAbout.cpp" line="17"/>
       <source>&lt;h1&gt;%1&lt;/h1&gt;&lt;br/&gt;&lt;strong&gt;%2&lt;br/&gt; for %3&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;</source>
-      <translation type="unfinished"/>
+      <translation>%3 &lt;strong&gt;&lt;br/&gt;&lt;br/&gt; üçün &lt;h1&gt;%1&lt;/h1&gt; &lt;/strong&gt;%2&lt;br/&gt;</translation>
     </message>
     <message>
       <location filename="../src/libcalamares/CalamaresAbout.cpp" line="20"/>
       <source>Thanks to &lt;a href="https://calamares.io/team/"&gt;the Calamares team&lt;/a&gt; and the &lt;a href="https://www.transifex.com/calamares/calamares/"&gt;Calamares translators team&lt;/a&gt;.&lt;br/&gt;&lt;br/&gt;&lt;a href="https://calamares.io/"&gt;Calamares&lt;/a&gt; development is sponsored by &lt;br/&gt;&lt;a href="http://www.blue-systems.com/"&gt;Blue Systems&lt;/a&gt; - Liberating Software.</source>
-      <translation type="unfinished"/>
+      <translation>&lt;a href="https://calamares.io/team/"&gt; Calamares komandası&lt;/a&gt;na və &lt;a href="https://www.transifex.com/calamares/calamares/"&gt;Calamares tərcüməçilər komandası&lt;/a&gt;na təşəkkürlər. &lt;br/&gt;&lt;br/&gt;&lt;a href="https://calamares.io/"&gt;Calamres-in inkişafı&lt;br/&gt; &lt;a href="http://www.blue-systems.com/"&gt;Blue Sytems&lt;/a&gt; Azad proqram təminatı tərəfindən dəstəklənir.</translation>
     </message>
     <message>
       <location filename="../src/libcalamares/CalamaresAbout.cpp" line="38"/>
       <source>Copyright %1-%2 %3 &amp;lt;%4&amp;gt;&lt;br/&gt;</source>
       <extracomment>Copyright year-year Name &lt;email-address&gt;</extracomment>
-      <translation type="unfinished"/>
+      <translation>Müəllif  Hüquqları %1-%2 %3 &amp;lt;%4&amp;gt; &lt;br/&gt;</translation>
     </message>
   </context>
   <context>
@@ -51,7 +51,7 @@
     <message>
       <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="59"/>
       <source>Master Boot Record of %1</source>
-      <translation>%1 ƏsasÖnyükləyici Qeydi</translation>
+      <translation>%1 Əsas önyükləyici qeydi</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="92"/>
@@ -156,7 +156,7 @@
       <translation>Vidjetlər ağacı</translation>
     </message>
     <message>
-      <location filename="../src/calamares/DebugWindow.cpp" line="239"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="244"/>
       <source>Debug information</source>
       <translation>Sazlama məlumatları</translation>
     </message>
@@ -292,7 +292,7 @@
       <source>(%n second(s))</source>
       <translation>
         <numerusform>(%n saniyə(lər))</numerusform>
-        <numerusform>(%n saniyə(lər))</numerusform>
+        <numerusform>(%n saniyə)</numerusform>
       </translation>
     </message>
     <message>
@@ -507,12 +507,12 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.</transl
   <context>
     <name>CalamaresWindow</name>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="369"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
       <source>%1 Setup Program</source>
       <translation>%1 Quraşdırıcı proqram</translation>
     </message>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="370"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
       <source>%1 Installer</source>
       <translation>%1 Quraşdırıcı</translation>
     </message>
@@ -1408,7 +1408,7 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.</transl
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="74"/>
       <source>Format</source>
-      <translation>Formatlamaq</translation>
+      <translation>Formatlansın</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="93"/>
@@ -1453,12 +1453,12 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.</transl
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="259"/>
       <source>Passphrase for existing partition</source>
-      <translation type="unfinished"/>
+      <translation>Mövcud bölmə üçün şifrəli ifadə</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="260"/>
-      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphraseor delete and create a new encrypted partition.</source>
-      <translation type="unfinished"/>
+      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphrase or delete and create a new encrypted partition.</source>
+      <translation>%1 bölmənin şifrəsi verilmiş şifrəli ifadə ilə açıla bilmədi. &lt;br/&gt;&lt;br/&gt;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. </translation>
     </message>
   </context>
   <context>
@@ -4023,61 +4023,56 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.ui" line="140"/>
-      <source>&amp;About</source>
-      <translation>H&amp;aqqında</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="150"/>
       <source>Open donations website</source>
       <translation>Maddi dəstək üçün veb səhifəsi</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="143"/>
       <source>&amp;Donate</source>
       <translation>Ma&amp;ddi dəstək</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="163"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
       <source>Open help and support website</source>
       <translation>Kömək və dəstək veb səhifəsi</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="156"/>
       <source>&amp;Support</source>
       <translation>Də&amp;stək</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="176"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
       <source>Open issues and bug-tracking website</source>
       <translation>Problemlər və xəta izləmə veb səhifəsi</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="169"/>
       <source>&amp;Known issues</source>
       <translation>&amp;Məlum problemlər</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="189"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
       <source>Open release notes website</source>
       <translation>Buraxılış haqqında qeydlər veb səhifəsi</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="192"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="182"/>
       <source>&amp;Release notes</source>
       <translation>Bu&amp;raxılış haqqında qeydlər</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="216"/>
+      <location filename="../src/modules/welcome/WelcomePage.cpp" line="212"/>
       <source>%1 support</source>
       <translation>%1 dəstəyi</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="319"/>
       <source>About %1 setup</source>
       <translation>%1 quraşdırması haqqında</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="320"/>
       <source>About %1 installer</source>
       <translation>%1 quraşdırıcısı haqqında</translation>
     </message>
@@ -4143,19 +4138,16 @@ Output:
     </message>
   </context>
   <context>
-    <name>about</name>
+    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/modules/welcomeq/about.qml" line="79"/>
-      <source>Back</source>
-      <translation>Geriyə</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+      <source>About</source>
+      <translation>Haqqında</translation>
     </message>
-  </context>
-  <context>
-    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/calamares/calamares-sidebar.qml" line="79"/>
-      <source>Show debug information</source>
-      <translation>Sazlama məlumatlarını göstərmək</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+      <source>Debug</source>
+      <translation>Sazlama</translation>
     </message>
   </context>
   <context>
@@ -4520,26 +4512,21 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcomeq/welcomeq.qml" line="66"/>
-      <source>About</source>
-      <translation>Haqqında</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="80"/>
       <source>Support</source>
       <translation>Dəstək</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="91"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="77"/>
       <source>Known issues</source>
       <translation>Məlum problemlər</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="102"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="88"/>
       <source>Release notes</source>
       <translation>Buraxılış qeydləri</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="114"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="100"/>
       <source>Donate</source>
       <translation>Maddi dəstək</translation>
     </message>
diff --git a/lang/calamares_be.ts b/lang/calamares_be.ts
index ceade48f335f4866bb1fcd7a73ac72d9c29e920d..6eaa90eca8d1c062b8ebfe284b4c977c6199aae7 100644
--- a/lang/calamares_be.ts
+++ b/lang/calamares_be.ts
@@ -156,7 +156,7 @@
       <translation>Дрэва віджэтаў</translation>
     </message>
     <message>
-      <location filename="../src/calamares/DebugWindow.cpp" line="239"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="244"/>
       <source>Debug information</source>
       <translation>Адладачная інфармацыя</translation>
     </message>
@@ -505,12 +505,12 @@ The installer will quit and all changes will be lost.</source>
   <context>
     <name>CalamaresWindow</name>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="369"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
       <source>%1 Setup Program</source>
       <translation>Праграма ўсталёўкі %1</translation>
     </message>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="370"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
       <source>%1 Installer</source>
       <translation>Праграма ўсталёўкі %1</translation>
     </message>
@@ -1455,7 +1455,7 @@ The installer will quit and all changes will be lost.</source>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="260"/>
-      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphraseor delete and create a new encrypted partition.</source>
+      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphrase or delete and create a new encrypted partition.</source>
       <translation type="unfinished"/>
     </message>
   </context>
@@ -4038,61 +4038,56 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.ui" line="140"/>
-      <source>&amp;About</source>
-      <translation>&amp;Пра праграму</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="150"/>
       <source>Open donations website</source>
       <translation>Адкрыць старонку ахвяраванняў</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="143"/>
       <source>&amp;Donate</source>
       <translation>&amp;Ахвяраваць</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="163"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
       <source>Open help and support website</source>
       <translation>Адкрыць старонку з даведкай</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="156"/>
       <source>&amp;Support</source>
       <translation>&amp;Падтрымка</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="176"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
       <source>Open issues and bug-tracking website</source>
       <translation>Адкрыць старонку трэкера хібаў</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="169"/>
       <source>&amp;Known issues</source>
       <translation>&amp;Вядомыя праблемы</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="189"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
       <source>Open release notes website</source>
       <translation>Адкрыць старонку нататак да выпуску</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="192"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="182"/>
       <source>&amp;Release notes</source>
       <translation>&amp;Нататкі да выпуску</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="216"/>
+      <location filename="../src/modules/welcome/WelcomePage.cpp" line="212"/>
       <source>%1 support</source>
       <translation>падтрымка %1</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="319"/>
       <source>About %1 setup</source>
       <translation>Пра ўсталёўку %1</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="320"/>
       <source>About %1 installer</source>
       <translation>Пра %1</translation>
     </message>
@@ -4158,19 +4153,16 @@ Output:
     </message>
   </context>
   <context>
-    <name>about</name>
+    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/modules/welcomeq/about.qml" line="79"/>
-      <source>Back</source>
-      <translation>Назад</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+      <source>About</source>
+      <translation>Пра праграму</translation>
     </message>
-  </context>
-  <context>
-    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/calamares/calamares-sidebar.qml" line="79"/>
-      <source>Show debug information</source>
-      <translation>Паказаць адладачную інфармацыю</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+      <source>Debug</source>
+      <translation type="unfinished"/>
     </message>
   </context>
   <context>
@@ -4532,26 +4524,21 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcomeq/welcomeq.qml" line="66"/>
-      <source>About</source>
-      <translation>Пра праграму</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="80"/>
       <source>Support</source>
       <translation>Падтрымка</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="91"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="77"/>
       <source>Known issues</source>
       <translation>Вядомыя праблемы</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="102"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="88"/>
       <source>Release notes</source>
       <translation>Нататкі да выпуску</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="114"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="100"/>
       <source>Donate</source>
       <translation>Ахвяраваць</translation>
     </message>
diff --git a/lang/calamares_bg.ts b/lang/calamares_bg.ts
index 56dd18d6e539215b658c4186b91ad8afe5a99212..a3a4804c5f6f83f0313d54aeb41de5136f8a3962 100644
--- a/lang/calamares_bg.ts
+++ b/lang/calamares_bg.ts
@@ -156,7 +156,7 @@
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/calamares/DebugWindow.cpp" line="239"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="244"/>
       <source>Debug information</source>
       <translation>Информация за отстраняване на грешки</translation>
     </message>
@@ -502,12 +502,12 @@ The installer will quit and all changes will be lost.</source>
   <context>
     <name>CalamaresWindow</name>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="369"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
       <source>%1 Setup Program</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="370"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
       <source>%1 Installer</source>
       <translation>%1 Инсталатор</translation>
     </message>
@@ -1453,7 +1453,7 @@ The installer will quit and all changes will be lost.</source>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="260"/>
-      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphraseor delete and create a new encrypted partition.</source>
+      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphrase or delete and create a new encrypted partition.</source>
       <translation type="unfinished"/>
     </message>
   </context>
@@ -4012,61 +4012,56 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.ui" line="140"/>
-      <source>&amp;About</source>
-      <translation>&amp;Относно</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="150"/>
       <source>Open donations website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="143"/>
       <source>&amp;Donate</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="163"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
       <source>Open help and support website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="156"/>
       <source>&amp;Support</source>
       <translation>&amp;Поддръжка</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="176"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
       <source>Open issues and bug-tracking website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="169"/>
       <source>&amp;Known issues</source>
       <translation>&amp;Съществуващи проблеми</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="189"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
       <source>Open release notes website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="192"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="182"/>
       <source>&amp;Release notes</source>
       <translation>&amp;Бележки по изданието</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="216"/>
+      <location filename="../src/modules/welcome/WelcomePage.cpp" line="212"/>
       <source>%1 support</source>
       <translation>%1 поддръжка</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="319"/>
       <source>About %1 setup</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="320"/>
       <source>About %1 installer</source>
       <translation>Относно инсталатор %1</translation>
     </message>
@@ -4132,19 +4127,16 @@ Output:
     </message>
   </context>
   <context>
-    <name>about</name>
+    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/modules/welcomeq/about.qml" line="79"/>
-      <source>Back</source>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+      <source>About</source>
       <translation type="unfinished"/>
     </message>
-  </context>
-  <context>
-    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/calamares/calamares-sidebar.qml" line="79"/>
-      <source>Show debug information</source>
-      <translation>Покажи информация за отстраняване на грешки</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+      <source>Debug</source>
+      <translation>Отстраняване на грешки</translation>
     </message>
   </context>
   <context>
@@ -4481,26 +4473,21 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcomeq/welcomeq.qml" line="66"/>
-      <source>About</source>
-      <translation type="unfinished"/>
-    </message>
-    <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="80"/>
       <source>Support</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="91"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="77"/>
       <source>Known issues</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="102"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="88"/>
       <source>Release notes</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="114"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="100"/>
       <source>Donate</source>
       <translation type="unfinished"/>
     </message>
diff --git a/lang/calamares_bn.ts b/lang/calamares_bn.ts
index 0e4db586944fe47fb3fbf8d9434344eb04cc139e..9f08c3813d013f6b387c301a2cfdef57084825ac 100644
--- a/lang/calamares_bn.ts
+++ b/lang/calamares_bn.ts
@@ -156,7 +156,7 @@
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/calamares/DebugWindow.cpp" line="239"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="244"/>
       <source>Debug information</source>
       <translation>তথ্য ডিবাগ করুন</translation>
     </message>
@@ -502,12 +502,12 @@ The installer will quit and all changes will be lost.</source>
   <context>
     <name>CalamaresWindow</name>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="369"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
       <source>%1 Setup Program</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="370"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
       <source>%1 Installer</source>
       <translation>%1 ইনস্টল</translation>
     </message>
@@ -1452,7 +1452,7 @@ The installer will quit and all changes will be lost.</source>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="260"/>
-      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphraseor delete and create a new encrypted partition.</source>
+      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphrase or delete and create a new encrypted partition.</source>
       <translation type="unfinished"/>
     </message>
   </context>
@@ -4009,61 +4009,56 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.ui" line="140"/>
-      <source>&amp;About</source>
-      <translation>এবংসম্পর্কে</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="150"/>
       <source>Open donations website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="143"/>
       <source>&amp;Donate</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="163"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
       <source>Open help and support website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="156"/>
       <source>&amp;Support</source>
       <translation>এবংসহায়তা</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="176"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
       <source>Open issues and bug-tracking website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="169"/>
       <source>&amp;Known issues</source>
       <translation>এবংপরিচিত বিষয়গুলো</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="189"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
       <source>Open release notes website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="192"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="182"/>
       <source>&amp;Release notes</source>
       <translation>এবংনোট প্রকাশ করুন</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="216"/>
+      <location filename="../src/modules/welcome/WelcomePage.cpp" line="212"/>
       <source>%1 support</source>
       <translation>%1 সহায়তা</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="319"/>
       <source>About %1 setup</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="320"/>
       <source>About %1 installer</source>
       <translation>%1 ইনস্টলার সম্পর্কে</translation>
     </message>
@@ -4129,19 +4124,16 @@ Output:
     </message>
   </context>
   <context>
-    <name>about</name>
+    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/modules/welcomeq/about.qml" line="79"/>
-      <source>Back</source>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+      <source>About</source>
       <translation type="unfinished"/>
     </message>
-  </context>
-  <context>
-    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/calamares/calamares-sidebar.qml" line="79"/>
-      <source>Show debug information</source>
-      <translation>ডিবাগ তথ্য দেখান</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+      <source>Debug</source>
+      <translation type="unfinished"/>
     </message>
   </context>
   <context>
@@ -4478,26 +4470,21 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcomeq/welcomeq.qml" line="66"/>
-      <source>About</source>
-      <translation type="unfinished"/>
-    </message>
-    <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="80"/>
       <source>Support</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="91"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="77"/>
       <source>Known issues</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="102"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="88"/>
       <source>Release notes</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="114"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="100"/>
       <source>Donate</source>
       <translation type="unfinished"/>
     </message>
diff --git a/lang/calamares_ca.ts b/lang/calamares_ca.ts
index a6597868aebfc68e31d0fb0caf5fe0a20df4d0e0..a569aee9084fdb8568d17cfebc3fd0632736ddf8 100644
--- a/lang/calamares_ca.ts
+++ b/lang/calamares_ca.ts
@@ -156,7 +156,7 @@
       <translation>Arbre de ginys</translation>
     </message>
     <message>
-      <location filename="../src/calamares/DebugWindow.cpp" line="239"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="244"/>
       <source>Debug information</source>
       <translation>Informació de depuració</translation>
     </message>
@@ -507,12 +507,12 @@ L'instal·lador es tancarà i tots els canvis es perdran.</translation>
   <context>
     <name>CalamaresWindow</name>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="369"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
       <source>%1 Setup Program</source>
       <translation>Programa de configuració %1</translation>
     </message>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="370"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
       <source>%1 Installer</source>
       <translation>Instal·lador de %1</translation>
     </message>
@@ -1457,8 +1457,8 @@ L'instal·lador es tancarà i tots els canvis es perdran.</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="260"/>
-      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphraseor delete and create a new encrypted partition.</source>
-      <translation>La partició %1 no s'ha pogut desencriptar amb la frase de contrasenya proporcionada. &lt;br/&gt;&lt;br/&gt; Torneu a editar la partició i proporcioneu la contrasenya correcta o suprimiu-la i creeu una partició encriptada nova.</translation>
+      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphrase or delete and create a new encrypted partition.</source>
+      <translation>La partició %1 no s'ha pogut desencriptar amb la contrasenya proporcionada. &lt;br/&gt;&lt;br/&gt; Torneu a editar la partició i proporcioneu la contrasenya correcta, o suprimiu-la i creeu una partició encriptada nova.</translation>
     </message>
   </context>
   <context>
@@ -4022,61 +4022,56 @@ La configuració pot continuar, però algunes característiques podrien estar in
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.ui" line="140"/>
-      <source>&amp;About</source>
-      <translation>&amp;Quant a</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="150"/>
       <source>Open donations website</source>
       <translation>Obre el lloc web per a les donacions</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="143"/>
       <source>&amp;Donate</source>
       <translation>Feu una &amp;donació</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="163"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
       <source>Open help and support website</source>
       <translation>Obre el lloc web per a l'ajuda i el suport</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="156"/>
       <source>&amp;Support</source>
       <translation>&amp;Suport</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="176"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
       <source>Open issues and bug-tracking website</source>
       <translation>Obre el lloc web de problemes i de seguiment d'errors</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="169"/>
       <source>&amp;Known issues</source>
       <translation>&amp;Problemes coneguts</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="189"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
       <source>Open release notes website</source>
       <translation>Obre el lloc web de les notes de la versió</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="192"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="182"/>
       <source>&amp;Release notes</source>
       <translation>&amp;Notes de la versió</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="216"/>
+      <location filename="../src/modules/welcome/WelcomePage.cpp" line="212"/>
       <source>%1 support</source>
       <translation>%1 suport</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="319"/>
       <source>About %1 setup</source>
       <translation>Quant a la configuració de %1</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="320"/>
       <source>About %1 installer</source>
       <translation>Quant a l'instal·lador %1</translation>
     </message>
@@ -4142,19 +4137,16 @@ La configuració pot continuar, però algunes característiques podrien estar in
     </message>
   </context>
   <context>
-    <name>about</name>
+    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/modules/welcomeq/about.qml" line="79"/>
-      <source>Back</source>
-      <translation>Enrere</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+      <source>About</source>
+      <translation>Quant a</translation>
     </message>
-  </context>
-  <context>
-    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/calamares/calamares-sidebar.qml" line="79"/>
-      <source>Show debug information</source>
-      <translation>Informació de depuració</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+      <source>Debug</source>
+      <translation>Depuració</translation>
     </message>
   </context>
   <context>
@@ -4519,26 +4511,21 @@ Opció predeterminada.</translation>
     </message>
     <message>
       <location filename="../src/modules/welcomeq/welcomeq.qml" line="66"/>
-      <source>About</source>
-      <translation>Quant a</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="80"/>
       <source>Support</source>
       <translation>Suport</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="91"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="77"/>
       <source>Known issues</source>
       <translation>Problemes coneguts</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="102"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="88"/>
       <source>Release notes</source>
       <translation>Notes de la versió</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="114"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="100"/>
       <source>Donate</source>
       <translation>Feu una donació</translation>
     </message>
diff --git a/lang/calamares_ca@valencia.ts b/lang/calamares_ca@valencia.ts
index cfa1bc7e1b0097a9e01af915300b73ba0c92de87..890995de7a774782be80d67756fc8c5753fc2cb9 100644
--- a/lang/calamares_ca@valencia.ts
+++ b/lang/calamares_ca@valencia.ts
@@ -156,7 +156,7 @@
       <translation>Arbre d'elements</translation>
     </message>
     <message>
-      <location filename="../src/calamares/DebugWindow.cpp" line="239"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="244"/>
       <source>Debug information</source>
       <translation>Informació de depuració</translation>
     </message>
@@ -503,12 +503,12 @@ L'instal·lador es tancarà i tots els canvis es perdran.</translation>
   <context>
     <name>CalamaresWindow</name>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="369"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
       <source>%1 Setup Program</source>
       <translation>Programa de configuració %1</translation>
     </message>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="370"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
       <source>%1 Installer</source>
       <translation>Instal·lador de %1</translation>
     </message>
@@ -1453,7 +1453,7 @@ L'instal·lador es tancarà i tots els canvis es perdran.</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="260"/>
-      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphraseor delete and create a new encrypted partition.</source>
+      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphrase or delete and create a new encrypted partition.</source>
       <translation type="unfinished"/>
     </message>
   </context>
@@ -4018,61 +4018,56 @@ La configuració pot continuar, però és possible que algunes característiques
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.ui" line="140"/>
-      <source>&amp;About</source>
-      <translation>&amp;Quant a</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="150"/>
       <source>Open donations website</source>
       <translation>Obri el lloc web per als donatius</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="143"/>
       <source>&amp;Donate</source>
       <translation>Feu un &amp;donatiu</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="163"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
       <source>Open help and support website</source>
       <translation>Obri el lloc web per a l'ajuda i el suport</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="156"/>
       <source>&amp;Support</source>
       <translation>&amp;Suport</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="176"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
       <source>Open issues and bug-tracking website</source>
       <translation>Obri el lloc web de problemes i de seguiment d'errors</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="169"/>
       <source>&amp;Known issues</source>
       <translation>&amp;Incidències conegudes</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="189"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
       <source>Open release notes website</source>
       <translation>Obri el lloc web de les notes de la versió</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="192"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="182"/>
       <source>&amp;Release notes</source>
       <translation>&amp;Notes de la versió</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="216"/>
+      <location filename="../src/modules/welcome/WelcomePage.cpp" line="212"/>
       <source>%1 support</source>
       <translation>%1 soport</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="319"/>
       <source>About %1 setup</source>
       <translation>Quant a la configuració de %1</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="320"/>
       <source>About %1 installer</source>
       <translation>Sobre %1 instal·lador</translation>
     </message>
@@ -4138,19 +4133,16 @@ La configuració pot continuar, però és possible que algunes característiques
     </message>
   </context>
   <context>
-    <name>about</name>
+    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/modules/welcomeq/about.qml" line="79"/>
-      <source>Back</source>
-      <translation>Arrere</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+      <source>About</source>
+      <translation>Quant a</translation>
     </message>
-  </context>
-  <context>
-    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/calamares/calamares-sidebar.qml" line="79"/>
-      <source>Show debug information</source>
-      <translation>Mostra la informació de depuració</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+      <source>Debug</source>
+      <translation type="unfinished"/>
     </message>
   </context>
   <context>
@@ -4511,26 +4503,21 @@ La configuració pot continuar, però és possible que algunes característiques
     </message>
     <message>
       <location filename="../src/modules/welcomeq/welcomeq.qml" line="66"/>
-      <source>About</source>
-      <translation>Quant a</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="80"/>
       <source>Support</source>
       <translation>Suport</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="91"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="77"/>
       <source>Known issues</source>
       <translation>Incidències conegudes</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="102"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="88"/>
       <source>Release notes</source>
       <translation>Notes de la versió</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="114"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="100"/>
       <source>Donate</source>
       <translation>Feu un donatiu</translation>
     </message>
diff --git a/lang/calamares_cs_CZ.ts b/lang/calamares_cs_CZ.ts
index 3d0effe360c1b8f4eeb58e564e2a58d918c865d5..8e03b527ae7a7dec544fb06d185e4d94f57fba1d 100644
--- a/lang/calamares_cs_CZ.ts
+++ b/lang/calamares_cs_CZ.ts
@@ -156,7 +156,7 @@
       <translation>Strom ovládacích prvků</translation>
     </message>
     <message>
-      <location filename="../src/calamares/DebugWindow.cpp" line="239"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="244"/>
       <source>Debug information</source>
       <translation>Ladící informace</translation>
     </message>
@@ -511,12 +511,12 @@ Instalační program bude ukončen a všechny změny ztraceny.</translation>
   <context>
     <name>CalamaresWindow</name>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="369"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
       <source>%1 Setup Program</source>
       <translation>Instalátor %1</translation>
     </message>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="370"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
       <source>%1 Installer</source>
       <translation>Instalátor %1</translation>
     </message>
@@ -1461,7 +1461,7 @@ Instalační program bude ukončen a všechny změny ztraceny.</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="260"/>
-      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphraseor delete and create a new encrypted partition.</source>
+      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphrase or delete and create a new encrypted partition.</source>
       <translation type="unfinished"/>
     </message>
   </context>
@@ -4044,61 +4044,56 @@ Výstup:
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.ui" line="140"/>
-      <source>&amp;About</source>
-      <translation>&amp;O projektu</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="150"/>
       <source>Open donations website</source>
       <translation>Otevřít webovou stránku po poskytnutí daru</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="143"/>
       <source>&amp;Donate</source>
       <translation>&amp;Darovat</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="163"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
       <source>Open help and support website</source>
       <translation>Otevřít webovou stránku s nápovědou a podporou</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="156"/>
       <source>&amp;Support</source>
       <translation>&amp;Podpora</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="176"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
       <source>Open issues and bug-tracking website</source>
       <translation>Otevřít webovou stránku se správou hlášení problémů</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="169"/>
       <source>&amp;Known issues</source>
       <translation>&amp;Známé problémy</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="189"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
       <source>Open release notes website</source>
       <translation>Otevřít webovou stránku s poznámkami k vydání</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="192"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="182"/>
       <source>&amp;Release notes</source>
       <translation>&amp;Poznámky k vydání</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="216"/>
+      <location filename="../src/modules/welcome/WelcomePage.cpp" line="212"/>
       <source>%1 support</source>
       <translation>%1 podpora</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="319"/>
       <source>About %1 setup</source>
       <translation>O nastavování %1</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="320"/>
       <source>About %1 installer</source>
       <translation>O instalátoru %1.</translation>
     </message>
@@ -4164,19 +4159,16 @@ Výstup:
     </message>
   </context>
   <context>
-    <name>about</name>
+    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/modules/welcomeq/about.qml" line="79"/>
-      <source>Back</source>
-      <translation>Zpět</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+      <source>About</source>
+      <translation>O projektu</translation>
     </message>
-  </context>
-  <context>
-    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/calamares/calamares-sidebar.qml" line="79"/>
-      <source>Show debug information</source>
-      <translation>Zobrazit ladící informace</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+      <source>Debug</source>
+      <translation>Ladění</translation>
     </message>
   </context>
   <context>
@@ -4541,26 +4533,21 @@ Výstup:
     </message>
     <message>
       <location filename="../src/modules/welcomeq/welcomeq.qml" line="66"/>
-      <source>About</source>
-      <translation>O projektu</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="80"/>
       <source>Support</source>
       <translation>Podpora</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="91"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="77"/>
       <source>Known issues</source>
       <translation>Známé problémy</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="102"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="88"/>
       <source>Release notes</source>
       <translation>Poznámky k vydání</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="114"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="100"/>
       <source>Donate</source>
       <translation>Podpořit vývoj darem</translation>
     </message>
diff --git a/lang/calamares_da.ts b/lang/calamares_da.ts
index 3a893935b4124a8ef499e3e400f625f1a00f354b..926fca66f0e8d838d409003da637eaae23dc9731 100644
--- a/lang/calamares_da.ts
+++ b/lang/calamares_da.ts
@@ -156,7 +156,7 @@
       <translation>Widgettræ</translation>
     </message>
     <message>
-      <location filename="../src/calamares/DebugWindow.cpp" line="239"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="244"/>
       <source>Debug information</source>
       <translation>Fejlretningsinformation</translation>
     </message>
@@ -503,12 +503,12 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
   <context>
     <name>CalamaresWindow</name>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="369"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
       <source>%1 Setup Program</source>
       <translation>%1-opsætningsprogram</translation>
     </message>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="370"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
       <source>%1 Installer</source>
       <translation>%1-installationsprogram</translation>
     </message>
@@ -1453,7 +1453,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
     </message>
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="260"/>
-      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphraseor delete and create a new encrypted partition.</source>
+      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphrase or delete and create a new encrypted partition.</source>
       <translation type="unfinished"/>
     </message>
   </context>
@@ -4019,61 +4019,56 @@ setting
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.ui" line="140"/>
-      <source>&amp;About</source>
-      <translation>&amp;Om</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="150"/>
       <source>Open donations website</source>
       <translation>Åbn websted for donationer</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="143"/>
       <source>&amp;Donate</source>
       <translation>&amp;Donér</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="163"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
       <source>Open help and support website</source>
       <translation>Åbn websted for hjælp og support</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="156"/>
       <source>&amp;Support</source>
       <translation>&amp;Support</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="176"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
       <source>Open issues and bug-tracking website</source>
       <translation>Åbn websted for issues og bug-tracking</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="169"/>
       <source>&amp;Known issues</source>
       <translation>&amp;Kendte problemer</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="189"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
       <source>Open release notes website</source>
       <translation>Åbn websted med udgivelsesnoter</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="192"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="182"/>
       <source>&amp;Release notes</source>
       <translation>&amp;Udgivelsesnoter</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="216"/>
+      <location filename="../src/modules/welcome/WelcomePage.cpp" line="212"/>
       <source>%1 support</source>
       <translation>%1 support</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="319"/>
       <source>About %1 setup</source>
       <translation>Om %1-opsætningen</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="320"/>
       <source>About %1 installer</source>
       <translation>Om %1-installationsprogrammet</translation>
     </message>
@@ -4139,19 +4134,16 @@ setting
     </message>
   </context>
   <context>
-    <name>about</name>
+    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/modules/welcomeq/about.qml" line="79"/>
-      <source>Back</source>
-      <translation>Tilbage</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+      <source>About</source>
+      <translation>Om</translation>
     </message>
-  </context>
-  <context>
-    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/calamares/calamares-sidebar.qml" line="79"/>
-      <source>Show debug information</source>
-      <translation>Vis fejlretningsinformation</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+      <source>Debug</source>
+      <translation>Fejlfinde</translation>
     </message>
   </context>
   <context>
@@ -4512,26 +4504,21 @@ setting
     </message>
     <message>
       <location filename="../src/modules/welcomeq/welcomeq.qml" line="66"/>
-      <source>About</source>
-      <translation>Om</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="80"/>
       <source>Support</source>
       <translation>Support</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="91"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="77"/>
       <source>Known issues</source>
       <translation>Kendte problemer</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="102"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="88"/>
       <source>Release notes</source>
       <translation>Udgivelsesnoter</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="114"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="100"/>
       <source>Donate</source>
       <translation>Donér</translation>
     </message>
diff --git a/lang/calamares_de.ts b/lang/calamares_de.ts
index 1fba578c4f402c94fe95151bd7eab74b44574374..a6b385bd33e1af321e80f7e2fa35dd371f538040 100644
--- a/lang/calamares_de.ts
+++ b/lang/calamares_de.ts
@@ -156,7 +156,7 @@
       <translation>Widget-Baum</translation>
     </message>
     <message>
-      <location filename="../src/calamares/DebugWindow.cpp" line="239"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="244"/>
       <source>Debug information</source>
       <translation>Debug-Information</translation>
     </message>
@@ -507,12 +507,12 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren.
   <context>
     <name>CalamaresWindow</name>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="369"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
       <source>%1 Setup Program</source>
       <translation>%1 Installationsprogramm</translation>
     </message>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="370"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
       <source>%1 Installer</source>
       <translation>%1 Installationsprogramm</translation>
     </message>
@@ -1458,7 +1458,7 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren.
     </message>
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="260"/>
-      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphraseor delete and create a new encrypted partition.</source>
+      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphrase or delete and create a new encrypted partition.</source>
       <translation type="unfinished"/>
     </message>
   </context>
@@ -4023,61 +4023,56 @@ Ausgabe:
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.ui" line="140"/>
-      <source>&amp;About</source>
-      <translation>&amp;Über</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="150"/>
       <source>Open donations website</source>
       <translation>Öffne Spenden-Website</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="143"/>
       <source>&amp;Donate</source>
       <translation>Spen&amp;den</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="163"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
       <source>Open help and support website</source>
       <translation>Webseite für Hilfe und Support aufrufen</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="156"/>
       <source>&amp;Support</source>
       <translation>&amp;Unterstützung</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="176"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
       <source>Open issues and bug-tracking website</source>
       <translation>Webseite für das Melden von Fehlern aufrufen</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="169"/>
       <source>&amp;Known issues</source>
       <translation>&amp;Bekannte Probleme</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="189"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
       <source>Open release notes website</source>
       <translation>Webseite für Versionshinweise aufrufen</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="192"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="182"/>
       <source>&amp;Release notes</source>
       <translation>&amp;Veröffentlichungshinweise</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="216"/>
+      <location filename="../src/modules/welcome/WelcomePage.cpp" line="212"/>
       <source>%1 support</source>
       <translation>Unterstützung für %1</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="319"/>
       <source>About %1 setup</source>
       <translation>Über das Installationsprogramm %1</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="320"/>
       <source>About %1 installer</source>
       <translation>Über das %1 Installationsprogramm</translation>
     </message>
@@ -4143,19 +4138,16 @@ Ausgabe:
     </message>
   </context>
   <context>
-    <name>about</name>
+    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/modules/welcomeq/about.qml" line="79"/>
-      <source>Back</source>
-      <translation>Zurück</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+      <source>About</source>
+      <translation>Über</translation>
     </message>
-  </context>
-  <context>
-    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/calamares/calamares-sidebar.qml" line="79"/>
-      <source>Show debug information</source>
-      <translation>Informationen zur Fehlersuche anzeigen</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+      <source>Debug</source>
+      <translation>Beheben von Fehlern</translation>
     </message>
   </context>
   <context>
@@ -4519,26 +4511,21 @@ Ausgabe:
     </message>
     <message>
       <location filename="../src/modules/welcomeq/welcomeq.qml" line="66"/>
-      <source>About</source>
-      <translation>Über</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="80"/>
       <source>Support</source>
       <translation>Unterstützung</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="91"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="77"/>
       <source>Known issues</source>
       <translation>Bekannte Probleme</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="102"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="88"/>
       <source>Release notes</source>
       <translation>Veröffentlichungshinweise</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="114"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="100"/>
       <source>Donate</source>
       <translation>Spenden</translation>
     </message>
diff --git a/lang/calamares_el.ts b/lang/calamares_el.ts
index c4598ac31dabe91fa9435f59d0d417550d92c370..c3b08c5d8d0b6f6a64f4cdbc1f90375711aa150f 100644
--- a/lang/calamares_el.ts
+++ b/lang/calamares_el.ts
@@ -156,7 +156,7 @@
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/calamares/DebugWindow.cpp" line="239"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="244"/>
       <source>Debug information</source>
       <translation>Πληροφορίες αποσφαλμάτωσης</translation>
     </message>
@@ -502,12 +502,12 @@ The installer will quit and all changes will be lost.</source>
   <context>
     <name>CalamaresWindow</name>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="369"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
       <source>%1 Setup Program</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="370"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
       <source>%1 Installer</source>
       <translation>Εφαρμογή εγκατάστασης του %1</translation>
     </message>
@@ -1452,7 +1452,7 @@ The installer will quit and all changes will be lost.</source>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="260"/>
-      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphraseor delete and create a new encrypted partition.</source>
+      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphrase or delete and create a new encrypted partition.</source>
       <translation type="unfinished"/>
     </message>
   </context>
@@ -4009,61 +4009,56 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.ui" line="140"/>
-      <source>&amp;About</source>
-      <translation>Σ&amp;χετικά με</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="150"/>
       <source>Open donations website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="143"/>
       <source>&amp;Donate</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="163"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
       <source>Open help and support website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="156"/>
       <source>&amp;Support</source>
       <translation>&amp;Υποστήριξη</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="176"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
       <source>Open issues and bug-tracking website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="169"/>
       <source>&amp;Known issues</source>
       <translation>&amp;Γνωστά προβλήματα</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="189"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
       <source>Open release notes website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="192"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="182"/>
       <source>&amp;Release notes</source>
       <translation>Ση&amp;μειώσεις έκδοσης</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="216"/>
+      <location filename="../src/modules/welcome/WelcomePage.cpp" line="212"/>
       <source>%1 support</source>
       <translation>Υποστήριξη %1</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="319"/>
       <source>About %1 setup</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="320"/>
       <source>About %1 installer</source>
       <translation>Σχετικά με το πρόγραμμα εγκατάστασης %1</translation>
     </message>
@@ -4129,19 +4124,16 @@ Output:
     </message>
   </context>
   <context>
-    <name>about</name>
+    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/modules/welcomeq/about.qml" line="79"/>
-      <source>Back</source>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+      <source>About</source>
       <translation type="unfinished"/>
     </message>
-  </context>
-  <context>
-    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/calamares/calamares-sidebar.qml" line="79"/>
-      <source>Show debug information</source>
-      <translation>Εμφάνιση πληροφοριών απασφαλμάτωσης</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+      <source>Debug</source>
+      <translation>Debug</translation>
     </message>
   </context>
   <context>
@@ -4478,26 +4470,21 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcomeq/welcomeq.qml" line="66"/>
-      <source>About</source>
-      <translation type="unfinished"/>
-    </message>
-    <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="80"/>
       <source>Support</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="91"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="77"/>
       <source>Known issues</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="102"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="88"/>
       <source>Release notes</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="114"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="100"/>
       <source>Donate</source>
       <translation type="unfinished"/>
     </message>
diff --git a/lang/calamares_en.ts b/lang/calamares_en.ts
index ab624547117d047ea61bfb5ab828b9481e06a049..11db3909554fcd5473e3a674ac3a4907524592f0 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.</translation>
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="260"/>
       <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphrase or delete and create a new encrypted partition.</source>
-      <translation type="unfinished"/>
+      <translation>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphrase or delete and create a new encrypted partition.</translation>
     </message>
   </context>
   <context>
@@ -4141,12 +4141,12 @@ Output:
     <message>
       <location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
       <source>About</source>
-      <translation type="unfinished">About</translation>
+      <translation>About</translation>
     </message>
     <message>
       <location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
       <source>Debug</source>
-      <translation type="unfinished"/>
+      <translation>Debug</translation>
     </message>
   </context>
   <context>
diff --git a/lang/calamares_en_GB.ts b/lang/calamares_en_GB.ts
index e4bea73d6ee84a7582f8dd1aca5e5627ec1d1f6b..bada0d3fd41f1d3e786fffc6451f5daec9002119 100644
--- a/lang/calamares_en_GB.ts
+++ b/lang/calamares_en_GB.ts
@@ -156,7 +156,7 @@
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/calamares/DebugWindow.cpp" line="239"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="244"/>
       <source>Debug information</source>
       <translation>Debug information</translation>
     </message>
@@ -502,12 +502,12 @@ The installer will quit and all changes will be lost.</translation>
   <context>
     <name>CalamaresWindow</name>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="369"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
       <source>%1 Setup Program</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="370"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
       <source>%1 Installer</source>
       <translation>%1 Installer</translation>
     </message>
@@ -1452,7 +1452,7 @@ The installer will quit and all changes will be lost.</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="260"/>
-      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphraseor delete and create a new encrypted partition.</source>
+      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphrase or delete and create a new encrypted partition.</source>
       <translation type="unfinished"/>
     </message>
   </context>
@@ -4012,61 +4012,56 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.ui" line="140"/>
-      <source>&amp;About</source>
-      <translation>&amp;About</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="150"/>
       <source>Open donations website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="143"/>
       <source>&amp;Donate</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="163"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
       <source>Open help and support website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="156"/>
       <source>&amp;Support</source>
       <translation>&amp;Support</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="176"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
       <source>Open issues and bug-tracking website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="169"/>
       <source>&amp;Known issues</source>
       <translation>&amp;Known issues</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="189"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
       <source>Open release notes website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="192"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="182"/>
       <source>&amp;Release notes</source>
       <translation>&amp;Release notes</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="216"/>
+      <location filename="../src/modules/welcome/WelcomePage.cpp" line="212"/>
       <source>%1 support</source>
       <translation>%1 support</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="319"/>
       <source>About %1 setup</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="320"/>
       <source>About %1 installer</source>
       <translation>About %1 installer</translation>
     </message>
@@ -4132,19 +4127,16 @@ Output:
     </message>
   </context>
   <context>
-    <name>about</name>
+    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/modules/welcomeq/about.qml" line="79"/>
-      <source>Back</source>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+      <source>About</source>
       <translation type="unfinished"/>
     </message>
-  </context>
-  <context>
-    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/calamares/calamares-sidebar.qml" line="79"/>
-      <source>Show debug information</source>
-      <translation>Show debug information</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+      <source>Debug</source>
+      <translation>Debug</translation>
     </message>
   </context>
   <context>
@@ -4481,26 +4473,21 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcomeq/welcomeq.qml" line="66"/>
-      <source>About</source>
-      <translation type="unfinished"/>
-    </message>
-    <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="80"/>
       <source>Support</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="91"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="77"/>
       <source>Known issues</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="102"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="88"/>
       <source>Release notes</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="114"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="100"/>
       <source>Donate</source>
       <translation type="unfinished"/>
     </message>
diff --git a/lang/calamares_eo.ts b/lang/calamares_eo.ts
index 42889ddffa4cd861e3e1908fef80d84e567d8866..5c8d8574b5a5726722d7c88cc8e6f6c592068c18 100644
--- a/lang/calamares_eo.ts
+++ b/lang/calamares_eo.ts
@@ -156,7 +156,7 @@
       <translation>KromprogrametArbo</translation>
     </message>
     <message>
-      <location filename="../src/calamares/DebugWindow.cpp" line="239"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="244"/>
       <source>Debug information</source>
       <translation>Sencimiga Informaĵo</translation>
     </message>
@@ -506,12 +506,12 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos.</translation>
   <context>
     <name>CalamaresWindow</name>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="369"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
       <source>%1 Setup Program</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="370"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
       <source>%1 Installer</source>
       <translation>%1 Instalilo</translation>
     </message>
@@ -1456,7 +1456,7 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos.</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="260"/>
-      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphraseor delete and create a new encrypted partition.</source>
+      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphrase or delete and create a new encrypted partition.</source>
       <translation type="unfinished"/>
     </message>
   </context>
@@ -4013,61 +4013,56 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.ui" line="140"/>
-      <source>&amp;About</source>
-      <translation type="unfinished"/>
-    </message>
-    <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="150"/>
       <source>Open donations website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="143"/>
       <source>&amp;Donate</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="163"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
       <source>Open help and support website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="156"/>
       <source>&amp;Support</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="176"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
       <source>Open issues and bug-tracking website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="169"/>
       <source>&amp;Known issues</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="189"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
       <source>Open release notes website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="192"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="182"/>
       <source>&amp;Release notes</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="216"/>
+      <location filename="../src/modules/welcome/WelcomePage.cpp" line="212"/>
       <source>%1 support</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="319"/>
       <source>About %1 setup</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="320"/>
       <source>About %1 installer</source>
       <translation type="unfinished"/>
     </message>
@@ -4133,18 +4128,15 @@ Output:
     </message>
   </context>
   <context>
-    <name>about</name>
+    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/modules/welcomeq/about.qml" line="79"/>
-      <source>Back</source>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+      <source>About</source>
       <translation type="unfinished"/>
     </message>
-  </context>
-  <context>
-    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/calamares/calamares-sidebar.qml" line="79"/>
-      <source>Show debug information</source>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+      <source>Debug</source>
       <translation type="unfinished"/>
     </message>
   </context>
@@ -4482,26 +4474,21 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcomeq/welcomeq.qml" line="66"/>
-      <source>About</source>
-      <translation type="unfinished"/>
-    </message>
-    <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="80"/>
       <source>Support</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="91"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="77"/>
       <source>Known issues</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="102"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="88"/>
       <source>Release notes</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="114"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="100"/>
       <source>Donate</source>
       <translation type="unfinished"/>
     </message>
diff --git a/lang/calamares_es.ts b/lang/calamares_es.ts
index 5169765a920a06a57c42aad99a06ad04e9958a08..60959b887c3ce135ed0b7ed244f2805d792b824e 100644
--- a/lang/calamares_es.ts
+++ b/lang/calamares_es.ts
@@ -156,7 +156,7 @@
       <translation>Árbol de «widgets»</translation>
     </message>
     <message>
-      <location filename="../src/calamares/DebugWindow.cpp" line="239"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="244"/>
       <source>Debug information</source>
       <translation>Información de depuración</translation>
     </message>
@@ -509,12 +509,12 @@ El instalador se cerrará y todos tus cambios se perderán.</translation>
   <context>
     <name>CalamaresWindow</name>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="369"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
       <source>%1 Setup Program</source>
       <translation>Programa de configuración de %1</translation>
     </message>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="370"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
       <source>%1 Installer</source>
       <translation>Instalador de %1</translation>
     </message>
@@ -1459,7 +1459,7 @@ El instalador se cerrará y todos tus cambios se perderán.</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="260"/>
-      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphraseor delete and create a new encrypted partition.</source>
+      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphrase or delete and create a new encrypted partition.</source>
       <translation type="unfinished"/>
     </message>
   </context>
@@ -4033,61 +4033,56 @@ Información de salida:
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.ui" line="140"/>
-      <source>&amp;About</source>
-      <translation>&amp;Acerca de</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="150"/>
       <source>Open donations website</source>
       <translation>Abrir la página web de donaciones</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="143"/>
       <source>&amp;Donate</source>
       <translation>&amp;Donar</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="163"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
       <source>Open help and support website</source>
       <translation>Abrir el sitio web de ayuda y soporte</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="156"/>
       <source>&amp;Support</source>
       <translation>&amp;Ayuda</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="176"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
       <source>Open issues and bug-tracking website</source>
       <translation>Sitio web de problemas y mejoras</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="169"/>
       <source>&amp;Known issues</source>
       <translation>&amp;Problemas conocidos</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="189"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
       <source>Open release notes website</source>
       <translation>Abrir la web con las notas de lanzamiento</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="192"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="182"/>
       <source>&amp;Release notes</source>
       <translation>&amp;Notas de publicación</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="216"/>
+      <location filename="../src/modules/welcome/WelcomePage.cpp" line="212"/>
       <source>%1 support</source>
       <translation>%1 ayuda</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="319"/>
       <source>About %1 setup</source>
       <translation>Acerca del configurador de %1</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="320"/>
       <source>About %1 installer</source>
       <translation>Acerca del instalador %1</translation>
     </message>
@@ -4153,19 +4148,16 @@ Información de salida:
     </message>
   </context>
   <context>
-    <name>about</name>
+    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/modules/welcomeq/about.qml" line="79"/>
-      <source>Back</source>
-      <translation>Atrás</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+      <source>About</source>
+      <translation>Acerca de</translation>
     </message>
-  </context>
-  <context>
-    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/calamares/calamares-sidebar.qml" line="79"/>
-      <source>Show debug information</source>
-      <translation>Ver la información de depuración.</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+      <source>Debug</source>
+      <translation>Depurar</translation>
     </message>
   </context>
   <context>
@@ -4531,26 +4523,21 @@ Información de salida:
     </message>
     <message>
       <location filename="../src/modules/welcomeq/welcomeq.qml" line="66"/>
-      <source>About</source>
-      <translation>Acerca de</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="80"/>
       <source>Support</source>
       <translation>Soporte</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="91"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="77"/>
       <source>Known issues</source>
       <translation>Problemas conocidos</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="102"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="88"/>
       <source>Release notes</source>
       <translation>Notas de lanzamiento</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="114"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="100"/>
       <source>Donate</source>
       <translation>Donar</translation>
     </message>
diff --git a/lang/calamares_es_MX.ts b/lang/calamares_es_MX.ts
index c00cc0accbf3a32a7e9f6099d7836f41faaad9fc..0dd159f414d82ed41e46877252e8dac1ba412815 100644
--- a/lang/calamares_es_MX.ts
+++ b/lang/calamares_es_MX.ts
@@ -156,7 +156,7 @@
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/calamares/DebugWindow.cpp" line="239"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="244"/>
       <source>Debug information</source>
       <translation>Información de depuración</translation>
     </message>
@@ -505,12 +505,12 @@ El instalador terminará y se perderán todos los cambios.</translation>
   <context>
     <name>CalamaresWindow</name>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="369"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
       <source>%1 Setup Program</source>
       <translation>%1 Programa de instalación</translation>
     </message>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="370"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
       <source>%1 Installer</source>
       <translation>%1 Instalador</translation>
     </message>
@@ -1456,7 +1456,7 @@ El instalador terminará y se perderán todos los cambios.</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="260"/>
-      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphraseor delete and create a new encrypted partition.</source>
+      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphrase or delete and create a new encrypted partition.</source>
       <translation type="unfinished"/>
     </message>
   </context>
@@ -4026,61 +4026,56 @@ Salida
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.ui" line="140"/>
-      <source>&amp;About</source>
-      <translation>&amp;Acerca de</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="150"/>
       <source>Open donations website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="143"/>
       <source>&amp;Donate</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="163"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
       <source>Open help and support website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="156"/>
       <source>&amp;Support</source>
       <translation>&amp;Soporte</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="176"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
       <source>Open issues and bug-tracking website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="169"/>
       <source>&amp;Known issues</source>
       <translation>&amp;Problemas Conocidos</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="189"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
       <source>Open release notes website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="192"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="182"/>
       <source>&amp;Release notes</source>
       <translation>&amp;Notas de lanzamiento</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="216"/>
+      <location filename="../src/modules/welcome/WelcomePage.cpp" line="212"/>
       <source>%1 support</source>
       <translation>%1 Soporte</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="319"/>
       <source>About %1 setup</source>
       <translation>Acerca de la configuración %1</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="320"/>
       <source>About %1 installer</source>
       <translation>Acerca del instalador %1</translation>
     </message>
@@ -4146,19 +4141,16 @@ Salida
     </message>
   </context>
   <context>
-    <name>about</name>
+    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/modules/welcomeq/about.qml" line="79"/>
-      <source>Back</source>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+      <source>About</source>
       <translation type="unfinished"/>
     </message>
-  </context>
-  <context>
-    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/calamares/calamares-sidebar.qml" line="79"/>
-      <source>Show debug information</source>
-      <translation>Mostrar información de depuración</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+      <source>Debug</source>
+      <translation>Depurar</translation>
     </message>
   </context>
   <context>
@@ -4495,26 +4487,21 @@ Salida
     </message>
     <message>
       <location filename="../src/modules/welcomeq/welcomeq.qml" line="66"/>
-      <source>About</source>
-      <translation type="unfinished"/>
-    </message>
-    <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="80"/>
       <source>Support</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="91"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="77"/>
       <source>Known issues</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="102"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="88"/>
       <source>Release notes</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="114"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="100"/>
       <source>Donate</source>
       <translation type="unfinished"/>
     </message>
diff --git a/lang/calamares_es_PR.ts b/lang/calamares_es_PR.ts
index 9ab27d204019279a19f403528a720924f15e3c50..7114d184f19126ca9f446ee2dac74d162adbf01b 100644
--- a/lang/calamares_es_PR.ts
+++ b/lang/calamares_es_PR.ts
@@ -156,7 +156,7 @@
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/calamares/DebugWindow.cpp" line="239"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="244"/>
       <source>Debug information</source>
       <translation>Información de depuración</translation>
     </message>
@@ -503,12 +503,12 @@ The installer will quit and all changes will be lost.</source>
   <context>
     <name>CalamaresWindow</name>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="369"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
       <source>%1 Setup Program</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="370"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
       <source>%1 Installer</source>
       <translation type="unfinished"/>
     </message>
@@ -1453,7 +1453,7 @@ The installer will quit and all changes will be lost.</source>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="260"/>
-      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphraseor delete and create a new encrypted partition.</source>
+      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphrase or delete and create a new encrypted partition.</source>
       <translation type="unfinished"/>
     </message>
   </context>
@@ -4019,61 +4019,56 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.ui" line="140"/>
-      <source>&amp;About</source>
-      <translation type="unfinished"/>
-    </message>
-    <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="150"/>
       <source>Open donations website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="143"/>
       <source>&amp;Donate</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="163"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
       <source>Open help and support website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="156"/>
       <source>&amp;Support</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="176"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
       <source>Open issues and bug-tracking website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="169"/>
       <source>&amp;Known issues</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="189"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
       <source>Open release notes website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="192"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="182"/>
       <source>&amp;Release notes</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="216"/>
+      <location filename="../src/modules/welcome/WelcomePage.cpp" line="212"/>
       <source>%1 support</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="319"/>
       <source>About %1 setup</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="320"/>
       <source>About %1 installer</source>
       <translation type="unfinished"/>
     </message>
@@ -4139,18 +4134,15 @@ Output:
     </message>
   </context>
   <context>
-    <name>about</name>
+    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/modules/welcomeq/about.qml" line="79"/>
-      <source>Back</source>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+      <source>About</source>
       <translation type="unfinished"/>
     </message>
-  </context>
-  <context>
-    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/calamares/calamares-sidebar.qml" line="79"/>
-      <source>Show debug information</source>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+      <source>Debug</source>
       <translation type="unfinished"/>
     </message>
   </context>
@@ -4488,26 +4480,21 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcomeq/welcomeq.qml" line="66"/>
-      <source>About</source>
-      <translation type="unfinished"/>
-    </message>
-    <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="80"/>
       <source>Support</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="91"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="77"/>
       <source>Known issues</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="102"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="88"/>
       <source>Release notes</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="114"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="100"/>
       <source>Donate</source>
       <translation type="unfinished"/>
     </message>
diff --git a/lang/calamares_et.ts b/lang/calamares_et.ts
index b141288be8ba81730e70f06ad6ca139ed7509caa..8a510d374155e33f8d7b4944e91ac58c7ab15fca 100644
--- a/lang/calamares_et.ts
+++ b/lang/calamares_et.ts
@@ -156,7 +156,7 @@
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/calamares/DebugWindow.cpp" line="239"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="244"/>
       <source>Debug information</source>
       <translation>Silumisteave</translation>
     </message>
@@ -502,12 +502,12 @@ Paigaldaja sulgub ning kõik muutused kaovad.</translation>
   <context>
     <name>CalamaresWindow</name>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="369"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
       <source>%1 Setup Program</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="370"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
       <source>%1 Installer</source>
       <translation>%1 paigaldaja</translation>
     </message>
@@ -1452,7 +1452,7 @@ Paigaldaja sulgub ning kõik muutused kaovad.</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="260"/>
-      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphraseor delete and create a new encrypted partition.</source>
+      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphrase or delete and create a new encrypted partition.</source>
       <translation type="unfinished"/>
     </message>
   </context>
@@ -4012,61 +4012,56 @@ Väljund:
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.ui" line="140"/>
-      <source>&amp;About</source>
-      <translation>&amp;Teave</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="150"/>
       <source>Open donations website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="143"/>
       <source>&amp;Donate</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="163"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
       <source>Open help and support website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="156"/>
       <source>&amp;Support</source>
       <translation>&amp;Tugi</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="176"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
       <source>Open issues and bug-tracking website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="169"/>
       <source>&amp;Known issues</source>
       <translation>&amp;Teadaolevad vead</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="189"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
       <source>Open release notes website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="192"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="182"/>
       <source>&amp;Release notes</source>
       <translation>&amp;Väljalaskemärkmed</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="216"/>
+      <location filename="../src/modules/welcome/WelcomePage.cpp" line="212"/>
       <source>%1 support</source>
       <translation>%1 tugi</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="319"/>
       <source>About %1 setup</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="320"/>
       <source>About %1 installer</source>
       <translation>Teave %1 paigaldaja kohta</translation>
     </message>
@@ -4132,19 +4127,16 @@ Väljund:
     </message>
   </context>
   <context>
-    <name>about</name>
+    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/modules/welcomeq/about.qml" line="79"/>
-      <source>Back</source>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+      <source>About</source>
       <translation type="unfinished"/>
     </message>
-  </context>
-  <context>
-    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/calamares/calamares-sidebar.qml" line="79"/>
-      <source>Show debug information</source>
-      <translation>Kuva silumisteavet</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+      <source>Debug</source>
+      <translation>Silu</translation>
     </message>
   </context>
   <context>
@@ -4481,26 +4473,21 @@ Väljund:
     </message>
     <message>
       <location filename="../src/modules/welcomeq/welcomeq.qml" line="66"/>
-      <source>About</source>
-      <translation type="unfinished"/>
-    </message>
-    <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="80"/>
       <source>Support</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="91"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="77"/>
       <source>Known issues</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="102"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="88"/>
       <source>Release notes</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="114"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="100"/>
       <source>Donate</source>
       <translation type="unfinished"/>
     </message>
diff --git a/lang/calamares_eu.ts b/lang/calamares_eu.ts
index d73a6f3537c916b609084320c6cde59c47ae8418..f694415d46c98922429513b52ee4fcb44e6e1870 100644
--- a/lang/calamares_eu.ts
+++ b/lang/calamares_eu.ts
@@ -156,7 +156,7 @@
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/calamares/DebugWindow.cpp" line="239"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="244"/>
       <source>Debug information</source>
       <translation>Arazte informazioa</translation>
     </message>
@@ -502,12 +502,12 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira.</translation>
   <context>
     <name>CalamaresWindow</name>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="369"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
       <source>%1 Setup Program</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="370"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
       <source>%1 Installer</source>
       <translation>%1 Instalatzailea</translation>
     </message>
@@ -1452,7 +1452,7 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira.</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="260"/>
-      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphraseor delete and create a new encrypted partition.</source>
+      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphrase or delete and create a new encrypted partition.</source>
       <translation type="unfinished"/>
     </message>
   </context>
@@ -4011,61 +4011,56 @@ Irteera:
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.ui" line="140"/>
-      <source>&amp;About</source>
-      <translation>Honi &amp;buruz</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="150"/>
       <source>Open donations website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="143"/>
       <source>&amp;Donate</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="163"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
       <source>Open help and support website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="156"/>
       <source>&amp;Support</source>
       <translation>&amp;Laguntza</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="176"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
       <source>Open issues and bug-tracking website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="169"/>
       <source>&amp;Known issues</source>
       <translation>&amp;Arazo ezagunak</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="189"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
       <source>Open release notes website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="192"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="182"/>
       <source>&amp;Release notes</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="216"/>
+      <location filename="../src/modules/welcome/WelcomePage.cpp" line="212"/>
       <source>%1 support</source>
       <translation>%1 euskarria</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="319"/>
       <source>About %1 setup</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="320"/>
       <source>About %1 installer</source>
       <translation>%1 instalatzaileari buruz</translation>
     </message>
@@ -4131,19 +4126,16 @@ Irteera:
     </message>
   </context>
   <context>
-    <name>about</name>
+    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/modules/welcomeq/about.qml" line="79"/>
-      <source>Back</source>
-      <translation>Atzera</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+      <source>About</source>
+      <translation>Honi buruz</translation>
     </message>
-  </context>
-  <context>
-    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/calamares/calamares-sidebar.qml" line="79"/>
-      <source>Show debug information</source>
-      <translation>Erakutsi arazte informazioa</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+      <source>Debug</source>
+      <translation type="unfinished"/>
     </message>
   </context>
   <context>
@@ -4480,26 +4472,21 @@ Irteera:
     </message>
     <message>
       <location filename="../src/modules/welcomeq/welcomeq.qml" line="66"/>
-      <source>About</source>
-      <translation>Honi buruz</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="80"/>
       <source>Support</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="91"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="77"/>
       <source>Known issues</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="102"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="88"/>
       <source>Release notes</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="114"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="100"/>
       <source>Donate</source>
       <translation>Egin dohaintza</translation>
     </message>
diff --git a/lang/calamares_fa.ts b/lang/calamares_fa.ts
index 11b5749af1e1a460da806d679c186cc75e1a1303..3cb8b1b11dd072d6e8f94a9dedf7052e2275f67c 100644
--- a/lang/calamares_fa.ts
+++ b/lang/calamares_fa.ts
@@ -156,7 +156,7 @@
       <translation>درخت ابزارک‌ها</translation>
     </message>
     <message>
-      <location filename="../src/calamares/DebugWindow.cpp" line="239"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="244"/>
       <source>Debug information</source>
       <translation>اطّلاعات اشکال‌زدایی</translation>
     </message>
@@ -507,12 +507,12 @@ The installer will quit and all changes will be lost.</source>
   <context>
     <name>CalamaresWindow</name>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="369"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
       <source>%1 Setup Program</source>
       <translation>%1 برنامه راه‌اندازی</translation>
     </message>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="370"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
       <source>%1 Installer</source>
       <translation>نصب‌کنندهٔ %1</translation>
     </message>
@@ -1457,7 +1457,7 @@ The installer will quit and all changes will be lost.</source>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="260"/>
-      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphraseor delete and create a new encrypted partition.</source>
+      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphrase or delete and create a new encrypted partition.</source>
       <translation type="unfinished"/>
     </message>
   </context>
@@ -4017,61 +4017,56 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.ui" line="140"/>
-      <source>&amp;About</source>
-      <translation>&amp;درباره</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="150"/>
       <source>Open donations website</source>
       <translation>گشودن پایگاه وب اعانه‌ها</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="143"/>
       <source>&amp;Donate</source>
       <translation>ا&amp;عانه</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="163"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
       <source>Open help and support website</source>
       <translation>گشودن پایگاه وب راهنمایی و پشتیبانی</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="156"/>
       <source>&amp;Support</source>
       <translation>&amp;پشتیبانی</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="176"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
       <source>Open issues and bug-tracking website</source>
       <translation>گشودن پایگاه وب ردیاب مشکل</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="169"/>
       <source>&amp;Known issues</source>
       <translation>&amp;مشکلات شناخته‌شده</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="189"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
       <source>Open release notes website</source>
       <translation>گشودن پاگاه وب یادداشت‌های انتشار</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="192"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="182"/>
       <source>&amp;Release notes</source>
       <translation>&amp;یادداشت‌های انتشار</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="216"/>
+      <location filename="../src/modules/welcome/WelcomePage.cpp" line="212"/>
       <source>%1 support</source>
       <translation>پشتیبانی %1</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="319"/>
       <source>About %1 setup</source>
       <translation>دربارهٔ برپاسازی %1</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="320"/>
       <source>About %1 installer</source>
       <translation>دربارهٔ نصب‌کنندهٔ %1</translation>
     </message>
@@ -4137,19 +4132,16 @@ Output:
     </message>
   </context>
   <context>
-    <name>about</name>
+    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/modules/welcomeq/about.qml" line="79"/>
-      <source>Back</source>
-      <translation>بازگشت</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+      <source>About</source>
+      <translation>درباره</translation>
     </message>
-  </context>
-  <context>
-    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/calamares/calamares-sidebar.qml" line="79"/>
-      <source>Show debug information</source>
-      <translation>نمایش اطّلاعات اشکال‌زدایی</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+      <source>Debug</source>
+      <translation type="unfinished"/>
     </message>
   </context>
   <context>
@@ -4494,26 +4486,21 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcomeq/welcomeq.qml" line="66"/>
-      <source>About</source>
-      <translation>درباره</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="80"/>
       <source>Support</source>
       <translation>پشتیبانی</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="91"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="77"/>
       <source>Known issues</source>
       <translation>اشکالات شناخته‌شده</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="102"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="88"/>
       <source>Release notes</source>
       <translation>یادداشت‌های انتشار</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="114"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="100"/>
       <source>Donate</source>
       <translation>اعانه</translation>
     </message>
diff --git a/lang/calamares_fi_FI.ts b/lang/calamares_fi_FI.ts
index bd0062c392b3dab5cce49f521844b6748148dfac..43a97f6eddcebed8a360c35e5114026cd086a93c 100644
--- a/lang/calamares_fi_FI.ts
+++ b/lang/calamares_fi_FI.ts
@@ -6,18 +6,18 @@
     <message>
       <location filename="../src/libcalamares/CalamaresAbout.cpp" line="17"/>
       <source>&lt;h1&gt;%1&lt;/h1&gt;&lt;br/&gt;&lt;strong&gt;%2&lt;br/&gt; for %3&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;</source>
-      <translation type="unfinished"/>
+      <translation>&lt;h1&gt;%1&lt;/h1&gt;&lt;br/&gt;&lt;strong&gt;%2&lt;br/&gt; on %3&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;</translation>
     </message>
     <message>
       <location filename="../src/libcalamares/CalamaresAbout.cpp" line="20"/>
       <source>Thanks to &lt;a href="https://calamares.io/team/"&gt;the Calamares team&lt;/a&gt; and the &lt;a href="https://www.transifex.com/calamares/calamares/"&gt;Calamares translators team&lt;/a&gt;.&lt;br/&gt;&lt;br/&gt;&lt;a href="https://calamares.io/"&gt;Calamares&lt;/a&gt; development is sponsored by &lt;br/&gt;&lt;a href="http://www.blue-systems.com/"&gt;Blue Systems&lt;/a&gt; - Liberating Software.</source>
-      <translation type="unfinished"/>
+      <translation>Kiitos &lt;a href="https://calamares.io/team/"&gt;Calamares tiimille &lt;/a&gt; ja &lt;a href="https://www.transifex.com/calamares/calamares/"&gt;Calamares kääntäjätiimille&lt;/a&gt;.&lt;br/&gt;&lt;br/&gt;&lt;a href="https://calamares.io/"&gt;Calamares&lt;/a&gt; kehitystä sponsoroi &lt;br/&gt;&lt;a href="http://www.blue-systems.com/"&gt;Blue Systems&lt;/a&gt; - Liberating Software.</translation>
     </message>
     <message>
       <location filename="../src/libcalamares/CalamaresAbout.cpp" line="38"/>
       <source>Copyright %1-%2 %3 &amp;lt;%4&amp;gt;&lt;br/&gt;</source>
       <extracomment>Copyright year-year Name &lt;email-address&gt;</extracomment>
-      <translation type="unfinished"/>
+      <translation>Copyright %1-%2 %3 &amp;lt;%4&amp;gt;&lt;br/&gt;</translation>
     </message>
   </context>
   <context>
@@ -156,7 +156,7 @@
       <translation>Widgettipuu</translation>
     </message>
     <message>
-      <location filename="../src/calamares/DebugWindow.cpp" line="239"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="244"/>
       <source>Debug information</source>
       <translation>Vianetsinnän tiedot</translation>
     </message>
@@ -507,12 +507,12 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.</translation>
   <context>
     <name>CalamaresWindow</name>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="369"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
       <source>%1 Setup Program</source>
       <translation>%1-asennusohjelma</translation>
     </message>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="370"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
       <source>%1 Installer</source>
       <translation>%1-asentaja</translation>
     </message>
@@ -1454,12 +1454,12 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä.</tra
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="259"/>
       <source>Passphrase for existing partition</source>
-      <translation type="unfinished"/>
+      <translation>Olemassa olevan osion salasana</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="260"/>
-      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphraseor delete and create a new encrypted partition.</source>
-      <translation type="unfinished"/>
+      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphrase or delete and create a new encrypted partition.</source>
+      <translation>Osion %1 salausta ei voitu purkaa annetulla salasanalla. &lt;br/&gt;&lt;br/&gt;Muokkaa osiota antamalla oikea salasana tai poista ja luo uusi salattu osio.</translation>
     </message>
   </context>
   <context>
@@ -4023,61 +4023,56 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä.&lt;/
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.ui" line="140"/>
-      <source>&amp;About</source>
-      <translation>&amp;Tietoa</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="150"/>
       <source>Open donations website</source>
       <translation>Avaa lahjoitussivusto</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="143"/>
       <source>&amp;Donate</source>
       <translation>&amp;Lahjoita</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="163"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
       <source>Open help and support website</source>
       <translation>Avaa ohje- ja tukisivusto</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="156"/>
       <source>&amp;Support</source>
       <translation>&amp;Tuki</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="176"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
       <source>Open issues and bug-tracking website</source>
       <translation>Avaa ongelmia käsittelevä verkkosivusto</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="169"/>
       <source>&amp;Known issues</source>
       <translation>&amp;Tunnetut ongelmat</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="189"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
       <source>Open release notes website</source>
       <translation>Avaa julkaisutietojen verkkosivusto</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="192"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="182"/>
       <source>&amp;Release notes</source>
       <translation>&amp;Julkaisutiedot</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="216"/>
+      <location filename="../src/modules/welcome/WelcomePage.cpp" line="212"/>
       <source>%1 support</source>
       <translation>%1 tuki</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="319"/>
       <source>About %1 setup</source>
       <translation>Tietoja %1 asetuksista</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="320"/>
       <source>About %1 installer</source>
       <translation>Tietoa %1-asennusohjelmasta</translation>
     </message>
@@ -4143,19 +4138,16 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä.&lt;/
     </message>
   </context>
   <context>
-    <name>about</name>
+    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/modules/welcomeq/about.qml" line="79"/>
-      <source>Back</source>
-      <translation>Takaisin</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+      <source>About</source>
+      <translation>Tietoa</translation>
     </message>
-  </context>
-  <context>
-    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/calamares/calamares-sidebar.qml" line="79"/>
-      <source>Show debug information</source>
-      <translation>Näytä virheenkorjaustiedot</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+      <source>Debug</source>
+      <translation>Virheiden etsintä</translation>
     </message>
   </context>
   <context>
@@ -4520,26 +4512,21 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä.&lt;/
     </message>
     <message>
       <location filename="../src/modules/welcomeq/welcomeq.qml" line="66"/>
-      <source>About</source>
-      <translation>Tietoa</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="80"/>
       <source>Support</source>
       <translation>Tuki</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="91"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="77"/>
       <source>Known issues</source>
       <translation>Tunnetut ongelmat</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="102"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="88"/>
       <source>Release notes</source>
       <translation>Julkaisutiedot</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="114"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="100"/>
       <source>Donate</source>
       <translation>Lahjoita</translation>
     </message>
diff --git a/lang/calamares_fr.ts b/lang/calamares_fr.ts
index 5cb79bb5d5cbad147bdcb6716650c977d5cd9378..4b33133af6a7f30345430127d6bb3aaa6d56da3f 100644
--- a/lang/calamares_fr.ts
+++ b/lang/calamares_fr.ts
@@ -6,18 +6,18 @@
     <message>
       <location filename="../src/libcalamares/CalamaresAbout.cpp" line="17"/>
       <source>&lt;h1&gt;%1&lt;/h1&gt;&lt;br/&gt;&lt;strong&gt;%2&lt;br/&gt; for %3&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;</source>
-      <translation type="unfinished"/>
+      <translation>&lt;h1&gt;%1&lt;/h1&gt;&lt;br/&gt;&lt;strong&gt;%2&lt;br/&gt;pour %3&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;</translation>
     </message>
     <message>
       <location filename="../src/libcalamares/CalamaresAbout.cpp" line="20"/>
       <source>Thanks to &lt;a href="https://calamares.io/team/"&gt;the Calamares team&lt;/a&gt; and the &lt;a href="https://www.transifex.com/calamares/calamares/"&gt;Calamares translators team&lt;/a&gt;.&lt;br/&gt;&lt;br/&gt;&lt;a href="https://calamares.io/"&gt;Calamares&lt;/a&gt; development is sponsored by &lt;br/&gt;&lt;a href="http://www.blue-systems.com/"&gt;Blue Systems&lt;/a&gt; - Liberating Software.</source>
-      <translation type="unfinished"/>
+      <translation>Merci à &lt;a href="https://calamares.io/team/"&gt;l'équipe de Calamares&lt;/a&gt; et à &lt;a href="https://www.transifex.com/calamares/calamares/"&gt;l'équipe de traducteurs de Calamares&lt;/a&gt;.&lt;br/&gt;&lt;br/&gt;Le développement de &lt;a href="https://calamares.io/"&gt;Calamares&lt;/a&gt; est sponsorisé par&lt;br/&gt;&lt;a href="http://www.blue-systems.com/"&gt; Blue Systems&lt;/a&gt; - Liberating Software.</translation>
     </message>
     <message>
       <location filename="../src/libcalamares/CalamaresAbout.cpp" line="38"/>
       <source>Copyright %1-%2 %3 &amp;lt;%4&amp;gt;&lt;br/&gt;</source>
       <extracomment>Copyright year-year Name &lt;email-address&gt;</extracomment>
-      <translation type="unfinished"/>
+      <translation>Copyright %1-%2 %3 &amp;lt;%4&amp;gt;1&lt;br/&gt;</translation>
     </message>
   </context>
   <context>
@@ -156,7 +156,7 @@
       <translation>Arbre de widget</translation>
     </message>
     <message>
-      <location filename="../src/calamares/DebugWindow.cpp" line="239"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="244"/>
       <source>Debug information</source>
       <translation>Informations de dépannage</translation>
     </message>
@@ -509,12 +509,12 @@ L'installateur se fermera et les changements seront perdus.</translation>
   <context>
     <name>CalamaresWindow</name>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="369"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
       <source>%1 Setup Program</source>
       <translation>Programme de configuration de %1</translation>
     </message>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="370"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
       <source>%1 Installer</source>
       <translation>Installateur %1</translation>
     </message>
@@ -524,7 +524,7 @@ L'installateur se fermera et les changements seront perdus.</translation>
     <message>
       <location filename="../src/modules/partition/jobs/ChangeFilesystemLabelJob.cpp" line="32"/>
       <source>Set filesystem label on %1.</source>
-      <translation type="unfinished"/>
+      <translation>Définir l'étiquette du système de fichiers sur %1.</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/jobs/ChangeFilesystemLabelJob.cpp" line="39"/>
@@ -705,27 +705,27 @@ L'installateur se fermera et les changements seront perdus.</translation>
     <message>
       <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="272"/>
       <source>Successfully unmounted %1.</source>
-      <translation type="unfinished"/>
+      <translation>Démontage réussi de %1.</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="279"/>
       <source>Successfully disabled swap %1.</source>
-      <translation type="unfinished"/>
+      <translation>Le swap %1 a été désactivé avec succès.</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="305"/>
       <source>Successfully cleared swap %1.</source>
-      <translation type="unfinished"/>
+      <translation>Le swap %1 a été effacé avec succès.</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="319"/>
       <source>Successfully closed mapper device %1.</source>
-      <translation type="unfinished"/>
+      <translation>Le périphérique mappeur %1 a été fermé avec succès.</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="332"/>
       <source>Successfully disabled volume group %1.</source>
-      <translation type="unfinished"/>
+      <translation>Le groupe de volumes %1 a été désactivé avec succès.</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="371"/>
@@ -990,12 +990,12 @@ L'installateur se fermera et les changements seront perdus.</translation>
     <message>
       <location filename="../src/modules/packagechooser/Config.cpp" line="249"/>
       <source>Install option: &lt;strong&gt;%1&lt;/strong&gt;</source>
-      <translation type="unfinished"/>
+      <translation>Option d'installation : &lt;strong&gt;%1&lt;/strong&gt;</translation>
     </message>
     <message>
       <location filename="../src/modules/packagechooser/Config.cpp" line="249"/>
       <source>None</source>
-      <translation type="unfinished"/>
+      <translation>Aucun</translation>
     </message>
     <message>
       <location filename="../src/modules/summary/Config.cpp" line="94"/>
@@ -1046,7 +1046,7 @@ L'installateur se fermera et les changements seront perdus.</translation>
     <message>
       <location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="71"/>
       <source>Primar&amp;y</source>
-      <translation type="unfinished"/>
+      <translation>Primair&amp;e</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="81"/>
@@ -1076,12 +1076,12 @@ L'installateur se fermera et les changements seront perdus.</translation>
     <message>
       <location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="224"/>
       <source>Label for the filesystem</source>
-      <translation type="unfinished"/>
+      <translation>Étiquette pour le système de fichiers</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="234"/>
       <source>FS Label:</source>
-      <translation type="unfinished"/>
+      <translation>Étiquette FS :</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/CreatePartitionDialog.cpp" line="66"/>
@@ -1111,7 +1111,7 @@ L'installateur se fermera et les changements seront perdus.</translation>
     <message>
       <location filename="../src/modules/partition/gui/PartitionDialogHelpers.cpp" line="96"/>
       <source>Mountpoint must start with a &lt;tt&gt;/&lt;/tt&gt;.</source>
-      <translation type="unfinished"/>
+      <translation>Le point de montage doit commencer par un &lt;tt&gt;/&lt;/tt&gt;.</translation>
     </message>
   </context>
   <context>
@@ -1400,7 +1400,7 @@ L'installateur se fermera et les changements seront perdus.</translation>
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="54"/>
       <source>Con&amp;tent:</source>
-      <translation type="unfinished"/>
+      <translation>Con&amp;tenu :</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="64"/>
@@ -1445,22 +1445,22 @@ L'installateur se fermera et les changements seront perdus.</translation>
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="179"/>
       <source>Label for the filesystem</source>
-      <translation type="unfinished"/>
+      <translation>Étiquette pour le système de fichiers</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="189"/>
       <source>FS Label:</source>
-      <translation type="unfinished"/>
+      <translation>Étiquette FS :</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="259"/>
       <source>Passphrase for existing partition</source>
-      <translation type="unfinished"/>
+      <translation>Mot de passe pour la partition existante</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="260"/>
-      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphraseor delete and create a new encrypted partition.</source>
-      <translation type="unfinished"/>
+      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphrase or delete and create a new encrypted partition.</source>
+      <translation>La partition %1 n'a pas pu être déchiffrée avec la phrase secrète donnée. &lt;br/&gt;&lt;br/&gt;Modifier à nouveau la partition et indiquer la phrase secrète correcte ou supprimer et créer une nouvelle partition chiffrée.</translation>
     </message>
   </context>
   <context>
@@ -1478,7 +1478,7 @@ L'installateur se fermera et les changements seront perdus.</translation>
     <message>
       <location filename="../src/modules/partition/gui/EncryptWidget.ui" line="43"/>
       <source>Your system does not seem to support encryption well enough to encrypt the entire system. You may enable encryption, but performance may suffer.</source>
-      <translation type="unfinished"/>
+      <translation>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.</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/EncryptWidget.ui" line="59"/>
@@ -1502,7 +1502,7 @@ L'installateur se fermera et les changements seront perdus.</translation>
     <message>
       <location filename="../src/libcalamaresui/widgets/ErrorDialog.ui" line="40"/>
       <source>Details:</source>
-      <translation type="unfinished"/>
+      <translation>Détails :</translation>
     </message>
     <message>
       <location filename="../src/libcalamaresui/widgets/ErrorDialog.ui" line="56"/>
@@ -1854,17 +1854,17 @@ L'installateur se fermera et les changements seront perdus.</translation>
     <message>
       <location filename="../src/modules/luksopenswaphookcfg/LOSHJob.cpp" line="88"/>
       <source>No target system available.</source>
-      <translation type="unfinished"/>
+      <translation>Aucun système cible disponible.</translation>
     </message>
     <message>
       <location filename="../src/modules/luksopenswaphookcfg/LOSHJob.cpp" line="96"/>
       <source>No rootMountPoint is set.</source>
-      <translation type="unfinished"/>
+      <translation>Aucun point de montage racine n'est défini.</translation>
     </message>
     <message>
       <location filename="../src/modules/luksopenswaphookcfg/LOSHJob.cpp" line="101"/>
       <source>No configFilePath is set.</source>
-      <translation type="unfinished"/>
+      <translation>Aucun chemin de fichier de configuration n'est défini.</translation>
     </message>
   </context>
   <context>
@@ -2246,7 +2246,7 @@ L'installateur se fermera et les changements seront perdus.</translation>
     <message>
       <location filename="../src/modules/localeq/Offline.qml" line="41"/>
       <source>Select your preferred Region, or use the default settings.</source>
-      <translation type="unfinished"/>
+      <translation>Sélectionner votre région préférée ou utiliser les paramètres par défaut.</translation>
     </message>
     <message>
       <location filename="../src/modules/localeq/Offline.qml" line="99"/>
@@ -2787,7 +2787,7 @@ L'installateur se fermera et les changements seront perdus.</translation>
     <message>
       <location filename="../src/modules/partition/core/PartitionModel.cpp" line="302"/>
       <source>File System Label</source>
-      <translation type="unfinished"/>
+      <translation>Libellé du système de fichiers</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/core/PartitionModel.cpp" line="304"/>
@@ -2893,17 +2893,17 @@ L'installateur se fermera et les changements seront perdus.</translation>
     <message>
       <location filename="../src/modules/partition/PartitionViewStep.cpp" line="254"/>
       <source>Unsafe partition actions are enabled.</source>
-      <translation type="unfinished"/>
+      <translation>Les actions de partition non sécurisées sont activées.</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/PartitionViewStep.cpp" line="257"/>
       <source>Partitioning is configured to &lt;b&gt;always&lt;/b&gt; fail.</source>
-      <translation type="unfinished"/>
+      <translation>Le partitionnement est configuré pour &lt;b&gt;toujours&lt;/b&gt; échouer.</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/PartitionViewStep.cpp" line="260"/>
       <source>No partitions will be changed.</source>
-      <translation type="unfinished"/>
+      <translation>Aucune partition ne sera modifiée.</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/PartitionViewStep.cpp" line="300"/>
@@ -2923,37 +2923,37 @@ L'installateur se fermera et les changements seront perdus.</translation>
     <message>
       <location filename="../src/modules/partition/PartitionViewStep.cpp" line="533"/>
       <source>EFI system partition configured incorrectly</source>
-      <translation type="unfinished"/>
+      <translation>Partition système EFI mal configurée</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/PartitionViewStep.cpp" line="538"/>
       <source>An EFI system partition is necessary to start %1.&lt;br/&gt;&lt;br/&gt;To configure an EFI system partition, go back and select or create a suitable filesystem.</source>
-      <translation type="unfinished"/>
+      <translation>Une partition système EFI est nécessaire pour démarrer %1.&lt;br/&gt;&lt;br/&gt;Pour configurer une partition système EFI, revenir en arrière et sélectionner ou créer un système de fichiers approprié.</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/PartitionViewStep.cpp" line="549"/>
       <source>The filesystem must be mounted on &lt;strong&gt;%1&lt;/strong&gt;.</source>
-      <translation type="unfinished"/>
+      <translation>Le système de fichiers doit être monté sur &lt;strong&gt;%1&lt;/strong&gt;.</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/PartitionViewStep.cpp" line="555"/>
       <source>The filesystem must have type FAT32.</source>
-      <translation type="unfinished"/>
+      <translation>Le système de fichiers doit avoir le type FAT32.</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/PartitionViewStep.cpp" line="563"/>
       <source>The filesystem must be at least %1 MiB in size.</source>
-      <translation type="unfinished"/>
+      <translation>Le système de fichiers doit avoir une taille d'au moins %1 Mio.</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/PartitionViewStep.cpp" line="569"/>
       <source>The filesystem must have flag &lt;strong&gt;%1&lt;/strong&gt; set.</source>
-      <translation type="unfinished"/>
+      <translation>Le système de fichiers doit avoir l'indicateur &lt;strong&gt;%1&lt;/strong&gt; défini.</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/PartitionViewStep.cpp" line="575"/>
       <source>You can continue without setting up an EFI system partition but your system may fail to start.</source>
-      <translation type="unfinished"/>
+      <translation>Vous pouvez continuer sans configurer de partition système EFI, mais votre système risque de ne pas démarrer.</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/PartitionViewStep.cpp" line="593"/>
@@ -2963,7 +2963,7 @@ L'installateur se fermera et les changements seront perdus.</translation>
     <message>
       <location filename="../src/modules/partition/PartitionViewStep.cpp" line="594"/>
       <source>A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.&lt;br/&gt;&lt;br/&gt;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 &lt;strong&gt;%2&lt;/strong&gt; flag enabled.&lt;br/&gt;&lt;br/&gt;An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.</source>
-      <translation type="unfinished"/>
+      <translation>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. &lt;br/&gt;&lt;br/&gt;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 &lt;strong&gt;%2&lt;/strong&gt; activé.&lt;br/&gt;&lt;br/&gt;Une partition non formatée de 8 Mo est nécessaire pour démarrer %1 sur un système BIOS avec GPT.</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/PartitionViewStep.cpp" line="626"/>
@@ -3914,12 +3914,12 @@ Sortie
     <message>
       <location filename="../src/modules/umount/UmountJob.cpp" line="124"/>
       <source>No target system available.</source>
-      <translation type="unfinished"/>
+      <translation>Aucun système cible disponible.</translation>
     </message>
     <message>
       <location filename="../src/modules/umount/UmountJob.cpp" line="132"/>
       <source>No rootMountPoint is set.</source>
-      <translation type="unfinished"/>
+      <translation>Aucun point de montage racine n'est défini.</translation>
     </message>
   </context>
   <context>
@@ -4034,61 +4034,56 @@ Sortie
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.ui" line="140"/>
-      <source>&amp;About</source>
-      <translation>&amp;À propos</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="150"/>
       <source>Open donations website</source>
       <translation>Ouvrir le site web de dons</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="143"/>
       <source>&amp;Donate</source>
       <translation>&amp;Donner</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="163"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
       <source>Open help and support website</source>
       <translation>Ouvrir le site web d'aide et support</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="156"/>
       <source>&amp;Support</source>
       <translation>&amp;Support</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="176"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
       <source>Open issues and bug-tracking website</source>
       <translation>Ouvrir les issues et le site de suivi de bugs</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="169"/>
       <source>&amp;Known issues</source>
       <translation>&amp;Problèmes connus</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="189"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
       <source>Open release notes website</source>
       <translation>Ouvrir le site des notes de publication</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="192"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="182"/>
       <source>&amp;Release notes</source>
       <translation>&amp;Notes de publication</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="216"/>
+      <location filename="../src/modules/welcome/WelcomePage.cpp" line="212"/>
       <source>%1 support</source>
       <translation>Support de %1</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="319"/>
       <source>About %1 setup</source>
       <translation>À propos de la configuration de %1</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="320"/>
       <source>About %1 installer</source>
       <translation>À propos de l'installateur %1</translation>
     </message>
@@ -4114,12 +4109,12 @@ Sortie
     <message>
       <location filename="../src/modules/zfs/ZfsJob.cpp" line="101"/>
       <source>Create ZFS pools and datasets</source>
-      <translation type="unfinished"/>
+      <translation>Créer des pools et des jeux de données ZFS</translation>
     </message>
     <message>
       <location filename="../src/modules/zfs/ZfsJob.cpp" line="162"/>
       <source>Failed to create zpool on </source>
-      <translation type="unfinished"/>
+      <translation>Impossible de créer zpool sur</translation>
     </message>
     <message>
       <location filename="../src/modules/zfs/ZfsJob.cpp" line="180"/>
@@ -4129,44 +4124,41 @@ Sortie
     <message>
       <location filename="../src/modules/zfs/ZfsJob.cpp" line="181"/>
       <source>No partitions are available for ZFS.</source>
-      <translation type="unfinished"/>
+      <translation>Aucune partition n'est disponible pour ZFS.</translation>
     </message>
     <message>
       <location filename="../src/modules/zfs/ZfsJob.cpp" line="192"/>
       <source>Internal data missing</source>
-      <translation type="unfinished"/>
+      <translation>Données internes manquantes</translation>
     </message>
     <message>
       <location filename="../src/modules/zfs/ZfsJob.cpp" line="192"/>
       <location filename="../src/modules/zfs/ZfsJob.cpp" line="257"/>
       <source>Failed to create zpool</source>
-      <translation type="unfinished"/>
+      <translation>Impossible de créer zpool</translation>
     </message>
     <message>
       <location filename="../src/modules/zfs/ZfsJob.cpp" line="329"/>
       <source>Failed to create dataset</source>
-      <translation type="unfinished"/>
+      <translation>Échec de la création de l'ensemble de données</translation>
     </message>
     <message>
       <location filename="../src/modules/zfs/ZfsJob.cpp" line="330"/>
       <source>The output was: </source>
-      <translation type="unfinished"/>
+      <translation>La sortie était :</translation>
     </message>
   </context>
   <context>
-    <name>about</name>
+    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/modules/welcomeq/about.qml" line="79"/>
-      <source>Back</source>
-      <translation>Retour</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+      <source>About</source>
+      <translation>À propos</translation>
     </message>
-  </context>
-  <context>
-    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/calamares/calamares-sidebar.qml" line="79"/>
-      <source>Show debug information</source>
-      <translation>Afficher les informations de dépannage</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+      <source>Debug</source>
+      <translation>Débug</translation>
     </message>
   </context>
   <context>
@@ -4212,17 +4204,18 @@ Sortie
       <location filename="../src/modules/finishedq/finishedq@mobile.qml" line="43"/>
       <source>%1 has been installed on your computer.&lt;br/&gt;
             You may now restart your device.</source>
-      <translation type="unfinished"/>
+      <translation>%1 a été installé sur votre ordinateur.&lt;br/&gt;
+            Vous pouvez maintenant redémarrer votre appareil.</translation>
     </message>
     <message>
       <location filename="../src/modules/finishedq/finishedq@mobile.qml" line="65"/>
       <source>Close</source>
-      <translation type="unfinished"/>
+      <translation>Fermer</translation>
     </message>
     <message>
       <location filename="../src/modules/finishedq/finishedq@mobile.qml" line="71"/>
       <source>Restart</source>
-      <translation type="unfinished"/>
+      <translation>Redémarrer</translation>
     </message>
   </context>
   <context>
@@ -4252,7 +4245,7 @@ Sortie
     <message>
       <location filename="../src/modules/keyboardq/keyboardq.qml" line="60"/>
       <source>To activate keyboard preview, select a layout.</source>
-      <translation type="unfinished"/>
+      <translation>Pour activer l'aperçu du clavier, sélectionner une disposition.</translation>
     </message>
     <message>
       <location filename="../src/modules/keyboardq/keyboardq.qml" line="86"/>
@@ -4299,37 +4292,38 @@ Sortie
       <location filename="../src/modules/packagechooserq/packagechooserq.qml" line="45"/>
       <source>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.&lt;br/&gt;
                     Default option.</source>
-      <translation type="unfinished"/>
+      <translation>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é.&lt;br/&gt;
+                    Option par défaut.</translation>
     </message>
     <message>
       <location filename="../src/modules/packagechooserq/packagechooserq.qml" line="59"/>
       <source>LibreOffice</source>
-      <translation type="unfinished"/>
+      <translation>LibreOffice</translation>
     </message>
     <message>
       <location filename="../src/modules/packagechooserq/packagechooserq.qml" line="108"/>
       <source>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.</source>
-      <translation type="unfinished"/>
+      <translation>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.</translation>
     </message>
     <message>
       <location filename="../src/modules/packagechooserq/packagechooserq.qml" line="121"/>
       <source>No Office Suite</source>
-      <translation type="unfinished"/>
+      <translation>Pas de suite bureautique</translation>
     </message>
     <message>
       <location filename="../src/modules/packagechooserq/packagechooserq.qml" line="172"/>
       <source>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.</source>
-      <translation type="unfinished"/>
+      <translation>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.</translation>
     </message>
     <message>
       <location filename="../src/modules/packagechooserq/packagechooserq.qml" line="185"/>
       <source>Minimal Install</source>
-      <translation type="unfinished"/>
+      <translation>Installation minimale</translation>
     </message>
     <message>
       <location filename="../src/modules/packagechooserq/packagechooserq.qml" line="233"/>
       <source>Please select an option for your install, or use the default: LibreOffice included.</source>
-      <translation type="unfinished"/>
+      <translation>Veuillez sélectionner une option pour votre installation, ou utiliser la valeur par défaut : LibreOffice inclus.</translation>
     </message>
   </context>
   <context>
@@ -4529,26 +4523,21 @@ Sortie
     </message>
     <message>
       <location filename="../src/modules/welcomeq/welcomeq.qml" line="66"/>
-      <source>About</source>
-      <translation>À propos</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="80"/>
       <source>Support</source>
       <translation>Support</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="91"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="77"/>
       <source>Known issues</source>
       <translation>Problèmes connus</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="102"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="88"/>
       <source>Release notes</source>
       <translation>Notes de version</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="114"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="100"/>
       <source>Donate</source>
       <translation>Faites un don</translation>
     </message>
diff --git a/lang/calamares_fur.ts b/lang/calamares_fur.ts
index 9ee3148b03be535f407728d778efc871ef8240a4..8cb96ec3278c1fb0cd2fcb621c414b27ee69735b 100644
--- a/lang/calamares_fur.ts
+++ b/lang/calamares_fur.ts
@@ -156,7 +156,7 @@
       <translation>Arbul dai widget</translation>
     </message>
     <message>
-      <location filename="../src/calamares/DebugWindow.cpp" line="239"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="244"/>
       <source>Debug information</source>
       <translation>Informazions di debug</translation>
     </message>
@@ -503,12 +503,12 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.<
   <context>
     <name>CalamaresWindow</name>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="369"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
       <source>%1 Setup Program</source>
       <translation>Program di configurazion di %1</translation>
     </message>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="370"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
       <source>%1 Installer</source>
       <translation>Program di instalazion di %1</translation>
     </message>
@@ -1453,7 +1453,7 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.<
     </message>
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="260"/>
-      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphraseor delete and create a new encrypted partition.</source>
+      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphrase or delete and create a new encrypted partition.</source>
       <translation type="unfinished"/>
     </message>
   </context>
@@ -4018,61 +4018,56 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.ui" line="140"/>
-      <source>&amp;About</source>
-      <translation>&amp;Informazions</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="150"/>
       <source>Open donations website</source>
       <translation>Vierç il sît web pes donazions</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="143"/>
       <source>&amp;Donate</source>
       <translation>&amp;Done</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="163"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
       <source>Open help and support website</source>
       <translation>Vierç il sît web pal jutori e pal supuart</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="156"/>
       <source>&amp;Support</source>
       <translation>&amp;Supuart</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="176"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
       <source>Open issues and bug-tracking website</source>
       <translation>Vierç il sît web sui problemis e lis segnalazions/indizis sui erôrs</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="169"/>
       <source>&amp;Known issues</source>
       <translation>&amp;Problemis cognossûts</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="189"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
       <source>Open release notes website</source>
       <translation>Vierç il sît web des notis di publicazion</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="192"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="182"/>
       <source>&amp;Release notes</source>
       <translation>&amp;Notis di publicazion</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="216"/>
+      <location filename="../src/modules/welcome/WelcomePage.cpp" line="212"/>
       <source>%1 support</source>
       <translation>Supuart di %1</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="319"/>
       <source>About %1 setup</source>
       <translation>Informazions su la configurazion di %1</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="320"/>
       <source>About %1 installer</source>
       <translation>Informazion su la instalazion di %1</translation>
     </message>
@@ -4138,19 +4133,16 @@ Output:
     </message>
   </context>
   <context>
-    <name>about</name>
+    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/modules/welcomeq/about.qml" line="79"/>
-      <source>Back</source>
-      <translation>Indaûr</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+      <source>About</source>
+      <translation>Informazions</translation>
     </message>
-  </context>
-  <context>
-    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/calamares/calamares-sidebar.qml" line="79"/>
-      <source>Show debug information</source>
-      <translation>Mostre informazions di debug</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+      <source>Debug</source>
+      <translation type="unfinished"/>
     </message>
   </context>
   <context>
@@ -4511,26 +4503,21 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcomeq/welcomeq.qml" line="66"/>
-      <source>About</source>
-      <translation>Informazions</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="80"/>
       <source>Support</source>
       <translation>Supuart</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="91"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="77"/>
       <source>Known issues</source>
       <translation>Problemis cognossûts</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="102"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="88"/>
       <source>Release notes</source>
       <translation>Notis di publicazion</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="114"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="100"/>
       <source>Donate</source>
       <translation>Done</translation>
     </message>
diff --git a/lang/calamares_gl.ts b/lang/calamares_gl.ts
index 01daf0ad23bb7fb8cc61083ce27ede6a9d8241ad..d3e9af666be66f5a405851235c380627171e83b6 100644
--- a/lang/calamares_gl.ts
+++ b/lang/calamares_gl.ts
@@ -157,7 +157,7 @@
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/calamares/DebugWindow.cpp" line="239"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="244"/>
       <source>Debug information</source>
       <translation>Informe de depuración de erros.</translation>
     </message>
@@ -503,12 +503,12 @@ O instalador pecharase e perderanse todos os cambios.</translation>
   <context>
     <name>CalamaresWindow</name>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="369"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
       <source>%1 Setup Program</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="370"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
       <source>%1 Installer</source>
       <translation>Instalador de %1</translation>
     </message>
@@ -1453,7 +1453,7 @@ O instalador pecharase e perderanse todos os cambios.</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="260"/>
-      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphraseor delete and create a new encrypted partition.</source>
+      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphrase or delete and create a new encrypted partition.</source>
       <translation type="unfinished"/>
     </message>
   </context>
@@ -4013,61 +4013,56 @@ Saída:
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.ui" line="140"/>
-      <source>&amp;About</source>
-      <translation>&amp;Acerca de</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="150"/>
       <source>Open donations website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="143"/>
       <source>&amp;Donate</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="163"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
       <source>Open help and support website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="156"/>
       <source>&amp;Support</source>
       <translation>&amp;Axuda</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="176"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
       <source>Open issues and bug-tracking website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="169"/>
       <source>&amp;Known issues</source>
       <translation>&amp;Problemas coñecidos</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="189"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
       <source>Open release notes website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="192"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="182"/>
       <source>&amp;Release notes</source>
       <translation>&amp;Notas de publicación</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="216"/>
+      <location filename="../src/modules/welcome/WelcomePage.cpp" line="212"/>
       <source>%1 support</source>
       <translation>%1 axuda</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="319"/>
       <source>About %1 setup</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="320"/>
       <source>About %1 installer</source>
       <translation>Acerca do instalador %1</translation>
     </message>
@@ -4133,19 +4128,16 @@ Saída:
     </message>
   </context>
   <context>
-    <name>about</name>
+    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/modules/welcomeq/about.qml" line="79"/>
-      <source>Back</source>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+      <source>About</source>
       <translation type="unfinished"/>
     </message>
-  </context>
-  <context>
-    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/calamares/calamares-sidebar.qml" line="79"/>
-      <source>Show debug information</source>
-      <translation>Mostrar informes de depuración</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+      <source>Debug</source>
+      <translation type="unfinished"/>
     </message>
   </context>
   <context>
@@ -4482,26 +4474,21 @@ Saída:
     </message>
     <message>
       <location filename="../src/modules/welcomeq/welcomeq.qml" line="66"/>
-      <source>About</source>
-      <translation type="unfinished"/>
-    </message>
-    <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="80"/>
       <source>Support</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="91"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="77"/>
       <source>Known issues</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="102"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="88"/>
       <source>Release notes</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="114"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="100"/>
       <source>Donate</source>
       <translation type="unfinished"/>
     </message>
diff --git a/lang/calamares_gu.ts b/lang/calamares_gu.ts
index d166f6655dc572009188cf346c46d4267af53eb2..f793c18e96a1929618bcf8bad180582a9d98272b 100644
--- a/lang/calamares_gu.ts
+++ b/lang/calamares_gu.ts
@@ -156,7 +156,7 @@
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/calamares/DebugWindow.cpp" line="239"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="244"/>
       <source>Debug information</source>
       <translation type="unfinished"/>
     </message>
@@ -501,12 +501,12 @@ The installer will quit and all changes will be lost.</source>
   <context>
     <name>CalamaresWindow</name>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="369"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
       <source>%1 Setup Program</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="370"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
       <source>%1 Installer</source>
       <translation type="unfinished"/>
     </message>
@@ -1451,7 +1451,7 @@ The installer will quit and all changes will be lost.</source>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="260"/>
-      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphraseor delete and create a new encrypted partition.</source>
+      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphrase or delete and create a new encrypted partition.</source>
       <translation type="unfinished"/>
     </message>
   </context>
@@ -4008,61 +4008,56 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.ui" line="140"/>
-      <source>&amp;About</source>
-      <translation type="unfinished"/>
-    </message>
-    <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="150"/>
       <source>Open donations website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="143"/>
       <source>&amp;Donate</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="163"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
       <source>Open help and support website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="156"/>
       <source>&amp;Support</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="176"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
       <source>Open issues and bug-tracking website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="169"/>
       <source>&amp;Known issues</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="189"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
       <source>Open release notes website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="192"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="182"/>
       <source>&amp;Release notes</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="216"/>
+      <location filename="../src/modules/welcome/WelcomePage.cpp" line="212"/>
       <source>%1 support</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="319"/>
       <source>About %1 setup</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="320"/>
       <source>About %1 installer</source>
       <translation type="unfinished"/>
     </message>
@@ -4128,18 +4123,15 @@ Output:
     </message>
   </context>
   <context>
-    <name>about</name>
+    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/modules/welcomeq/about.qml" line="79"/>
-      <source>Back</source>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+      <source>About</source>
       <translation type="unfinished"/>
     </message>
-  </context>
-  <context>
-    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/calamares/calamares-sidebar.qml" line="79"/>
-      <source>Show debug information</source>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+      <source>Debug</source>
       <translation type="unfinished"/>
     </message>
   </context>
@@ -4477,26 +4469,21 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcomeq/welcomeq.qml" line="66"/>
-      <source>About</source>
-      <translation type="unfinished"/>
-    </message>
-    <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="80"/>
       <source>Support</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="91"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="77"/>
       <source>Known issues</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="102"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="88"/>
       <source>Release notes</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="114"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="100"/>
       <source>Donate</source>
       <translation type="unfinished"/>
     </message>
diff --git a/lang/calamares_he.ts b/lang/calamares_he.ts
index 8d247a41bb58cb45fc9a3de4fde028fc54781e64..e0a741b5b2be10de71703cd58fb4d5078f6327cf 100644
--- a/lang/calamares_he.ts
+++ b/lang/calamares_he.ts
@@ -156,7 +156,7 @@
       <translation>עץ וידג׳טים</translation>
     </message>
     <message>
-      <location filename="../src/calamares/DebugWindow.cpp" line="239"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="244"/>
       <source>Debug information</source>
       <translation>מידע על ניפוי שגיאות</translation>
     </message>
@@ -511,12 +511,12 @@ The installer will quit and all changes will be lost.</source>
   <context>
     <name>CalamaresWindow</name>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="369"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
       <source>%1 Setup Program</source>
       <translation>תכנית התקנת %1</translation>
     </message>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="370"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
       <source>%1 Installer</source>
       <translation>אשף התקנת %1</translation>
     </message>
@@ -1461,7 +1461,7 @@ The installer will quit and all changes will be lost.</source>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="260"/>
-      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphraseor delete and create a new encrypted partition.</source>
+      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphrase or delete and create a new encrypted partition.</source>
       <translation>לא ניתן לפענח את המחיצה %1 עם מילת הצופן שסופקה.&lt;br/&gt;&lt;br/&gt;יש לערוך את המחיצה שוב ולספק את מילת הצופן הנכונה או למחוק וליצור מחיצה מוצפנת חדשה.</translation>
     </message>
   </context>
@@ -4044,61 +4044,56 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.ui" line="140"/>
-      <source>&amp;About</source>
-      <translation>על &amp;אודות</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="150"/>
       <source>Open donations website</source>
       <translation>פתיחת אתר התרומות</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="143"/>
       <source>&amp;Donate</source>
       <translation>&amp;תרומה</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="163"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
       <source>Open help and support website</source>
       <translation>פתיחת אתר העזרה והתמיכה</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="156"/>
       <source>&amp;Support</source>
       <translation>&amp;תמיכה</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="176"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
       <source>Open issues and bug-tracking website</source>
       <translation>פתיחת אתר התקלות והמעקב אחר באגים</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="169"/>
       <source>&amp;Known issues</source>
       <translation>&amp;בעיות נפוצות</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="189"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
       <source>Open release notes website</source>
       <translation>פתיחת האתר עם הערות המהדורה</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="192"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="182"/>
       <source>&amp;Release notes</source>
       <translation>ה&amp;ערות מהדורה</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="216"/>
+      <location filename="../src/modules/welcome/WelcomePage.cpp" line="212"/>
       <source>%1 support</source>
       <translation>תמיכה ב־%1</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="319"/>
       <source>About %1 setup</source>
       <translation>על אודות התקנת %1</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="320"/>
       <source>About %1 installer</source>
       <translation>על אודות התקנת %1</translation>
     </message>
@@ -4164,19 +4159,16 @@ Output:
     </message>
   </context>
   <context>
-    <name>about</name>
+    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/modules/welcomeq/about.qml" line="79"/>
-      <source>Back</source>
-      <translation>חזרה</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+      <source>About</source>
+      <translation>על אודות</translation>
     </message>
-  </context>
-  <context>
-    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/calamares/calamares-sidebar.qml" line="79"/>
-      <source>Show debug information</source>
-      <translation>הצגת מידע ניפוי שגיאות</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+      <source>Debug</source>
+      <translation>ניפוי שגיאות</translation>
     </message>
   </context>
   <context>
@@ -4541,26 +4533,21 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcomeq/welcomeq.qml" line="66"/>
-      <source>About</source>
-      <translation>על אודות</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="80"/>
       <source>Support</source>
       <translation>תמיכה</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="91"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="77"/>
       <source>Known issues</source>
       <translation>בעיות נפוצות</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="102"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="88"/>
       <source>Release notes</source>
       <translation>הערות מהדורה</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="114"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="100"/>
       <source>Donate</source>
       <translation>תרומה</translation>
     </message>
diff --git a/lang/calamares_hi.ts b/lang/calamares_hi.ts
index ebe9d431d2ed3d04be0163ded7caa8c11d04a062..2e61ae44364fc6225ee13d2c3bc2da0fc314acf8 100644
--- a/lang/calamares_hi.ts
+++ b/lang/calamares_hi.ts
@@ -156,7 +156,7 @@
       <translation>विजेट ट्री</translation>
     </message>
     <message>
-      <location filename="../src/calamares/DebugWindow.cpp" line="239"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="244"/>
       <source>Debug information</source>
       <translation>डीबग संबंधी जानकारी</translation>
     </message>
@@ -507,12 +507,12 @@ The installer will quit and all changes will be lost.</source>
   <context>
     <name>CalamaresWindow</name>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="369"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
       <source>%1 Setup Program</source>
       <translation>%1 सेटअप प्रोग्राम</translation>
     </message>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="370"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
       <source>%1 Installer</source>
       <translation>%1 इंस्टॉलर</translation>
     </message>
@@ -1457,7 +1457,7 @@ The installer will quit and all changes will be lost.</source>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="260"/>
-      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphraseor delete and create a new encrypted partition.</source>
+      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphrase or delete and create a new encrypted partition.</source>
       <translation type="unfinished"/>
     </message>
   </context>
@@ -4022,61 +4022,56 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.ui" line="140"/>
-      <source>&amp;About</source>
-      <translation>बारे में (&amp;A)</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="150"/>
       <source>Open donations website</source>
       <translation>दान हेतु वेबसाइट खोलें</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="143"/>
       <source>&amp;Donate</source>
       <translation>दान करें (&amp;D)</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="163"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
       <source>Open help and support website</source>
       <translation>सहायता हेतु वेबसाइट खोलें</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="156"/>
       <source>&amp;Support</source>
       <translation>सहायता (&amp;S)</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="176"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
       <source>Open issues and bug-tracking website</source>
       <translation>समस्या व त्रुति निगरानी की वेबसाइट खोलें</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="169"/>
       <source>&amp;Known issues</source>
       <translation>ज्ञात समस्याएँ (&amp;K)</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="189"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
       <source>Open release notes website</source>
       <translation>प्रकाशन नोट्स हेतु वेबसाइट खोलें</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="192"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="182"/>
       <source>&amp;Release notes</source>
       <translation>रिलीज़ नोट्स (&amp;R)</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="216"/>
+      <location filename="../src/modules/welcome/WelcomePage.cpp" line="212"/>
       <source>%1 support</source>
       <translation>%1 सहायता</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="319"/>
       <source>About %1 setup</source>
       <translation>%1 सेटअप के बारे में</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="320"/>
       <source>About %1 installer</source>
       <translation>%1 इंस्टॉलर के बारे में</translation>
     </message>
@@ -4142,19 +4137,16 @@ Output:
     </message>
   </context>
   <context>
-    <name>about</name>
+    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/modules/welcomeq/about.qml" line="79"/>
-      <source>Back</source>
-      <translation>वापस</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+      <source>About</source>
+      <translation>बारे में</translation>
     </message>
-  </context>
-  <context>
-    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/calamares/calamares-sidebar.qml" line="79"/>
-      <source>Show debug information</source>
-      <translation>डीबग संबंधी जानकारी दिखाएँ</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+      <source>Debug</source>
+      <translation type="unfinished"/>
     </message>
   </context>
   <context>
@@ -4519,26 +4511,21 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcomeq/welcomeq.qml" line="66"/>
-      <source>About</source>
-      <translation>बारे में</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="80"/>
       <source>Support</source>
       <translation>सहायता</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="91"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="77"/>
       <source>Known issues</source>
       <translation>ज्ञात समस्याएँ</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="102"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="88"/>
       <source>Release notes</source>
       <translation>रिलीज़ नोट्स</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="114"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="100"/>
       <source>Donate</source>
       <translation>दान करें</translation>
     </message>
diff --git a/lang/calamares_hr.ts b/lang/calamares_hr.ts
index 8a9ae8d55038d7fc3089335dd2fbac311f0baa26..905f95d1563a200bebc51f0ee52d25bcd399b6b0 100644
--- a/lang/calamares_hr.ts
+++ b/lang/calamares_hr.ts
@@ -6,18 +6,18 @@
     <message>
       <location filename="../src/libcalamares/CalamaresAbout.cpp" line="17"/>
       <source>&lt;h1&gt;%1&lt;/h1&gt;&lt;br/&gt;&lt;strong&gt;%2&lt;br/&gt; for %3&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;</source>
-      <translation type="unfinished"/>
+      <translation>&lt;h1&gt;%1&lt;/h1&gt;&lt;br/&gt;&lt;strong&gt;%2&lt;br/&gt;for %3&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;</translation>
     </message>
     <message>
       <location filename="../src/libcalamares/CalamaresAbout.cpp" line="20"/>
       <source>Thanks to &lt;a href="https://calamares.io/team/"&gt;the Calamares team&lt;/a&gt; and the &lt;a href="https://www.transifex.com/calamares/calamares/"&gt;Calamares translators team&lt;/a&gt;.&lt;br/&gt;&lt;br/&gt;&lt;a href="https://calamares.io/"&gt;Calamares&lt;/a&gt; development is sponsored by &lt;br/&gt;&lt;a href="http://www.blue-systems.com/"&gt;Blue Systems&lt;/a&gt; - Liberating Software.</source>
-      <translation type="unfinished"/>
+      <translation>Hvala &lt;a href="https://calamares.io/team/"&gt;Calamares timu&lt;/a&gt; i &lt;a href="https://www.transifex.com/calamares/calamares/"&gt;Calamares timu za prevođenje&lt;/a&gt;.&lt;br/&gt;&lt;br/&gt;&lt;a href="https://calamares.io/"&gt;Calamares&lt;/a&gt; sponzorira&lt;br/&gt;&lt;a href="http://www.blue-systems.com/"&gt; Blue Systems&lt;/a&gt; - Liberating Software.</translation>
     </message>
     <message>
       <location filename="../src/libcalamares/CalamaresAbout.cpp" line="38"/>
       <source>Copyright %1-%2 %3 &amp;lt;%4&amp;gt;&lt;br/&gt;</source>
       <extracomment>Copyright year-year Name &lt;email-address&gt;</extracomment>
-      <translation type="unfinished"/>
+      <translation>Copyright %1-%2 %3 &amp;lt;%4&amp;gt;&lt;br/&gt;</translation>
     </message>
   </context>
   <context>
@@ -156,7 +156,7 @@
       <translation>Stablo widgeta</translation>
     </message>
     <message>
-      <location filename="../src/calamares/DebugWindow.cpp" line="239"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="244"/>
       <source>Debug information</source>
       <translation>Debug informacija</translation>
     </message>
@@ -509,12 +509,12 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.</translatio
   <context>
     <name>CalamaresWindow</name>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="369"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
       <source>%1 Setup Program</source>
       <translation>%1 instalacijski program</translation>
     </message>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="370"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
       <source>%1 Installer</source>
       <translation>%1 Instalacijski program</translation>
     </message>
@@ -1455,12 +1455,12 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.</translatio
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="259"/>
       <source>Passphrase for existing partition</source>
-      <translation type="unfinished"/>
+      <translation>Šifra za postojeću particiju</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="260"/>
-      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphraseor delete and create a new encrypted partition.</source>
-      <translation type="unfinished"/>
+      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphrase or delete and create a new encrypted partition.</source>
+      <translation>Particija %1 nije se mogla dešifrirati s danom šifrom. &lt;br/&gt;&lt;br/&gt;Ponovno uredite particiju i dajte ispravnu šifru ili izbrišite i kreirajte novu šifriranu particiju.</translation>
     </message>
   </context>
   <context>
@@ -4033,61 +4033,56 @@ Postavljanje se može nastaviti, ali neke će značajke možda biti onemogućene
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.ui" line="140"/>
-      <source>&amp;About</source>
-      <translation>&amp;O programu</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="150"/>
       <source>Open donations website</source>
       <translation>Otvorite web mjesto za donacije</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="143"/>
       <source>&amp;Donate</source>
       <translation>&amp;Doniraj</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="163"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
       <source>Open help and support website</source>
       <translation>Otvorite web mjesto za pomoć i podršku</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="156"/>
       <source>&amp;Support</source>
       <translation>&amp;Podrška</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="176"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
       <source>Open issues and bug-tracking website</source>
       <translation>Otvorene web mjesto za praćenje bugova i poteškoća</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="169"/>
       <source>&amp;Known issues</source>
       <translation>&amp;Poznati problemi</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="189"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
       <source>Open release notes website</source>
       <translation>Otvorite web mjesto s bilješkama izdanja</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="192"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="182"/>
       <source>&amp;Release notes</source>
       <translation>&amp;Napomene o izdanju</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="216"/>
+      <location filename="../src/modules/welcome/WelcomePage.cpp" line="212"/>
       <source>%1 support</source>
       <translation>%1 podrška</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="319"/>
       <source>About %1 setup</source>
       <translation>O %1 instalacijskom programu</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="320"/>
       <source>About %1 installer</source>
       <translation>O %1 instalacijskom programu</translation>
     </message>
@@ -4153,19 +4148,16 @@ Postavljanje se može nastaviti, ali neke će značajke možda biti onemogućene
     </message>
   </context>
   <context>
-    <name>about</name>
+    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/modules/welcomeq/about.qml" line="79"/>
-      <source>Back</source>
-      <translation>Natrag</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+      <source>About</source>
+      <translation>O programu</translation>
     </message>
-  </context>
-  <context>
-    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/calamares/calamares-sidebar.qml" line="79"/>
-      <source>Show debug information</source>
-      <translation>Prikaži debug informaciju</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+      <source>Debug</source>
+      <translation>Uklanjanje grešaka</translation>
     </message>
   </context>
   <context>
@@ -4529,26 +4521,21 @@ Postavke regije utječu na format brojeva i datuma. Trenutne postavke su &lt;str
     </message>
     <message>
       <location filename="../src/modules/welcomeq/welcomeq.qml" line="66"/>
-      <source>About</source>
-      <translation>O programu</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="80"/>
       <source>Support</source>
       <translation>Podrška</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="91"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="77"/>
       <source>Known issues</source>
       <translation>Poznati problemi</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="102"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="88"/>
       <source>Release notes</source>
       <translation>Bilješke o izdanju</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="114"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="100"/>
       <source>Donate</source>
       <translation>Doniraj</translation>
     </message>
diff --git a/lang/calamares_hu.ts b/lang/calamares_hu.ts
index 833b47e049920e627736597faaac5af543a24c6c..835df7d784b86398efa5108bc8d26f1cb2537003 100644
--- a/lang/calamares_hu.ts
+++ b/lang/calamares_hu.ts
@@ -156,7 +156,7 @@
       <translation>Modul- fa</translation>
     </message>
     <message>
-      <location filename="../src/calamares/DebugWindow.cpp" line="239"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="244"/>
       <source>Debug information</source>
       <translation>Hibakeresési információk</translation>
     </message>
@@ -503,12 +503,12 @@ Minden változtatás elveszik, ha kilépsz a telepítőből.</translation>
   <context>
     <name>CalamaresWindow</name>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="369"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
       <source>%1 Setup Program</source>
       <translation>%1 Program telepítése</translation>
     </message>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="370"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
       <source>%1 Installer</source>
       <translation>%1 Telepítő</translation>
     </message>
@@ -1454,7 +1454,7 @@ Telepítés nem folytatható. &lt;a href="#details"&gt;Részletek...&lt;/a&gt;</
     </message>
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="260"/>
-      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphraseor delete and create a new encrypted partition.</source>
+      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphrase or delete and create a new encrypted partition.</source>
       <translation type="unfinished"/>
     </message>
   </context>
@@ -4015,61 +4015,56 @@ Calamares hiba %1.</translation>
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.ui" line="140"/>
-      <source>&amp;About</source>
-      <translation>&amp;Névjegy</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="150"/>
       <source>Open donations website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="143"/>
       <source>&amp;Donate</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="163"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
       <source>Open help and support website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="156"/>
       <source>&amp;Support</source>
       <translation>&amp;Támogatás</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="176"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
       <source>Open issues and bug-tracking website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="169"/>
       <source>&amp;Known issues</source>
       <translation>&amp;Ismert hibák</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="189"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
       <source>Open release notes website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="192"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="182"/>
       <source>&amp;Release notes</source>
       <translation>&amp;Kiadási megjegyzések</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="216"/>
+      <location filename="../src/modules/welcome/WelcomePage.cpp" line="212"/>
       <source>%1 support</source>
       <translation>%1 támogatás</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="319"/>
       <source>About %1 setup</source>
       <translation>A %1 telepítőről.</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="320"/>
       <source>About %1 installer</source>
       <translation>A %1 telepítőről</translation>
     </message>
@@ -4135,19 +4130,16 @@ Calamares hiba %1.</translation>
     </message>
   </context>
   <context>
-    <name>about</name>
+    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/modules/welcomeq/about.qml" line="79"/>
-      <source>Back</source>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+      <source>About</source>
       <translation type="unfinished"/>
     </message>
-  </context>
-  <context>
-    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/calamares/calamares-sidebar.qml" line="79"/>
-      <source>Show debug information</source>
-      <translation>Hibakeresési információk mutatása</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+      <source>Debug</source>
+      <translation>Hibakeresés</translation>
     </message>
   </context>
   <context>
@@ -4484,26 +4476,21 @@ Calamares hiba %1.</translation>
     </message>
     <message>
       <location filename="../src/modules/welcomeq/welcomeq.qml" line="66"/>
-      <source>About</source>
-      <translation type="unfinished"/>
-    </message>
-    <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="80"/>
       <source>Support</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="91"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="77"/>
       <source>Known issues</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="102"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="88"/>
       <source>Release notes</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="114"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="100"/>
       <source>Donate</source>
       <translation type="unfinished"/>
     </message>
diff --git a/lang/calamares_id.ts b/lang/calamares_id.ts
index 0deba5826d6eb9f355b43644e8dc13e7e3f371bb..676de374edd36c26b14f2db7bb5a3f410393bad0 100644
--- a/lang/calamares_id.ts
+++ b/lang/calamares_id.ts
@@ -156,7 +156,7 @@
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/calamares/DebugWindow.cpp" line="239"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="244"/>
       <source>Debug information</source>
       <translation>Informasi debug</translation>
     </message>
@@ -500,12 +500,12 @@ Instalasi akan ditutup dan semua perubahan akan hilang.</translation>
   <context>
     <name>CalamaresWindow</name>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="369"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
       <source>%1 Setup Program</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="370"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
       <source>%1 Installer</source>
       <translation>Installer %1</translation>
     </message>
@@ -1451,7 +1451,7 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.</translat
     </message>
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="260"/>
-      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphraseor delete and create a new encrypted partition.</source>
+      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphrase or delete and create a new encrypted partition.</source>
       <translation type="unfinished"/>
     </message>
   </context>
@@ -4002,61 +4002,56 @@ Keluaran:
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.ui" line="140"/>
-      <source>&amp;About</source>
-      <translation>&amp;Tentang</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="150"/>
       <source>Open donations website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="143"/>
       <source>&amp;Donate</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="163"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
       <source>Open help and support website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="156"/>
       <source>&amp;Support</source>
       <translation>&amp;Dukungan</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="176"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
       <source>Open issues and bug-tracking website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="169"/>
       <source>&amp;Known issues</source>
       <translation>&amp;Isu-isu yang diketahui</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="189"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
       <source>Open release notes website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="192"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="182"/>
       <source>&amp;Release notes</source>
       <translation>&amp;Catatan rilis</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="216"/>
+      <location filename="../src/modules/welcome/WelcomePage.cpp" line="212"/>
       <source>%1 support</source>
       <translation>Dukungan %1</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="319"/>
       <source>About %1 setup</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="320"/>
       <source>About %1 installer</source>
       <translation>Tentang installer %1</translation>
     </message>
@@ -4122,19 +4117,16 @@ Keluaran:
     </message>
   </context>
   <context>
-    <name>about</name>
+    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/modules/welcomeq/about.qml" line="79"/>
-      <source>Back</source>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+      <source>About</source>
       <translation type="unfinished"/>
     </message>
-  </context>
-  <context>
-    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/calamares/calamares-sidebar.qml" line="79"/>
-      <source>Show debug information</source>
-      <translation>Tampilkan informasi debug</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+      <source>Debug</source>
+      <translation>Debug</translation>
     </message>
   </context>
   <context>
@@ -4471,26 +4463,21 @@ Keluaran:
     </message>
     <message>
       <location filename="../src/modules/welcomeq/welcomeq.qml" line="66"/>
-      <source>About</source>
-      <translation type="unfinished"/>
-    </message>
-    <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="80"/>
       <source>Support</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="91"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="77"/>
       <source>Known issues</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="102"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="88"/>
       <source>Release notes</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="114"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="100"/>
       <source>Donate</source>
       <translation type="unfinished"/>
     </message>
diff --git a/lang/calamares_ie.ts b/lang/calamares_ie.ts
index 161f152d7537e8d644bc2ee9897ecaf84e8a4583..b7d08ce7e1c7e34239de8ead316b96391b6faeaa 100644
--- a/lang/calamares_ie.ts
+++ b/lang/calamares_ie.ts
@@ -156,7 +156,7 @@
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/calamares/DebugWindow.cpp" line="239"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="244"/>
       <source>Debug information</source>
       <translation type="unfinished"/>
     </message>
@@ -501,12 +501,12 @@ The installer will quit and all changes will be lost.</source>
   <context>
     <name>CalamaresWindow</name>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="369"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
       <source>%1 Setup Program</source>
       <translation>Configiration de %1</translation>
     </message>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="370"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
       <source>%1 Installer</source>
       <translation>Installator de %1</translation>
     </message>
@@ -1451,7 +1451,7 @@ The installer will quit and all changes will be lost.</source>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="260"/>
-      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphraseor delete and create a new encrypted partition.</source>
+      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphrase or delete and create a new encrypted partition.</source>
       <translation type="unfinished"/>
     </message>
   </context>
@@ -4008,61 +4008,56 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.ui" line="140"/>
-      <source>&amp;About</source>
-      <translation>&amp;Pri</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="150"/>
       <source>Open donations website</source>
       <translation>Aperter li website por donationes</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="143"/>
       <source>&amp;Donate</source>
       <translation>&amp;Donar</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="163"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
       <source>Open help and support website</source>
       <translation>Aperter li website de auxilie e suporte</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="156"/>
       <source>&amp;Support</source>
       <translation>&amp;Suporte</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="176"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
       <source>Open issues and bug-tracking website</source>
       <translation>Aperter li website de control de defectes</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="169"/>
       <source>&amp;Known issues</source>
       <translation>&amp;Conosset problemas</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="189"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
       <source>Open release notes website</source>
       <translation>Aperter li website con notes por ti-ci version</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="192"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="182"/>
       <source>&amp;Release notes</source>
       <translation>&amp;Notes del version</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="216"/>
+      <location filename="../src/modules/welcome/WelcomePage.cpp" line="212"/>
       <source>%1 support</source>
       <translation>Suporte de %1</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="319"/>
       <source>About %1 setup</source>
       <translation>Pri li configurator de %1</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="320"/>
       <source>About %1 installer</source>
       <translation>Pri li installator de %1</translation>
     </message>
@@ -4128,18 +4123,15 @@ Output:
     </message>
   </context>
   <context>
-    <name>about</name>
+    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/modules/welcomeq/about.qml" line="79"/>
-      <source>Back</source>
-      <translation>Retro</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+      <source>About</source>
+      <translation>Pri</translation>
     </message>
-  </context>
-  <context>
-    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/calamares/calamares-sidebar.qml" line="79"/>
-      <source>Show debug information</source>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+      <source>Debug</source>
       <translation type="unfinished"/>
     </message>
   </context>
@@ -4477,26 +4469,21 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcomeq/welcomeq.qml" line="66"/>
-      <source>About</source>
-      <translation>Pri</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="80"/>
       <source>Support</source>
       <translation>Suporte</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="91"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="77"/>
       <source>Known issues</source>
       <translation>Conosset problemas</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="102"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="88"/>
       <source>Release notes</source>
       <translation>Notes del version</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="114"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="100"/>
       <source>Donate</source>
       <translation>Donar</translation>
     </message>
diff --git a/lang/calamares_is.ts b/lang/calamares_is.ts
index 1686617a9557e4aa81d01cb262e316a909d6a8a9..451cb1a0484e4b7aa31f62403cc8f18de0917fe7 100644
--- a/lang/calamares_is.ts
+++ b/lang/calamares_is.ts
@@ -156,7 +156,7 @@
       <translation>Greinar viðmótshluta</translation>
     </message>
     <message>
-      <location filename="../src/calamares/DebugWindow.cpp" line="239"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="244"/>
       <source>Debug information</source>
       <translation>Villuleitarupplýsingar</translation>
     </message>
@@ -502,12 +502,12 @@ Uppsetningarforritið mun hætta og allar breytingar tapast.</translation>
   <context>
     <name>CalamaresWindow</name>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="369"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
       <source>%1 Setup Program</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="370"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
       <source>%1 Installer</source>
       <translation>%1 uppsetningarforrit</translation>
     </message>
@@ -1452,7 +1452,7 @@ Uppsetningarforritið mun hætta og allar breytingar tapast.</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="260"/>
-      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphraseor delete and create a new encrypted partition.</source>
+      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphrase or delete and create a new encrypted partition.</source>
       <translation type="unfinished"/>
     </message>
   </context>
@@ -4009,61 +4009,56 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.ui" line="140"/>
-      <source>&amp;About</source>
-      <translation>&amp;Um</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="150"/>
       <source>Open donations website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="143"/>
       <source>&amp;Donate</source>
       <translation>Styr&amp;kja</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="163"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
       <source>Open help and support website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="156"/>
       <source>&amp;Support</source>
       <translation>&amp;Stuðningur</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="176"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
       <source>Open issues and bug-tracking website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="169"/>
       <source>&amp;Known issues</source>
       <translation>&amp;Þekktir gallar</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="189"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
       <source>Open release notes website</source>
       <translation>Opna vefsvæði með upplýsingum um útgáfuna</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="192"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="182"/>
       <source>&amp;Release notes</source>
       <translation>&amp;Um útgáfu</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="216"/>
+      <location filename="../src/modules/welcome/WelcomePage.cpp" line="212"/>
       <source>%1 support</source>
       <translation>%1 stuðningur</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="319"/>
       <source>About %1 setup</source>
       <translation>Um %1 uppsetninguna</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="320"/>
       <source>About %1 installer</source>
       <translation>Um %1 uppsetningarforrrit</translation>
     </message>
@@ -4129,19 +4124,16 @@ Output:
     </message>
   </context>
   <context>
-    <name>about</name>
+    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/modules/welcomeq/about.qml" line="79"/>
-      <source>Back</source>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+      <source>About</source>
       <translation type="unfinished"/>
     </message>
-  </context>
-  <context>
-    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/calamares/calamares-sidebar.qml" line="79"/>
-      <source>Show debug information</source>
-      <translation>Birta villuleitarupplýsingar</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+      <source>Debug</source>
+      <translation type="unfinished"/>
     </message>
   </context>
   <context>
@@ -4478,26 +4470,21 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcomeq/welcomeq.qml" line="66"/>
-      <source>About</source>
-      <translation type="unfinished"/>
-    </message>
-    <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="80"/>
       <source>Support</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="91"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="77"/>
       <source>Known issues</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="102"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="88"/>
       <source>Release notes</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="114"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="100"/>
       <source>Donate</source>
       <translation type="unfinished"/>
     </message>
diff --git a/lang/calamares_it_IT.ts b/lang/calamares_it_IT.ts
index e6aa3f65cab63ac69bc780b1d0106316b2b33693..f49e78b43312bdc519c4d90fafd5ac464cd09af9 100644
--- a/lang/calamares_it_IT.ts
+++ b/lang/calamares_it_IT.ts
@@ -11,7 +11,7 @@
     <message>
       <location filename="../src/libcalamares/CalamaresAbout.cpp" line="20"/>
       <source>Thanks to &lt;a href="https://calamares.io/team/"&gt;the Calamares team&lt;/a&gt; and the &lt;a href="https://www.transifex.com/calamares/calamares/"&gt;Calamares translators team&lt;/a&gt;.&lt;br/&gt;&lt;br/&gt;&lt;a href="https://calamares.io/"&gt;Calamares&lt;/a&gt; development is sponsored by &lt;br/&gt;&lt;a href="http://www.blue-systems.com/"&gt;Blue Systems&lt;/a&gt; - Liberating Software.</source>
-      <translation type="unfinished"/>
+      <translation>Grazie al &lt;a href="https://calamares.io/team/"&gt;team di Calamares&lt;/a&gt; e ai &lt;a href="https://www.transifex.com/calamares/calamares/"&gt;traduttori di Calamares&lt;/a&gt;.&lt;br/&gt;&lt;br/&gt;&lt;a href="https://calamares.io/"&gt;Lo sviluppo di Calamares&lt;/a&gt;e' sponsorizzato da&lt;br/&gt;&lt;a href="http://www.blue-systems.com/"&gt;Blue Systems e &lt;/a&gt;Liberating Software</translation>
     </message>
     <message>
       <location filename="../src/libcalamares/CalamaresAbout.cpp" line="38"/>
@@ -156,7 +156,7 @@
       <translation>Albero dei Widget</translation>
     </message>
     <message>
-      <location filename="../src/calamares/DebugWindow.cpp" line="239"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="244"/>
       <source>Debug information</source>
       <translation>Informazioni di debug</translation>
     </message>
@@ -504,12 +504,12 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse
   <context>
     <name>CalamaresWindow</name>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="369"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
       <source>%1 Setup Program</source>
       <translation>%1 Programma d'installazione</translation>
     </message>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="370"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
       <source>%1 Installer</source>
       <translation>%1 Programma di installazione</translation>
     </message>
@@ -1454,7 +1454,7 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse
     </message>
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="260"/>
-      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphraseor delete and create a new encrypted partition.</source>
+      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphrase or delete and create a new encrypted partition.</source>
       <translation type="unfinished"/>
     </message>
   </context>
@@ -4023,61 +4023,56 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.ui" line="140"/>
-      <source>&amp;About</source>
-      <translation>&amp;Informazioni su</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="150"/>
       <source>Open donations website</source>
       <translation>Apri il sito web per le donazioni</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="143"/>
       <source>&amp;Donate</source>
       <translation>&amp;Donazioni</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="163"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
       <source>Open help and support website</source>
       <translation>Apri il sito web per l'aiuto ed il supporto</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="156"/>
       <source>&amp;Support</source>
       <translation>&amp;Supporto</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="176"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
       <source>Open issues and bug-tracking website</source>
       <translation>Apri il sito per la gestione di problemi e bug</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="169"/>
       <source>&amp;Known issues</source>
       <translation>&amp;Problemi conosciuti</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="189"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
       <source>Open release notes website</source>
       <translation>Apri il sito web delle note di rilascio</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="192"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="182"/>
       <source>&amp;Release notes</source>
       <translation>&amp;Note di rilascio</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="216"/>
+      <location filename="../src/modules/welcome/WelcomePage.cpp" line="212"/>
       <source>%1 support</source>
       <translation>supporto %1</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="319"/>
       <source>About %1 setup</source>
       <translation>Informazioni sul sistema di configurazione %1</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="320"/>
       <source>About %1 installer</source>
       <translation>Informazioni sul programma di installazione %1</translation>
     </message>
@@ -4143,19 +4138,16 @@ Output:
     </message>
   </context>
   <context>
-    <name>about</name>
+    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/modules/welcomeq/about.qml" line="79"/>
-      <source>Back</source>
-      <translation>Indietro</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+      <source>About</source>
+      <translation>Informazioni su</translation>
     </message>
-  </context>
-  <context>
-    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/calamares/calamares-sidebar.qml" line="79"/>
-      <source>Show debug information</source>
-      <translation>Mostra le informazioni di debug</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+      <source>Debug</source>
+      <translation>Debug</translation>
     </message>
   </context>
   <context>
@@ -4514,26 +4506,21 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcomeq/welcomeq.qml" line="66"/>
-      <source>About</source>
-      <translation>Informazioni su</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="80"/>
       <source>Support</source>
       <translation>Supporto</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="91"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="77"/>
       <source>Known issues</source>
       <translation>Problemi conosciuti</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="102"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="88"/>
       <source>Release notes</source>
       <translation>Note di rilascio</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="114"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="100"/>
       <source>Donate</source>
       <translation>Donazioni</translation>
     </message>
diff --git a/lang/calamares_ja-Hira.ts b/lang/calamares_ja-Hira.ts
index 10dd88794a207c20a19ab490cb232befeec5a1d5..50326192be80a5c495c45acebcf2b07d9a7c71e5 100644
--- a/lang/calamares_ja-Hira.ts
+++ b/lang/calamares_ja-Hira.ts
@@ -156,7 +156,7 @@
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/calamares/DebugWindow.cpp" line="239"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="244"/>
       <source>Debug information</source>
       <translation type="unfinished"/>
     </message>
@@ -499,12 +499,12 @@ The installer will quit and all changes will be lost.</source>
   <context>
     <name>CalamaresWindow</name>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="369"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
       <source>%1 Setup Program</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="370"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
       <source>%1 Installer</source>
       <translation type="unfinished"/>
     </message>
@@ -1449,7 +1449,7 @@ The installer will quit and all changes will be lost.</source>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="260"/>
-      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphraseor delete and create a new encrypted partition.</source>
+      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphrase or delete and create a new encrypted partition.</source>
       <translation type="unfinished"/>
     </message>
   </context>
@@ -3997,61 +3997,56 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.ui" line="140"/>
-      <source>&amp;About</source>
-      <translation type="unfinished"/>
-    </message>
-    <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="150"/>
       <source>Open donations website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="143"/>
       <source>&amp;Donate</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="163"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
       <source>Open help and support website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="156"/>
       <source>&amp;Support</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="176"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
       <source>Open issues and bug-tracking website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="169"/>
       <source>&amp;Known issues</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="189"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
       <source>Open release notes website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="192"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="182"/>
       <source>&amp;Release notes</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="216"/>
+      <location filename="../src/modules/welcome/WelcomePage.cpp" line="212"/>
       <source>%1 support</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="319"/>
       <source>About %1 setup</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="320"/>
       <source>About %1 installer</source>
       <translation type="unfinished"/>
     </message>
@@ -4117,18 +4112,15 @@ Output:
     </message>
   </context>
   <context>
-    <name>about</name>
+    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/modules/welcomeq/about.qml" line="79"/>
-      <source>Back</source>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+      <source>About</source>
       <translation type="unfinished"/>
     </message>
-  </context>
-  <context>
-    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/calamares/calamares-sidebar.qml" line="79"/>
-      <source>Show debug information</source>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+      <source>Debug</source>
       <translation type="unfinished"/>
     </message>
   </context>
@@ -4466,26 +4458,21 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcomeq/welcomeq.qml" line="66"/>
-      <source>About</source>
-      <translation type="unfinished"/>
-    </message>
-    <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="80"/>
       <source>Support</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="91"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="77"/>
       <source>Known issues</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="102"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="88"/>
       <source>Release notes</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="114"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="100"/>
       <source>Donate</source>
       <translation type="unfinished"/>
     </message>
diff --git a/lang/calamares_ja.ts b/lang/calamares_ja.ts
index 375fe8834dd3ceb617145a5cfc4f7169dae4e15e..21034d5f09a50b83e715d9d674b327978efec1e4 100644
--- a/lang/calamares_ja.ts
+++ b/lang/calamares_ja.ts
@@ -6,18 +6,18 @@
     <message>
       <location filename="../src/libcalamares/CalamaresAbout.cpp" line="17"/>
       <source>&lt;h1&gt;%1&lt;/h1&gt;&lt;br/&gt;&lt;strong&gt;%2&lt;br/&gt; for %3&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;</source>
-      <translation type="unfinished"/>
+      <translation>&lt;h1&gt;%1&lt;/h1&gt;&lt;br/&gt;&lt;strong&gt;%2&lt;br/&gt; for %3&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;</translation>
     </message>
     <message>
       <location filename="../src/libcalamares/CalamaresAbout.cpp" line="20"/>
       <source>Thanks to &lt;a href="https://calamares.io/team/"&gt;the Calamares team&lt;/a&gt; and the &lt;a href="https://www.transifex.com/calamares/calamares/"&gt;Calamares translators team&lt;/a&gt;.&lt;br/&gt;&lt;br/&gt;&lt;a href="https://calamares.io/"&gt;Calamares&lt;/a&gt; development is sponsored by &lt;br/&gt;&lt;a href="http://www.blue-systems.com/"&gt;Blue Systems&lt;/a&gt; - Liberating Software.</source>
-      <translation type="unfinished"/>
+      <translation>&lt;a href="https://calamares.io/team/"&gt;Calamares チーム&lt;/a&gt;と &lt;a href="https://www.transifex.com/calamares/calamares/"&gt;Calamares 翻訳チーム&lt;/a&gt;に感謝します。 &lt;br/&gt;&lt;br/&gt;&lt;a href="https://calamares.io/"&gt;Calamares&lt;/a&gt; の開発は、&lt;br/&gt;&lt;a href="http://www.blue-systems.com/"&gt;Blue Systems&lt;/a&gt; - Liberating Software が後援しています。</translation>
     </message>
     <message>
       <location filename="../src/libcalamares/CalamaresAbout.cpp" line="38"/>
       <source>Copyright %1-%2 %3 &amp;lt;%4&amp;gt;&lt;br/&gt;</source>
       <extracomment>Copyright year-year Name &lt;email-address&gt;</extracomment>
-      <translation type="unfinished"/>
+      <translation>Copyright %1-%2 %3 &amp;lt;%4&amp;gt;&lt;br/&gt;</translation>
     </message>
   </context>
   <context>
@@ -156,7 +156,7 @@
       <translation>ウィジェットツリー</translation>
     </message>
     <message>
-      <location filename="../src/calamares/DebugWindow.cpp" line="239"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="244"/>
       <source>Debug information</source>
       <translation>デバッグ情報</translation>
     </message>
@@ -505,12 +505,12 @@ The installer will quit and all changes will be lost.</source>
   <context>
     <name>CalamaresWindow</name>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="369"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
       <source>%1 Setup Program</source>
       <translation>%1 セットアッププログラム</translation>
     </message>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="370"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
       <source>%1 Installer</source>
       <translation>%1 インストーラー</translation>
     </message>
@@ -1452,12 +1452,12 @@ The installer will quit and all changes will be lost.</source>
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="259"/>
       <source>Passphrase for existing partition</source>
-      <translation type="unfinished"/>
+      <translation>既存のパーティションのパスフレーズ</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="260"/>
-      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphraseor delete and create a new encrypted partition.</source>
-      <translation type="unfinished"/>
+      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphrase or delete and create a new encrypted partition.</source>
+      <translation>指定したパスフレーズでパーティション %1 を復号化できませんでした。&lt;br/&gt;&lt;br/&gt;パーティションを再度編集して正しいパスフレーズを指定するか、削除して新しい暗号化パーティションを作成してください。</translation>
     </message>
   </context>
   <context>
@@ -4013,61 +4013,56 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.ui" line="140"/>
-      <source>&amp;About</source>
-      <translation>説明 (&amp;A)</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="150"/>
       <source>Open donations website</source>
       <translation>寄付サイトを開く</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="143"/>
       <source>&amp;Donate</source>
       <translation>寄付する(&amp;D)</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="163"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
       <source>Open help and support website</source>
       <translation>サポートサイトを開く</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="156"/>
       <source>&amp;Support</source>
       <translation>サポート (&amp;S)</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="176"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
       <source>Open issues and bug-tracking website</source>
       <translation>issue 及び bug-track のサイトを開く</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="169"/>
       <source>&amp;Known issues</source>
       <translation>既知の問題 (&amp;K)</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="189"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
       <source>Open release notes website</source>
       <translation>リリースノートのウェブサイトを開く</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="192"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="182"/>
       <source>&amp;Release notes</source>
       <translation>リリースノート (&amp;R)</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="216"/>
+      <location filename="../src/modules/welcome/WelcomePage.cpp" line="212"/>
       <source>%1 support</source>
       <translation>%1 サポート</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="319"/>
       <source>About %1 setup</source>
       <translation>%1 セットアップについて</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="320"/>
       <source>About %1 installer</source>
       <translation>%1 インストーラーについて</translation>
     </message>
@@ -4133,19 +4128,16 @@ Output:
     </message>
   </context>
   <context>
-    <name>about</name>
+    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/modules/welcomeq/about.qml" line="79"/>
-      <source>Back</source>
-      <translation>戻る</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+      <source>About</source>
+      <translation>About</translation>
     </message>
-  </context>
-  <context>
-    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/calamares/calamares-sidebar.qml" line="79"/>
-      <source>Show debug information</source>
-      <translation>デバッグ情報を表示</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+      <source>Debug</source>
+      <translation>デバッグ</translation>
     </message>
   </context>
   <context>
@@ -4510,26 +4502,21 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcomeq/welcomeq.qml" line="66"/>
-      <source>About</source>
-      <translation>About</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="80"/>
       <source>Support</source>
       <translation>サポート</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="91"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="77"/>
       <source>Known issues</source>
       <translation>既知の問題点</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="102"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="88"/>
       <source>Release notes</source>
       <translation>リリースノート</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="114"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="100"/>
       <source>Donate</source>
       <translation>寄付</translation>
     </message>
diff --git a/lang/calamares_kk.ts b/lang/calamares_kk.ts
index 703fd73ab7d32eb25ddb4f6b909548dafa392759..31382cb8ea038f56b7ce403f912b7f9b501b759e 100644
--- a/lang/calamares_kk.ts
+++ b/lang/calamares_kk.ts
@@ -156,7 +156,7 @@
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/calamares/DebugWindow.cpp" line="239"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="244"/>
       <source>Debug information</source>
       <translation>Жөндеу ақпараты</translation>
     </message>
@@ -501,12 +501,12 @@ The installer will quit and all changes will be lost.</source>
   <context>
     <name>CalamaresWindow</name>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="369"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
       <source>%1 Setup Program</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="370"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
       <source>%1 Installer</source>
       <translation type="unfinished"/>
     </message>
@@ -1451,7 +1451,7 @@ The installer will quit and all changes will be lost.</source>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="260"/>
-      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphraseor delete and create a new encrypted partition.</source>
+      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphrase or delete and create a new encrypted partition.</source>
       <translation type="unfinished"/>
     </message>
   </context>
@@ -4008,61 +4008,56 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.ui" line="140"/>
-      <source>&amp;About</source>
-      <translation type="unfinished"/>
-    </message>
-    <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="150"/>
       <source>Open donations website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="143"/>
       <source>&amp;Donate</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="163"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
       <source>Open help and support website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="156"/>
       <source>&amp;Support</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="176"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
       <source>Open issues and bug-tracking website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="169"/>
       <source>&amp;Known issues</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="189"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
       <source>Open release notes website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="192"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="182"/>
       <source>&amp;Release notes</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="216"/>
+      <location filename="../src/modules/welcome/WelcomePage.cpp" line="212"/>
       <source>%1 support</source>
       <translation>%1 қолдауы</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="319"/>
       <source>About %1 setup</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="320"/>
       <source>About %1 installer</source>
       <translation type="unfinished"/>
     </message>
@@ -4128,18 +4123,15 @@ Output:
     </message>
   </context>
   <context>
-    <name>about</name>
+    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/modules/welcomeq/about.qml" line="79"/>
-      <source>Back</source>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+      <source>About</source>
       <translation type="unfinished"/>
     </message>
-  </context>
-  <context>
-    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/calamares/calamares-sidebar.qml" line="79"/>
-      <source>Show debug information</source>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+      <source>Debug</source>
       <translation type="unfinished"/>
     </message>
   </context>
@@ -4477,26 +4469,21 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcomeq/welcomeq.qml" line="66"/>
-      <source>About</source>
-      <translation type="unfinished"/>
-    </message>
-    <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="80"/>
       <source>Support</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="91"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="77"/>
       <source>Known issues</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="102"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="88"/>
       <source>Release notes</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="114"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="100"/>
       <source>Donate</source>
       <translation type="unfinished"/>
     </message>
diff --git a/lang/calamares_kn.ts b/lang/calamares_kn.ts
index 68c4b64c97c6600ee4f43647cc624d120c9bdb69..0e2621e895a36c3d3f994ccf852f9f176205d41d 100644
--- a/lang/calamares_kn.ts
+++ b/lang/calamares_kn.ts
@@ -156,7 +156,7 @@
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/calamares/DebugWindow.cpp" line="239"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="244"/>
       <source>Debug information</source>
       <translation type="unfinished"/>
     </message>
@@ -501,12 +501,12 @@ The installer will quit and all changes will be lost.</source>
   <context>
     <name>CalamaresWindow</name>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="369"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
       <source>%1 Setup Program</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="370"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
       <source>%1 Installer</source>
       <translation type="unfinished"/>
     </message>
@@ -1451,7 +1451,7 @@ The installer will quit and all changes will be lost.</source>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="260"/>
-      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphraseor delete and create a new encrypted partition.</source>
+      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphrase or delete and create a new encrypted partition.</source>
       <translation type="unfinished"/>
     </message>
   </context>
@@ -4008,61 +4008,56 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.ui" line="140"/>
-      <source>&amp;About</source>
-      <translation type="unfinished"/>
-    </message>
-    <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="150"/>
       <source>Open donations website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="143"/>
       <source>&amp;Donate</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="163"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
       <source>Open help and support website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="156"/>
       <source>&amp;Support</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="176"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
       <source>Open issues and bug-tracking website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="169"/>
       <source>&amp;Known issues</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="189"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
       <source>Open release notes website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="192"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="182"/>
       <source>&amp;Release notes</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="216"/>
+      <location filename="../src/modules/welcome/WelcomePage.cpp" line="212"/>
       <source>%1 support</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="319"/>
       <source>About %1 setup</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="320"/>
       <source>About %1 installer</source>
       <translation type="unfinished"/>
     </message>
@@ -4128,18 +4123,15 @@ Output:
     </message>
   </context>
   <context>
-    <name>about</name>
+    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/modules/welcomeq/about.qml" line="79"/>
-      <source>Back</source>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+      <source>About</source>
       <translation type="unfinished"/>
     </message>
-  </context>
-  <context>
-    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/calamares/calamares-sidebar.qml" line="79"/>
-      <source>Show debug information</source>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+      <source>Debug</source>
       <translation type="unfinished"/>
     </message>
   </context>
@@ -4477,26 +4469,21 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcomeq/welcomeq.qml" line="66"/>
-      <source>About</source>
-      <translation type="unfinished"/>
-    </message>
-    <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="80"/>
       <source>Support</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="91"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="77"/>
       <source>Known issues</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="102"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="88"/>
       <source>Release notes</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="114"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="100"/>
       <source>Donate</source>
       <translation type="unfinished"/>
     </message>
diff --git a/lang/calamares_ko.ts b/lang/calamares_ko.ts
index d042111ed4c38a478d1daeaf22765c5b41bf864e..1c341d9418cea989cac20395314af1e978eeade6 100644
--- a/lang/calamares_ko.ts
+++ b/lang/calamares_ko.ts
@@ -6,18 +6,18 @@
     <message>
       <location filename="../src/libcalamares/CalamaresAbout.cpp" line="17"/>
       <source>&lt;h1&gt;%1&lt;/h1&gt;&lt;br/&gt;&lt;strong&gt;%2&lt;br/&gt; for %3&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;</source>
-      <translation type="unfinished"/>
+      <translation>&lt;h1&gt;%1&lt;/h1&gt;&lt;br/&gt;&lt;strong&gt;%2&lt;br/&gt; for %3&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;</translation>
     </message>
     <message>
       <location filename="../src/libcalamares/CalamaresAbout.cpp" line="20"/>
       <source>Thanks to &lt;a href="https://calamares.io/team/"&gt;the Calamares team&lt;/a&gt; and the &lt;a href="https://www.transifex.com/calamares/calamares/"&gt;Calamares translators team&lt;/a&gt;.&lt;br/&gt;&lt;br/&gt;&lt;a href="https://calamares.io/"&gt;Calamares&lt;/a&gt; development is sponsored by &lt;br/&gt;&lt;a href="http://www.blue-systems.com/"&gt;Blue Systems&lt;/a&gt; - Liberating Software.</source>
-      <translation type="unfinished"/>
+      <translation>&lt;a href="https://calamares.io/team/"&gt;Calamares 팀&lt;/a&gt;과 &lt;a href="https://www.transifex.com/calamares/calamares/"&gt;Calamares 번역팀&lt;/a&gt;에게 감사드립니다.&lt;br/&gt;&lt;br/&gt;&lt;a href="https://calamares.io/"&gt;Calamares&lt;/a&gt; development is sponsored by &lt;br/&gt;&lt;a href="http://www.blue-systems.com/"&gt;Blue Systems&lt;/a&gt; - Liberating Software.</translation>
     </message>
     <message>
       <location filename="../src/libcalamares/CalamaresAbout.cpp" line="38"/>
       <source>Copyright %1-%2 %3 &amp;lt;%4&amp;gt;&lt;br/&gt;</source>
       <extracomment>Copyright year-year Name &lt;email-address&gt;</extracomment>
-      <translation type="unfinished"/>
+      <translation>Copyright %1-%2 %3 &amp;lt;%4&amp;gt;&lt;br/&gt;</translation>
     </message>
   </context>
   <context>
@@ -156,7 +156,7 @@
       <translation>위젯 트리</translation>
     </message>
     <message>
-      <location filename="../src/calamares/DebugWindow.cpp" line="239"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="244"/>
       <source>Debug information</source>
       <translation>디버그 정보</translation>
     </message>
@@ -505,12 +505,12 @@ The installer will quit and all changes will be lost.</source>
   <context>
     <name>CalamaresWindow</name>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="369"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
       <source>%1 Setup Program</source>
       <translation>%1 설치 프로그램</translation>
     </message>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="370"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
       <source>%1 Installer</source>
       <translation>%1 설치 관리자</translation>
     </message>
@@ -1451,12 +1451,12 @@ The installer will quit and all changes will be lost.</source>
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="259"/>
       <source>Passphrase for existing partition</source>
-      <translation type="unfinished"/>
+      <translation>기존 파티션의 암호 구문</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="260"/>
-      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphraseor delete and create a new encrypted partition.</source>
-      <translation type="unfinished"/>
+      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphrase or delete and create a new encrypted partition.</source>
+      <translation>%1 파티션을 지정된 암호 구문으로 해독할 수 없습니다.&lt;br/&gt;&lt;br/&gt;파티션을 다시 편집하고 올바른 암호를 지정하거나 암호화된 파티션을 삭제하고 새로 만듭니다.</translation>
     </message>
   </context>
   <context>
@@ -4011,61 +4011,56 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.ui" line="140"/>
-      <source>&amp;About</source>
-      <translation>정보 (&amp;A)</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="150"/>
       <source>Open donations website</source>
       <translation>기부 웹 사이트열기</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="143"/>
       <source>&amp;Donate</source>
       <translation>기부(&amp;D)</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="163"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
       <source>Open help and support website</source>
       <translation>도움말 및 지원 웹 사이트 열기</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="156"/>
       <source>&amp;Support</source>
       <translation>지원 (&amp;S)</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="176"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
       <source>Open issues and bug-tracking website</source>
       <translation>문제 및 버그 추적 웹 사이트 열기</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="169"/>
       <source>&amp;Known issues</source>
       <translation>알려진 문제점 (&amp;K)</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="189"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
       <source>Open release notes website</source>
       <translation>릴리스 노트 웹 사이트 열기</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="192"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="182"/>
       <source>&amp;Release notes</source>
       <translation>출시 정보 (&amp;R)</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="216"/>
+      <location filename="../src/modules/welcome/WelcomePage.cpp" line="212"/>
       <source>%1 support</source>
       <translation>%1 지원</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="319"/>
       <source>About %1 setup</source>
       <translation>%1 설치 정보</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="320"/>
       <source>About %1 installer</source>
       <translation>%1 설치 관리자에 대하여</translation>
     </message>
@@ -4131,19 +4126,16 @@ Output:
     </message>
   </context>
   <context>
-    <name>about</name>
+    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/modules/welcomeq/about.qml" line="79"/>
-      <source>Back</source>
-      <translation>뒤로</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+      <source>About</source>
+      <translation>Calamares에 대하여</translation>
     </message>
-  </context>
-  <context>
-    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/calamares/calamares-sidebar.qml" line="79"/>
-      <source>Show debug information</source>
-      <translation>디버그 정보 보기</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+      <source>Debug</source>
+      <translation>디버그</translation>
     </message>
   </context>
   <context>
@@ -4508,26 +4500,21 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcomeq/welcomeq.qml" line="66"/>
-      <source>About</source>
-      <translation>Calamares에 대하여</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="80"/>
       <source>Support</source>
       <translation>지원</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="91"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="77"/>
       <source>Known issues</source>
       <translation>알려진 이슈들</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="102"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="88"/>
       <source>Release notes</source>
       <translation>릴리즈 노트</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="114"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="100"/>
       <source>Donate</source>
       <translation>기부</translation>
     </message>
diff --git a/lang/calamares_lo.ts b/lang/calamares_lo.ts
index 87f090046b0776e27776021f9f3325e0b292bf11..f50a5a36fdcd4df787bc9e993259f62dc9e24c3f 100644
--- a/lang/calamares_lo.ts
+++ b/lang/calamares_lo.ts
@@ -156,7 +156,7 @@
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/calamares/DebugWindow.cpp" line="239"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="244"/>
       <source>Debug information</source>
       <translation type="unfinished"/>
     </message>
@@ -499,12 +499,12 @@ The installer will quit and all changes will be lost.</source>
   <context>
     <name>CalamaresWindow</name>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="369"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
       <source>%1 Setup Program</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="370"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
       <source>%1 Installer</source>
       <translation type="unfinished"/>
     </message>
@@ -1449,7 +1449,7 @@ The installer will quit and all changes will be lost.</source>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="260"/>
-      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphraseor delete and create a new encrypted partition.</source>
+      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphrase or delete and create a new encrypted partition.</source>
       <translation type="unfinished"/>
     </message>
   </context>
@@ -3997,61 +3997,56 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.ui" line="140"/>
-      <source>&amp;About</source>
-      <translation type="unfinished"/>
-    </message>
-    <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="150"/>
       <source>Open donations website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="143"/>
       <source>&amp;Donate</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="163"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
       <source>Open help and support website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="156"/>
       <source>&amp;Support</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="176"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
       <source>Open issues and bug-tracking website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="169"/>
       <source>&amp;Known issues</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="189"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
       <source>Open release notes website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="192"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="182"/>
       <source>&amp;Release notes</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="216"/>
+      <location filename="../src/modules/welcome/WelcomePage.cpp" line="212"/>
       <source>%1 support</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="319"/>
       <source>About %1 setup</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="320"/>
       <source>About %1 installer</source>
       <translation type="unfinished"/>
     </message>
@@ -4117,18 +4112,15 @@ Output:
     </message>
   </context>
   <context>
-    <name>about</name>
+    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/modules/welcomeq/about.qml" line="79"/>
-      <source>Back</source>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+      <source>About</source>
       <translation type="unfinished"/>
     </message>
-  </context>
-  <context>
-    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/calamares/calamares-sidebar.qml" line="79"/>
-      <source>Show debug information</source>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+      <source>Debug</source>
       <translation type="unfinished"/>
     </message>
   </context>
@@ -4466,26 +4458,21 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcomeq/welcomeq.qml" line="66"/>
-      <source>About</source>
-      <translation type="unfinished"/>
-    </message>
-    <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="80"/>
       <source>Support</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="91"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="77"/>
       <source>Known issues</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="102"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="88"/>
       <source>Release notes</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="114"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="100"/>
       <source>Donate</source>
       <translation type="unfinished"/>
     </message>
diff --git a/lang/calamares_lt.ts b/lang/calamares_lt.ts
index 57dc844763d29872dac3589fea84c2e15ac40434..b8f7557831cf68060d3620f1d0d3e5ff4e0ea1f2 100644
--- a/lang/calamares_lt.ts
+++ b/lang/calamares_lt.ts
@@ -156,7 +156,7 @@
       <translation>Valdiklių medis</translation>
     </message>
     <message>
-      <location filename="../src/calamares/DebugWindow.cpp" line="239"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="244"/>
       <source>Debug information</source>
       <translation>Derinimo informacija</translation>
     </message>
@@ -511,12 +511,12 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.</translation>
   <context>
     <name>CalamaresWindow</name>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="369"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
       <source>%1 Setup Program</source>
       <translation>%1 sąrankos programa</translation>
     </message>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="370"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
       <source>%1 Installer</source>
       <translation>%1 diegimo programa</translation>
     </message>
@@ -1461,7 +1461,7 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="260"/>
-      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphraseor delete and create a new encrypted partition.</source>
+      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphrase or delete and create a new encrypted partition.</source>
       <translation>Nepavyko iššifruoti %1 skaidinio, naudojant pateiktą slaptafrazę.&lt;br/&gt;&lt;br/&gt;Taisykite skaidinį dar kartą ir nurodykite teisingą slaptafrazę arba ištrinkite šį ir sukurkite naują šifruotą skaidinį.</translation>
     </message>
   </context>
@@ -4044,61 +4044,56 @@ Išvestis:
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.ui" line="140"/>
-      <source>&amp;About</source>
-      <translation>&amp;Apie</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="150"/>
       <source>Open donations website</source>
       <translation>Atverti paaukojimų internetinę svetainę</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="143"/>
       <source>&amp;Donate</source>
       <translation>&amp;Paaukoti</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="163"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
       <source>Open help and support website</source>
       <translation>Atverti pagalbos ir palaikymo internetinę svetainę</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="156"/>
       <source>&amp;Support</source>
       <translation>&amp;Palaikymas</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="176"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
       <source>Open issues and bug-tracking website</source>
       <translation>Atverti strigčių ir klaidų sekimo internetinę svetainę</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="169"/>
       <source>&amp;Known issues</source>
       <translation>Ž&amp;inomos problemos</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="189"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
       <source>Open release notes website</source>
       <translation>Atverti laidos informacijos internetinę svetainę</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="192"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="182"/>
       <source>&amp;Release notes</source>
       <translation>Lai&amp;dos informacija</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="216"/>
+      <location filename="../src/modules/welcome/WelcomePage.cpp" line="212"/>
       <source>%1 support</source>
       <translation>%1 palaikymas</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="319"/>
       <source>About %1 setup</source>
       <translation>Apie %1 sąranką</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="320"/>
       <source>About %1 installer</source>
       <translation>Apie %1 diegimo programą</translation>
     </message>
@@ -4164,19 +4159,16 @@ Išvestis:
     </message>
   </context>
   <context>
-    <name>about</name>
+    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/modules/welcomeq/about.qml" line="79"/>
-      <source>Back</source>
-      <translation>Atgal</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+      <source>About</source>
+      <translation>Apie</translation>
     </message>
-  </context>
-  <context>
-    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/calamares/calamares-sidebar.qml" line="79"/>
-      <source>Show debug information</source>
-      <translation>Rodyti derinimo informaciją</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+      <source>Debug</source>
+      <translation>Derinti</translation>
     </message>
   </context>
   <context>
@@ -4541,26 +4533,21 @@ Išvestis:
     </message>
     <message>
       <location filename="../src/modules/welcomeq/welcomeq.qml" line="66"/>
-      <source>About</source>
-      <translation>Apie</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="80"/>
       <source>Support</source>
       <translation>Palaikymas</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="91"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="77"/>
       <source>Known issues</source>
       <translation>Žinomos problemos</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="102"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="88"/>
       <source>Release notes</source>
       <translation>Laidos informacija</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="114"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="100"/>
       <source>Donate</source>
       <translation>Paaukoti</translation>
     </message>
diff --git a/lang/calamares_lv.ts b/lang/calamares_lv.ts
index 55606c4bc33b45cf543229fc3932f324dfa561b4..d228e56bfb24121d769a71104e016e50e5aac857 100644
--- a/lang/calamares_lv.ts
+++ b/lang/calamares_lv.ts
@@ -156,7 +156,7 @@
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/calamares/DebugWindow.cpp" line="239"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="244"/>
       <source>Debug information</source>
       <translation type="unfinished"/>
     </message>
@@ -503,12 +503,12 @@ The installer will quit and all changes will be lost.</source>
   <context>
     <name>CalamaresWindow</name>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="369"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
       <source>%1 Setup Program</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="370"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
       <source>%1 Installer</source>
       <translation type="unfinished"/>
     </message>
@@ -1453,7 +1453,7 @@ The installer will quit and all changes will be lost.</source>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="260"/>
-      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphraseor delete and create a new encrypted partition.</source>
+      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphrase or delete and create a new encrypted partition.</source>
       <translation type="unfinished"/>
     </message>
   </context>
@@ -4019,61 +4019,56 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.ui" line="140"/>
-      <source>&amp;About</source>
-      <translation type="unfinished"/>
-    </message>
-    <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="150"/>
       <source>Open donations website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="143"/>
       <source>&amp;Donate</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="163"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
       <source>Open help and support website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="156"/>
       <source>&amp;Support</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="176"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
       <source>Open issues and bug-tracking website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="169"/>
       <source>&amp;Known issues</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="189"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
       <source>Open release notes website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="192"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="182"/>
       <source>&amp;Release notes</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="216"/>
+      <location filename="../src/modules/welcome/WelcomePage.cpp" line="212"/>
       <source>%1 support</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="319"/>
       <source>About %1 setup</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="320"/>
       <source>About %1 installer</source>
       <translation type="unfinished"/>
     </message>
@@ -4139,18 +4134,15 @@ Output:
     </message>
   </context>
   <context>
-    <name>about</name>
+    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/modules/welcomeq/about.qml" line="79"/>
-      <source>Back</source>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+      <source>About</source>
       <translation type="unfinished"/>
     </message>
-  </context>
-  <context>
-    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/calamares/calamares-sidebar.qml" line="79"/>
-      <source>Show debug information</source>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+      <source>Debug</source>
       <translation type="unfinished"/>
     </message>
   </context>
@@ -4488,26 +4480,21 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcomeq/welcomeq.qml" line="66"/>
-      <source>About</source>
-      <translation type="unfinished"/>
-    </message>
-    <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="80"/>
       <source>Support</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="91"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="77"/>
       <source>Known issues</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="102"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="88"/>
       <source>Release notes</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="114"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="100"/>
       <source>Donate</source>
       <translation type="unfinished"/>
     </message>
diff --git a/lang/calamares_mk.ts b/lang/calamares_mk.ts
index 30c0cfa27d998d78ad83bb4bac766055f9cedc58..1b304f41beb156a826495bfb2b35362d6ce51e40 100644
--- a/lang/calamares_mk.ts
+++ b/lang/calamares_mk.ts
@@ -156,7 +156,7 @@
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/calamares/DebugWindow.cpp" line="239"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="244"/>
       <source>Debug information</source>
       <translation type="unfinished"/>
     </message>
@@ -501,12 +501,12 @@ The installer will quit and all changes will be lost.</source>
   <context>
     <name>CalamaresWindow</name>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="369"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
       <source>%1 Setup Program</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="370"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
       <source>%1 Installer</source>
       <translation type="unfinished"/>
     </message>
@@ -1451,7 +1451,7 @@ The installer will quit and all changes will be lost.</source>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="260"/>
-      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphraseor delete and create a new encrypted partition.</source>
+      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphrase or delete and create a new encrypted partition.</source>
       <translation type="unfinished"/>
     </message>
   </context>
@@ -4008,61 +4008,56 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.ui" line="140"/>
-      <source>&amp;About</source>
-      <translation type="unfinished"/>
-    </message>
-    <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="150"/>
       <source>Open donations website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="143"/>
       <source>&amp;Donate</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="163"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
       <source>Open help and support website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="156"/>
       <source>&amp;Support</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="176"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
       <source>Open issues and bug-tracking website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="169"/>
       <source>&amp;Known issues</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="189"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
       <source>Open release notes website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="192"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="182"/>
       <source>&amp;Release notes</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="216"/>
+      <location filename="../src/modules/welcome/WelcomePage.cpp" line="212"/>
       <source>%1 support</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="319"/>
       <source>About %1 setup</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="320"/>
       <source>About %1 installer</source>
       <translation type="unfinished"/>
     </message>
@@ -4128,18 +4123,15 @@ Output:
     </message>
   </context>
   <context>
-    <name>about</name>
+    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/modules/welcomeq/about.qml" line="79"/>
-      <source>Back</source>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+      <source>About</source>
       <translation type="unfinished"/>
     </message>
-  </context>
-  <context>
-    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/calamares/calamares-sidebar.qml" line="79"/>
-      <source>Show debug information</source>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+      <source>Debug</source>
       <translation type="unfinished"/>
     </message>
   </context>
@@ -4477,26 +4469,21 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcomeq/welcomeq.qml" line="66"/>
-      <source>About</source>
-      <translation type="unfinished"/>
-    </message>
-    <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="80"/>
       <source>Support</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="91"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="77"/>
       <source>Known issues</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="102"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="88"/>
       <source>Release notes</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="114"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="100"/>
       <source>Donate</source>
       <translation type="unfinished"/>
     </message>
diff --git a/lang/calamares_ml.ts b/lang/calamares_ml.ts
index fbd5ba64484301c9967578c7fbd831e192c40892..cab3a0840fb2411de2ed9a85f7f5f39bc35ef585 100644
--- a/lang/calamares_ml.ts
+++ b/lang/calamares_ml.ts
@@ -156,7 +156,7 @@
       <translation>വിഡ്ജറ്റ് ട്രീ</translation>
     </message>
     <message>
-      <location filename="../src/calamares/DebugWindow.cpp" line="239"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="244"/>
       <source>Debug information</source>
       <translation>ഡീബഗ് വിവരങ്ങൾ</translation>
     </message>
@@ -503,12 +503,12 @@ The installer will quit and all changes will be lost.</source>
   <context>
     <name>CalamaresWindow</name>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="369"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
       <source>%1 Setup Program</source>
       <translation>%1 സജ്ജീകരണപ്രയോഗം</translation>
     </message>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="370"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
       <source>%1 Installer</source>
       <translation>%1 ഇൻസ്റ്റാളർ</translation>
     </message>
@@ -1453,7 +1453,7 @@ The installer will quit and all changes will be lost.</source>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="260"/>
-      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphraseor delete and create a new encrypted partition.</source>
+      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphrase or delete and create a new encrypted partition.</source>
       <translation type="unfinished"/>
     </message>
   </context>
@@ -4013,61 +4013,56 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.ui" line="140"/>
-      <source>&amp;About</source>
-      <translation>വിവരം (&amp;A)</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="150"/>
       <source>Open donations website</source>
       <translation>സംഭാവനകളുടെ വെബ്സൈറ്റ് തുറക്കുക</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="143"/>
       <source>&amp;Donate</source>
       <translation>&amp;സംഭാവന ചെയ്യുക</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="163"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
       <source>Open help and support website</source>
       <translation>സഹായ പിന്തുണ വെബ്സൈറ്റ് തുറക്കുക</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="156"/>
       <source>&amp;Support</source>
       <translation>പിന്തുണ (&amp;S)</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="176"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
       <source>Open issues and bug-tracking website</source>
       <translation>പ്രശനങ്ങൾ,ബഗ്ഗ്‌ ട്രാക്കിംഗ് വെബ്സൈറ്റ് തുറക്കുക</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="169"/>
       <source>&amp;Known issues</source>
       <translation>ഇതിനകം അറിയാവുന്ന പ്രശ്നങ്ങൾ (&amp;K)</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="189"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
       <source>Open release notes website</source>
       <translation>പ്രകാശന കുറിപ്പുകളുടെ വെബ്സൈറ്റ് തുറക്കുക</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="192"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="182"/>
       <source>&amp;Release notes</source>
       <translation>പ്രകാശന കുറിപ്പുകൾ (&amp;R)</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="216"/>
+      <location filename="../src/modules/welcome/WelcomePage.cpp" line="212"/>
       <source>%1 support</source>
       <translation>%1 പിന്തുണ</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="319"/>
       <source>About %1 setup</source>
       <translation>%1 സജ്ജീകരണത്തെക്കുറിച്ച് </translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="320"/>
       <source>About %1 installer</source>
       <translation>%1 ഇൻസ്റ്റാളറിനെ കുറിച്ച്</translation>
     </message>
@@ -4133,19 +4128,16 @@ Output:
     </message>
   </context>
   <context>
-    <name>about</name>
+    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/modules/welcomeq/about.qml" line="79"/>
-      <source>Back</source>
-      <translation>പുറകോട്ട്</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+      <source>About</source>
+      <translation>വിവരം</translation>
     </message>
-  </context>
-  <context>
-    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/calamares/calamares-sidebar.qml" line="79"/>
-      <source>Show debug information</source>
-      <translation>ഡീബഗ് വിവരങ്ങൾ കാണിക്കുക</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+      <source>Debug</source>
+      <translation type="unfinished"/>
     </message>
   </context>
   <context>
@@ -4482,26 +4474,21 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcomeq/welcomeq.qml" line="66"/>
-      <source>About</source>
-      <translation>വിവരം</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="80"/>
       <source>Support</source>
       <translation>സഹായം</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="91"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="77"/>
       <source>Known issues</source>
       <translation>അറിയാവുന്ന പ്രശ്നങ്ങൾ</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="102"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="88"/>
       <source>Release notes</source>
       <translation>പ്രകാശനക്കുറിപ്പുകൾ</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="114"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="100"/>
       <source>Donate</source>
       <translation>സംഭാവന</translation>
     </message>
diff --git a/lang/calamares_mr.ts b/lang/calamares_mr.ts
index 64ed5c81521c2ce1de52682ef62ccea5d9bff1b4..fed837c18fda170771b5497546782e7bb19b6f3d 100644
--- a/lang/calamares_mr.ts
+++ b/lang/calamares_mr.ts
@@ -156,7 +156,7 @@
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/calamares/DebugWindow.cpp" line="239"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="244"/>
       <source>Debug information</source>
       <translation>दोषमार्जन माहिती</translation>
     </message>
@@ -501,12 +501,12 @@ The installer will quit and all changes will be lost.</source>
   <context>
     <name>CalamaresWindow</name>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="369"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
       <source>%1 Setup Program</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="370"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
       <source>%1 Installer</source>
       <translation>%1 अधिष्ठापक</translation>
     </message>
@@ -1451,7 +1451,7 @@ The installer will quit and all changes will be lost.</source>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="260"/>
-      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphraseor delete and create a new encrypted partition.</source>
+      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphrase or delete and create a new encrypted partition.</source>
       <translation type="unfinished"/>
     </message>
   </context>
@@ -4008,61 +4008,56 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.ui" line="140"/>
-      <source>&amp;About</source>
-      <translation>&amp;विषयी</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="150"/>
       <source>Open donations website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="143"/>
       <source>&amp;Donate</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="163"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
       <source>Open help and support website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="156"/>
       <source>&amp;Support</source>
       <translation>%1 पाठबळ</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="176"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
       <source>Open issues and bug-tracking website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="169"/>
       <source>&amp;Known issues</source>
       <translation>&amp;ज्ञात त्रुटी</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="189"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
       <source>Open release notes website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="192"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="182"/>
       <source>&amp;Release notes</source>
       <translation>&amp;प्रकाशन टिपा</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="216"/>
+      <location filename="../src/modules/welcome/WelcomePage.cpp" line="212"/>
       <source>%1 support</source>
       <translation>%1 पाठबळ</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="319"/>
       <source>About %1 setup</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="320"/>
       <source>About %1 installer</source>
       <translation>%1 अधिष्ठापक बद्दल</translation>
     </message>
@@ -4128,19 +4123,16 @@ Output:
     </message>
   </context>
   <context>
-    <name>about</name>
+    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/modules/welcomeq/about.qml" line="79"/>
-      <source>Back</source>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+      <source>About</source>
       <translation type="unfinished"/>
     </message>
-  </context>
-  <context>
-    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/calamares/calamares-sidebar.qml" line="79"/>
-      <source>Show debug information</source>
-      <translation>दोषमार्जन माहिती दर्शवा</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+      <source>Debug</source>
+      <translation type="unfinished"/>
     </message>
   </context>
   <context>
@@ -4477,26 +4469,21 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcomeq/welcomeq.qml" line="66"/>
-      <source>About</source>
-      <translation type="unfinished"/>
-    </message>
-    <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="80"/>
       <source>Support</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="91"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="77"/>
       <source>Known issues</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="102"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="88"/>
       <source>Release notes</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="114"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="100"/>
       <source>Donate</source>
       <translation type="unfinished"/>
     </message>
diff --git a/lang/calamares_nb.ts b/lang/calamares_nb.ts
index d63580e9fc0c3fdd18476db6f1a20802f63dde66..cf9f7cc2032946fb04803d9c19094e49d93d9a0f 100644
--- a/lang/calamares_nb.ts
+++ b/lang/calamares_nb.ts
@@ -156,7 +156,7 @@
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/calamares/DebugWindow.cpp" line="239"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="244"/>
       <source>Debug information</source>
       <translation>Debug informasjon</translation>
     </message>
@@ -502,12 +502,12 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.</translati
   <context>
     <name>CalamaresWindow</name>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="369"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
       <source>%1 Setup Program</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="370"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
       <source>%1 Installer</source>
       <translation>%1 Installasjonsprogram</translation>
     </message>
@@ -1452,7 +1452,7 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.</translati
     </message>
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="260"/>
-      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphraseor delete and create a new encrypted partition.</source>
+      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphrase or delete and create a new encrypted partition.</source>
       <translation type="unfinished"/>
     </message>
   </context>
@@ -4009,61 +4009,56 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.ui" line="140"/>
-      <source>&amp;About</source>
-      <translation>&amp;Om</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="150"/>
       <source>Open donations website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="143"/>
       <source>&amp;Donate</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="163"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
       <source>Open help and support website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="156"/>
       <source>&amp;Support</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="176"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
       <source>Open issues and bug-tracking website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="169"/>
       <source>&amp;Known issues</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="189"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
       <source>Open release notes website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="192"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="182"/>
       <source>&amp;Release notes</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="216"/>
+      <location filename="../src/modules/welcome/WelcomePage.cpp" line="212"/>
       <source>%1 support</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="319"/>
       <source>About %1 setup</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="320"/>
       <source>About %1 installer</source>
       <translation type="unfinished"/>
     </message>
@@ -4129,19 +4124,16 @@ Output:
     </message>
   </context>
   <context>
-    <name>about</name>
+    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/modules/welcomeq/about.qml" line="79"/>
-      <source>Back</source>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+      <source>About</source>
       <translation type="unfinished"/>
     </message>
-  </context>
-  <context>
-    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/calamares/calamares-sidebar.qml" line="79"/>
-      <source>Show debug information</source>
-      <translation>Vis feilrettingsinformasjon</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+      <source>Debug</source>
+      <translation>Debug</translation>
     </message>
   </context>
   <context>
@@ -4478,26 +4470,21 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcomeq/welcomeq.qml" line="66"/>
-      <source>About</source>
-      <translation type="unfinished"/>
-    </message>
-    <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="80"/>
       <source>Support</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="91"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="77"/>
       <source>Known issues</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="102"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="88"/>
       <source>Release notes</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="114"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="100"/>
       <source>Donate</source>
       <translation type="unfinished"/>
     </message>
diff --git a/lang/calamares_ne_NP.ts b/lang/calamares_ne_NP.ts
index 0a1f2cf22dbfe659fffeed50dd3c029dec142def..8eb7baa1070ca552ef3931e3dda8f0df5b89da2b 100644
--- a/lang/calamares_ne_NP.ts
+++ b/lang/calamares_ne_NP.ts
@@ -156,7 +156,7 @@
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/calamares/DebugWindow.cpp" line="239"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="244"/>
       <source>Debug information</source>
       <translation type="unfinished"/>
     </message>
@@ -501,12 +501,12 @@ The installer will quit and all changes will be lost.</source>
   <context>
     <name>CalamaresWindow</name>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="369"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
       <source>%1 Setup Program</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="370"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
       <source>%1 Installer</source>
       <translation type="unfinished"/>
     </message>
@@ -1451,7 +1451,7 @@ The installer will quit and all changes will be lost.</source>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="260"/>
-      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphraseor delete and create a new encrypted partition.</source>
+      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphrase or delete and create a new encrypted partition.</source>
       <translation type="unfinished"/>
     </message>
   </context>
@@ -4008,61 +4008,56 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.ui" line="140"/>
-      <source>&amp;About</source>
-      <translation type="unfinished"/>
-    </message>
-    <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="150"/>
       <source>Open donations website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="143"/>
       <source>&amp;Donate</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="163"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
       <source>Open help and support website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="156"/>
       <source>&amp;Support</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="176"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
       <source>Open issues and bug-tracking website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="169"/>
       <source>&amp;Known issues</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="189"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
       <source>Open release notes website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="192"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="182"/>
       <source>&amp;Release notes</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="216"/>
+      <location filename="../src/modules/welcome/WelcomePage.cpp" line="212"/>
       <source>%1 support</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="319"/>
       <source>About %1 setup</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="320"/>
       <source>About %1 installer</source>
       <translation type="unfinished"/>
     </message>
@@ -4128,18 +4123,15 @@ Output:
     </message>
   </context>
   <context>
-    <name>about</name>
+    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/modules/welcomeq/about.qml" line="79"/>
-      <source>Back</source>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+      <source>About</source>
       <translation type="unfinished"/>
     </message>
-  </context>
-  <context>
-    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/calamares/calamares-sidebar.qml" line="79"/>
-      <source>Show debug information</source>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+      <source>Debug</source>
       <translation type="unfinished"/>
     </message>
   </context>
@@ -4477,26 +4469,21 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcomeq/welcomeq.qml" line="66"/>
-      <source>About</source>
-      <translation type="unfinished"/>
-    </message>
-    <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="80"/>
       <source>Support</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="91"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="77"/>
       <source>Known issues</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="102"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="88"/>
       <source>Release notes</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="114"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="100"/>
       <source>Donate</source>
       <translation type="unfinished"/>
     </message>
diff --git a/lang/calamares_nl.ts b/lang/calamares_nl.ts
index c8f46aa1dc866f05d685fc1d5e162908f5907b3e..0b3307ab189a5b3d1e12dbc524b0732f27f0856f 100644
--- a/lang/calamares_nl.ts
+++ b/lang/calamares_nl.ts
@@ -156,7 +156,7 @@
       <translation>Widget-boom</translation>
     </message>
     <message>
-      <location filename="../src/calamares/DebugWindow.cpp" line="239"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="244"/>
       <source>Debug information</source>
       <translation>Debug informatie</translation>
     </message>
@@ -507,12 +507,12 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan.
   <context>
     <name>CalamaresWindow</name>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="369"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
       <source>%1 Setup Program</source>
       <translation>%1 Voorbereidingsprogramma</translation>
     </message>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="370"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
       <source>%1 Installer</source>
       <translation>%1 Installatieprogramma</translation>
     </message>
@@ -1457,7 +1457,7 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan.
     </message>
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="260"/>
-      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphraseor delete and create a new encrypted partition.</source>
+      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphrase or delete and create a new encrypted partition.</source>
       <translation type="unfinished"/>
     </message>
   </context>
@@ -4018,61 +4018,56 @@ De installatie kan niet doorgaan.</translation>
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.ui" line="140"/>
-      <source>&amp;About</source>
-      <translation>&amp;Over</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="150"/>
       <source>Open donations website</source>
       <translation>Open donatiewebsite</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="143"/>
       <source>&amp;Donate</source>
       <translation>&amp;Doneren</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="163"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
       <source>Open help and support website</source>
       <translation>Open help en ondersteuningswebsite.</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="156"/>
       <source>&amp;Support</source>
       <translation>Onder&amp;steuning</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="176"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
       <source>Open issues and bug-tracking website</source>
       <translation>Open problemen en bug-tracking website.</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="169"/>
       <source>&amp;Known issues</source>
       <translation>Be&amp;kende problemen</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="189"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
       <source>Open release notes website</source>
       <translation>Open release-opmerkingen website.</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="192"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="182"/>
       <source>&amp;Release notes</source>
       <translation>Aantekeningen bij deze ve&amp;rsie</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="216"/>
+      <location filename="../src/modules/welcome/WelcomePage.cpp" line="212"/>
       <source>%1 support</source>
       <translation> %1 ondersteuning</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="319"/>
       <source>About %1 setup</source>
       <translation>Over %1 installatieprogramma.</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="320"/>
       <source>About %1 installer</source>
       <translation>Over het %1 installatieprogramma</translation>
     </message>
@@ -4138,19 +4133,16 @@ De installatie kan niet doorgaan.</translation>
     </message>
   </context>
   <context>
-    <name>about</name>
+    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/modules/welcomeq/about.qml" line="79"/>
-      <source>Back</source>
-      <translation>Terug</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+      <source>About</source>
+      <translation>Over</translation>
     </message>
-  </context>
-  <context>
-    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/calamares/calamares-sidebar.qml" line="79"/>
-      <source>Show debug information</source>
-      <translation>Toon debug informatie</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+      <source>Debug</source>
+      <translation>Fouten opsporen</translation>
     </message>
   </context>
   <context>
@@ -4512,26 +4504,21 @@ De systeemstijdinstellingen beïnvloeden de cijfer- en datumsformaat. De huidige
     </message>
     <message>
       <location filename="../src/modules/welcomeq/welcomeq.qml" line="66"/>
-      <source>About</source>
-      <translation>Over</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="80"/>
       <source>Support</source>
       <translation>Ondersteuning</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="91"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="77"/>
       <source>Known issues</source>
       <translation>Bekende problemen</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="102"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="88"/>
       <source>Release notes</source>
       <translation>Aantekeningen bij deze versie</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="114"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="100"/>
       <source>Donate</source>
       <translation>Doneren</translation>
     </message>
diff --git a/lang/calamares_oc.ts b/lang/calamares_oc.ts
index 4e9e88152def1658eae46c3b8d16ec5534129da9..9a931e4c213f45ef8e4c40e56f6e14e99cb3ce01 100644
--- a/lang/calamares_oc.ts
+++ b/lang/calamares_oc.ts
@@ -6,7 +6,7 @@
     <message>
       <location filename="../src/libcalamares/CalamaresAbout.cpp" line="17"/>
       <source>&lt;h1&gt;%1&lt;/h1&gt;&lt;br/&gt;&lt;strong&gt;%2&lt;br/&gt; for %3&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;</source>
-      <translation type="unfinished"/>
+      <translation>&lt;h1&gt;%1&lt;/h1&gt;&lt;br/&gt;&lt;strong&gt;%2&lt;br/&gt; per %3&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;</translation>
     </message>
     <message>
       <location filename="../src/libcalamares/CalamaresAbout.cpp" line="20"/>
@@ -17,7 +17,7 @@
       <location filename="../src/libcalamares/CalamaresAbout.cpp" line="38"/>
       <source>Copyright %1-%2 %3 &amp;lt;%4&amp;gt;&lt;br/&gt;</source>
       <extracomment>Copyright year-year Name &lt;email-address&gt;</extracomment>
-      <translation type="unfinished"/>
+      <translation>Copyright %1-%2 %3 &amp;lt;%4&amp;gt;&lt;br/&gt;</translation>
     </message>
   </context>
   <context>
@@ -51,7 +51,7 @@
     <message>
       <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="59"/>
       <source>Master Boot Record of %1</source>
-      <translation type="unfinished"/>
+      <translation>Enregistrament d’aviada màger de %1</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="92"/>
@@ -87,7 +87,7 @@
     <message>
       <location filename="../src/calamares/DebugWindow.ui" line="18"/>
       <source>Form</source>
-      <translation type="unfinished"/>
+      <translation>Formulari</translation>
     </message>
     <message>
       <location filename="../src/calamares/DebugWindow.ui" line="28"/>
@@ -156,7 +156,7 @@
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/calamares/DebugWindow.cpp" line="239"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="244"/>
       <source>Debug information</source>
       <translation>Informacions de desbugatge</translation>
     </message>
@@ -179,7 +179,7 @@
     <message>
       <location filename="../src/libcalamares/JobExample.cpp" line="29"/>
       <source>Job failed (%1)</source>
-      <translation type="unfinished"/>
+      <translation>Prètzfach fracassat (%1)</translation>
     </message>
     <message>
       <location filename="../src/libcalamares/JobExample.cpp" line="30"/>
@@ -200,7 +200,7 @@
     <message>
       <location filename="../src/libcalamares/JobExample.cpp" line="17"/>
       <source>Example job (%1)</source>
-      <translation type="unfinished"/>
+      <translation>Prètzfach d’exemple (%1)</translation>
     </message>
   </context>
   <context>
@@ -501,12 +501,12 @@ The installer will quit and all changes will be lost.</source>
   <context>
     <name>CalamaresWindow</name>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="369"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
       <source>%1 Setup Program</source>
-      <translation type="unfinished"/>
+      <translation>Programa de configuracion %1</translation>
     </message>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="370"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
       <source>%1 Installer</source>
       <translation>Installador de %1</translation>
     </message>
@@ -534,7 +534,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
       <location filename="../src/modules/welcome/checker/CheckerContainer.cpp" line="38"/>
       <source>Gathering system information...</source>
-      <translation type="unfinished"/>
+      <translation>Obtencion de las informacions del sistèma...</translation>
     </message>
   </context>
   <context>
@@ -542,7 +542,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
       <location filename="../src/modules/partition/gui/ChoicePage.ui" line="18"/>
       <source>Form</source>
-      <translation type="unfinished"/>
+      <translation>Formulari</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="139"/>
@@ -1451,7 +1451,7 @@ The installer will quit and all changes will be lost.</source>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="260"/>
-      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphraseor delete and create a new encrypted partition.</source>
+      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphrase or delete and create a new encrypted partition.</source>
       <translation type="unfinished"/>
     </message>
   </context>
@@ -1460,7 +1460,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
       <location filename="../src/modules/partition/gui/EncryptWidget.ui" line="18"/>
       <source>Form</source>
-      <translation type="unfinished"/>
+      <translation>Formulari</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/EncryptWidget.ui" line="36"/>
@@ -1565,7 +1565,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
       <location filename="../src/modules/finished/FinishedPage.ui" line="18"/>
       <source>Form</source>
-      <translation type="unfinished"/>
+      <translation>Formulari</translation>
     </message>
     <message>
       <location filename="../src/modules/finished/FinishedPage.ui" line="102"/>
@@ -1864,7 +1864,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
       <location filename="../src/modules/license/LicensePage.ui" line="18"/>
       <source>Form</source>
-      <translation type="unfinished"/>
+      <translation>Formulari</translation>
     </message>
     <message>
       <location filename="../src/modules/license/LicensePage.ui" line="26"/>
@@ -2541,7 +2541,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
       <location filename="../src/modules/packagechooser/page_package.ui" line="24"/>
       <source>Form</source>
-      <translation type="unfinished"/>
+      <translation>Formulari</translation>
     </message>
     <message>
       <location filename="../src/modules/packagechooser/page_package.ui" line="50"/>
@@ -2587,7 +2587,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
       <location filename="../src/modules/keyboard/KeyboardPage.ui" line="18"/>
       <source>Form</source>
-      <translation type="unfinished"/>
+      <translation>Formulari</translation>
     </message>
     <message>
       <location filename="../src/modules/keyboard/KeyboardPage.ui" line="74"/>
@@ -2605,7 +2605,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
       <location filename="../src/modules/users/page_usersetup.ui" line="18"/>
       <source>Form</source>
-      <translation type="unfinished"/>
+      <translation>Formulari</translation>
     </message>
     <message>
       <location filename="../src/modules/users/page_usersetup.ui" line="40"/>
@@ -2786,7 +2786,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
       <location filename="../src/modules/partition/gui/PartitionPage.ui" line="18"/>
       <source>Form</source>
-      <translation type="unfinished"/>
+      <translation>Formulari</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/PartitionPage.ui" line="26"/>
@@ -2864,7 +2864,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
       <location filename="../src/modules/partition/PartitionViewStep.cpp" line="56"/>
       <source>Gathering system information...</source>
-      <translation type="unfinished"/>
+      <translation>Obtencion de las informacions del sistèma...</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/PartitionViewStep.cpp" line="111"/>
@@ -2986,7 +2986,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
       <location filename="../src/modules/plasmalnf/page_plasmalnf.ui" line="18"/>
       <source>Form</source>
-      <translation type="unfinished"/>
+      <translation>Formulari</translation>
     </message>
     <message>
       <location filename="../src/modules/plasmalnf/PlasmaLnfPage.cpp" line="79"/>
@@ -3210,7 +3210,7 @@ Output:
     <message>
       <location filename="../src/modules/partition/gui/ReplaceWidget.ui" line="18"/>
       <source>Form</source>
-      <translation type="unfinished"/>
+      <translation>Formulari</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="128"/>
@@ -3832,7 +3832,7 @@ Output:
     <message>
       <location filename="../src/modules/tracking/page_trackingstep.ui" line="18"/>
       <source>Form</source>
-      <translation type="unfinished"/>
+      <translation>Formulari</translation>
     </message>
     <message>
       <location filename="../src/modules/tracking/page_trackingstep.ui" line="28"/>
@@ -3998,7 +3998,7 @@ Output:
     <message>
       <location filename="../src/modules/welcome/WelcomePage.ui" line="18"/>
       <source>Form</source>
-      <translation type="unfinished"/>
+      <translation>Formulari</translation>
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.ui" line="79"/>
@@ -4008,61 +4008,56 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.ui" line="140"/>
-      <source>&amp;About</source>
-      <translation>&amp;A prepaus</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="150"/>
       <source>Open donations website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="143"/>
       <source>&amp;Donate</source>
       <translation>&amp;Donar</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="163"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
       <source>Open help and support website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="156"/>
       <source>&amp;Support</source>
       <translation>&amp;Assisténcia</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="176"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
       <source>Open issues and bug-tracking website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="169"/>
       <source>&amp;Known issues</source>
       <translation>&amp;Problèmas coneguts</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="189"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
       <source>Open release notes website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="192"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="182"/>
       <source>&amp;Release notes</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="216"/>
+      <location filename="../src/modules/welcome/WelcomePage.cpp" line="212"/>
       <source>%1 support</source>
       <translation>Assisténcia %1</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="319"/>
       <source>About %1 setup</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="320"/>
       <source>About %1 installer</source>
       <translation type="unfinished"/>
     </message>
@@ -4128,19 +4123,16 @@ Output:
     </message>
   </context>
   <context>
-    <name>about</name>
+    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/modules/welcomeq/about.qml" line="79"/>
-      <source>Back</source>
-      <translation>Tornar</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+      <source>About</source>
+      <translation>A prepaus</translation>
     </message>
-  </context>
-  <context>
-    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/calamares/calamares-sidebar.qml" line="79"/>
-      <source>Show debug information</source>
-      <translation>Afichar las informacions de desbugatge</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+      <source>Debug</source>
+      <translation type="unfinished"/>
     </message>
   </context>
   <context>
@@ -4478,26 +4470,21 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcomeq/welcomeq.qml" line="66"/>
-      <source>About</source>
-      <translation>A prepaus</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="80"/>
       <source>Support</source>
       <translation>Assisténcia</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="91"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="77"/>
       <source>Known issues</source>
       <translation>Problèmas coneguts</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="102"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="88"/>
       <source>Release notes</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="114"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="100"/>
       <source>Donate</source>
       <translation>Donar</translation>
     </message>
diff --git a/lang/calamares_pl.ts b/lang/calamares_pl.ts
index f64b13de8b24558bbd1358a93f7e913d7c7135e2..2441b16fcb8f4384b95065267a1c9a69af83d374 100644
--- a/lang/calamares_pl.ts
+++ b/lang/calamares_pl.ts
@@ -156,7 +156,7 @@
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/calamares/DebugWindow.cpp" line="239"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="244"/>
       <source>Debug information</source>
       <translation>Informacje debugowania</translation>
     </message>
@@ -506,12 +506,12 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.</translatio
   <context>
     <name>CalamaresWindow</name>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="369"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
       <source>%1 Setup Program</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="370"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
       <source>%1 Installer</source>
       <translation>Instalator %1</translation>
     </message>
@@ -1456,7 +1456,7 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.</translatio
     </message>
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="260"/>
-      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphraseor delete and create a new encrypted partition.</source>
+      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphrase or delete and create a new encrypted partition.</source>
       <translation type="unfinished"/>
     </message>
   </context>
@@ -4035,61 +4035,56 @@ i nie uruchomi się</translation>
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.ui" line="140"/>
-      <source>&amp;About</source>
-      <translation>&amp;Informacje</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="150"/>
       <source>Open donations website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="143"/>
       <source>&amp;Donate</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="163"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
       <source>Open help and support website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="156"/>
       <source>&amp;Support</source>
       <translation>&amp;Wsparcie</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="176"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
       <source>Open issues and bug-tracking website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="169"/>
       <source>&amp;Known issues</source>
       <translation>&amp;Znane problemy</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="189"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
       <source>Open release notes website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="192"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="182"/>
       <source>&amp;Release notes</source>
       <translation>Informacje o &amp;wydaniu</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="216"/>
+      <location filename="../src/modules/welcome/WelcomePage.cpp" line="212"/>
       <source>%1 support</source>
       <translation>Wsparcie %1</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="319"/>
       <source>About %1 setup</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="320"/>
       <source>About %1 installer</source>
       <translation>O instalatorze %1</translation>
     </message>
@@ -4155,19 +4150,16 @@ i nie uruchomi się</translation>
     </message>
   </context>
   <context>
-    <name>about</name>
+    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/modules/welcomeq/about.qml" line="79"/>
-      <source>Back</source>
-      <translation>Wstecz</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+      <source>About</source>
+      <translation>O nas</translation>
     </message>
-  </context>
-  <context>
-    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/calamares/calamares-sidebar.qml" line="79"/>
-      <source>Show debug information</source>
-      <translation>Pokaż informacje debugowania</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+      <source>Debug</source>
+      <translation>Debug</translation>
     </message>
   </context>
   <context>
@@ -4505,26 +4497,21 @@ i nie uruchomi się</translation>
     </message>
     <message>
       <location filename="../src/modules/welcomeq/welcomeq.qml" line="66"/>
-      <source>About</source>
-      <translation>O nas</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="80"/>
       <source>Support</source>
       <translation>Wsparcie</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="91"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="77"/>
       <source>Known issues</source>
       <translation>Znane problemy</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="102"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="88"/>
       <source>Release notes</source>
       <translation>Informacje o wydaniu</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="114"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="100"/>
       <source>Donate</source>
       <translation>Dotacje</translation>
     </message>
diff --git a/lang/calamares_pt_BR.ts b/lang/calamares_pt_BR.ts
index 779bf20fbcdb521c2e443d6d115ffd8affdf3352..14a8b197c227d8e6e8faff471b92ca1b43c2dde5 100644
--- a/lang/calamares_pt_BR.ts
+++ b/lang/calamares_pt_BR.ts
@@ -6,18 +6,18 @@
     <message>
       <location filename="../src/libcalamares/CalamaresAbout.cpp" line="17"/>
       <source>&lt;h1&gt;%1&lt;/h1&gt;&lt;br/&gt;&lt;strong&gt;%2&lt;br/&gt; for %3&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;</source>
-      <translation type="unfinished"/>
+      <translation>&lt;h1&gt;%1&lt;/h1&gt;&lt;br/&gt;&lt;strong&gt;%2&lt;br/&gt; para %3&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;</translation>
     </message>
     <message>
       <location filename="../src/libcalamares/CalamaresAbout.cpp" line="20"/>
       <source>Thanks to &lt;a href="https://calamares.io/team/"&gt;the Calamares team&lt;/a&gt; and the &lt;a href="https://www.transifex.com/calamares/calamares/"&gt;Calamares translators team&lt;/a&gt;.&lt;br/&gt;&lt;br/&gt;&lt;a href="https://calamares.io/"&gt;Calamares&lt;/a&gt; development is sponsored by &lt;br/&gt;&lt;a href="http://www.blue-systems.com/"&gt;Blue Systems&lt;/a&gt; - Liberating Software.</source>
-      <translation type="unfinished"/>
+      <translation>Obrigado ao &lt;a href="https://calamares.io/team/"&gt;time Calamares&lt;/a&gt; e ao &lt;a href="https://www.transifex.com/calamares/calamares/"&gt;time de tradutores do Calamares&lt;/a&gt;.&lt;br/&gt;&lt;br/&gt;O desenvolvimento do &lt;a href="https://calamares.io/"&gt;Calamares&lt;/a&gt; é patrocinado por &lt;br/&gt;&lt;a href="http://www.blue-systems.com/"&gt;Blue Systems&lt;/a&gt; - Liberating Software.</translation>
     </message>
     <message>
       <location filename="../src/libcalamares/CalamaresAbout.cpp" line="38"/>
       <source>Copyright %1-%2 %3 &amp;lt;%4&amp;gt;&lt;br/&gt;</source>
       <extracomment>Copyright year-year Name &lt;email-address&gt;</extracomment>
-      <translation type="unfinished"/>
+      <translation>Direitos Autorais %1-%2 %3 &amp;lt;%4&amp;gt;&lt;br/&gt;</translation>
     </message>
   </context>
   <context>
@@ -156,7 +156,7 @@
       <translation>Árvore de widgets</translation>
     </message>
     <message>
-      <location filename="../src/calamares/DebugWindow.cpp" line="239"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="244"/>
       <source>Debug information</source>
       <translation>Informações de depuração</translation>
     </message>
@@ -509,12 +509,12 @@ O instalador será fechado e todas as alterações serão perdidas.</translation
   <context>
     <name>CalamaresWindow</name>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="369"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
       <source>%1 Setup Program</source>
       <translation>Programa de configuração %1</translation>
     </message>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="370"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
       <source>%1 Installer</source>
       <translation>Instalador %1</translation>
     </message>
@@ -1455,12 +1455,12 @@ O instalador será fechado e todas as alterações serão perdidas.</translation
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="259"/>
       <source>Passphrase for existing partition</source>
-      <translation type="unfinished"/>
+      <translation>Frase-chave para partição existente</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="260"/>
-      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphraseor delete and create a new encrypted partition.</source>
-      <translation type="unfinished"/>
+      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphrase or delete and create a new encrypted partition.</source>
+      <translation>A partição %1 não pôde ser descriptografada com a frase-chave fornecida.&lt;br/&gt;&lt;br/&gt;Edite a partição novamente e forneça a frase-chave correta ou a exclua e crie uma nova partição criptografada.</translation>
     </message>
   </context>
   <context>
@@ -4033,61 +4033,56 @@ Saída:
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.ui" line="140"/>
-      <source>&amp;About</source>
-      <translation>&amp;Sobre</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="150"/>
       <source>Open donations website</source>
       <translation>Abrir website de doações</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="143"/>
       <source>&amp;Donate</source>
       <translation>&amp;Doar</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="163"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
       <source>Open help and support website</source>
       <translation>Abrir website de ajuda e suporte</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="156"/>
       <source>&amp;Support</source>
       <translation>&amp;Suporte</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="176"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
       <source>Open issues and bug-tracking website</source>
       <translation>Abrir website de problemas e rastreamento de bugs</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="169"/>
       <source>&amp;Known issues</source>
       <translation>&amp;Problemas conhecidos</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="189"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
       <source>Open release notes website</source>
       <translation>Abrir website com as notas de lançamento</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="192"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="182"/>
       <source>&amp;Release notes</source>
       <translation>&amp;Notas de lançamento</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="216"/>
+      <location filename="../src/modules/welcome/WelcomePage.cpp" line="212"/>
       <source>%1 support</source>
       <translation>%1 suporte</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="319"/>
       <source>About %1 setup</source>
       <translation>Sobre a configuração de %1</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="320"/>
       <source>About %1 installer</source>
       <translation>Sobre o instalador %1</translation>
     </message>
@@ -4153,19 +4148,16 @@ Saída:
     </message>
   </context>
   <context>
-    <name>about</name>
+    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/modules/welcomeq/about.qml" line="79"/>
-      <source>Back</source>
-      <translation>Voltar</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+      <source>About</source>
+      <translation>Sobre</translation>
     </message>
-  </context>
-  <context>
-    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/calamares/calamares-sidebar.qml" line="79"/>
-      <source>Show debug information</source>
-      <translation>Exibir informações de depuração</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+      <source>Debug</source>
+      <translation>Depuração</translation>
     </message>
   </context>
   <context>
@@ -4530,26 +4522,21 @@ Saída:
     </message>
     <message>
       <location filename="../src/modules/welcomeq/welcomeq.qml" line="66"/>
-      <source>About</source>
-      <translation>Sobre</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="80"/>
       <source>Support</source>
       <translation>Suporte</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="91"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="77"/>
       <source>Known issues</source>
       <translation>Problemas conhecidos</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="102"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="88"/>
       <source>Release notes</source>
       <translation>Notas de lançamento</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="114"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="100"/>
       <source>Donate</source>
       <translation>Faça uma doação</translation>
     </message>
diff --git a/lang/calamares_pt_PT.ts b/lang/calamares_pt_PT.ts
index 7c50a375abb1a1be3e6400671de13c00e5f7614c..7556313b9405aee1c51fec94a677ec66cd74852a 100644
--- a/lang/calamares_pt_PT.ts
+++ b/lang/calamares_pt_PT.ts
@@ -156,7 +156,7 @@
       <translation>Árvore de Widgets</translation>
     </message>
     <message>
-      <location filename="../src/calamares/DebugWindow.cpp" line="239"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="244"/>
       <source>Debug information</source>
       <translation>Informação de depuração</translation>
     </message>
@@ -509,12 +509,12 @@ O instalador será encerrado e todas as alterações serão perdidas.</translati
   <context>
     <name>CalamaresWindow</name>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="369"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
       <source>%1 Setup Program</source>
       <translation>%1 Programa de Instalação</translation>
     </message>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="370"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
       <source>%1 Installer</source>
       <translation>%1 Instalador</translation>
     </message>
@@ -1459,8 +1459,8 @@ O instalador será encerrado e todas as alterações serão perdidas.</translati
     </message>
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="260"/>
-      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphraseor delete and create a new encrypted partition.</source>
-      <translation>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.</translation>
+      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphrase or delete and create a new encrypted partition.</source>
+      <translation>Não foi possível desencriptar a partição %1 com a frase-chave introduzida.&lt;br/&gt;&lt;br/&gt;Edite novamente a partição e introduza a frase-chave correta ou elimine e crie uma nova partição encriptada.</translation>
     </message>
   </context>
   <context>
@@ -4033,61 +4033,56 @@ Saída de Dados:
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.ui" line="140"/>
-      <source>&amp;About</source>
-      <translation>&amp;Acerca</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="150"/>
       <source>Open donations website</source>
       <translation>Abrir site de doações</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="143"/>
       <source>&amp;Donate</source>
       <translation>&amp;Doar</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="163"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
       <source>Open help and support website</source>
       <translation>Abra o site de ajuda e suporte</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="156"/>
       <source>&amp;Support</source>
       <translation>&amp;Suporte</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="176"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
       <source>Open issues and bug-tracking website</source>
       <translation>Site de questões abertas e monitorização de erros</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="169"/>
       <source>&amp;Known issues</source>
       <translation>&amp;Problemas conhecidos</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="189"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
       <source>Open release notes website</source>
       <translation>Abrir o site com as notas de lançamento</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="192"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="182"/>
       <source>&amp;Release notes</source>
       <translation>&amp;Notas de lançamento</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="216"/>
+      <location filename="../src/modules/welcome/WelcomePage.cpp" line="212"/>
       <source>%1 support</source>
       <translation>Suporte do %1</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="319"/>
       <source>About %1 setup</source>
       <translation>Sobre a instalação de %1</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="320"/>
       <source>About %1 installer</source>
       <translation>Acerca do instalador %1</translation>
     </message>
@@ -4153,19 +4148,16 @@ Saída de Dados:
     </message>
   </context>
   <context>
-    <name>about</name>
+    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/modules/welcomeq/about.qml" line="79"/>
-      <source>Back</source>
-      <translation>Voltar</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+      <source>About</source>
+      <translation>Sobre</translation>
     </message>
-  </context>
-  <context>
-    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/calamares/calamares-sidebar.qml" line="79"/>
-      <source>Show debug information</source>
-      <translation>Mostrar informação de depuração</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+      <source>Debug</source>
+      <translation>Depuração</translation>
     </message>
   </context>
   <context>
@@ -4530,26 +4522,21 @@ Saída de Dados:
     </message>
     <message>
       <location filename="../src/modules/welcomeq/welcomeq.qml" line="66"/>
-      <source>About</source>
-      <translation>Sobre</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="80"/>
       <source>Support</source>
       <translation>Suporte</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="91"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="77"/>
       <source>Known issues</source>
       <translation>Problemas conhecidos</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="102"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="88"/>
       <source>Release notes</source>
       <translation>Notas de lançamento</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="114"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="100"/>
       <source>Donate</source>
       <translation>Doar</translation>
     </message>
diff --git a/lang/calamares_ro.ts b/lang/calamares_ro.ts
index a7584e3abcbcee0960044ef137d0c9a407dcc123..a5d15bdf235023bd80f5bd582bdc8d4a0d89bae9 100644
--- a/lang/calamares_ro.ts
+++ b/lang/calamares_ro.ts
@@ -156,7 +156,7 @@
       <translation>Arborele de widget</translation>
     </message>
     <message>
-      <location filename="../src/calamares/DebugWindow.cpp" line="239"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="244"/>
       <source>Debug information</source>
       <translation>Informație pentru depanare</translation>
     </message>
@@ -504,12 +504,12 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.</trans
   <context>
     <name>CalamaresWindow</name>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="369"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
       <source>%1 Setup Program</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="370"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
       <source>%1 Installer</source>
       <translation>Program de instalare %1</translation>
     </message>
@@ -1454,7 +1454,7 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.</trans
     </message>
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="260"/>
-      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphraseor delete and create a new encrypted partition.</source>
+      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphrase or delete and create a new encrypted partition.</source>
       <translation type="unfinished"/>
     </message>
   </context>
@@ -4026,61 +4026,56 @@ Output
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.ui" line="140"/>
-      <source>&amp;About</source>
-      <translation>&amp;Despre</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="150"/>
       <source>Open donations website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="143"/>
       <source>&amp;Donate</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="163"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
       <source>Open help and support website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="156"/>
       <source>&amp;Support</source>
       <translation>&amp;Suport</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="176"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
       <source>Open issues and bug-tracking website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="169"/>
       <source>&amp;Known issues</source>
       <translation>&amp;Probleme cunoscute</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="189"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
       <source>Open release notes website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="192"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="182"/>
       <source>&amp;Release notes</source>
       <translation>&amp;Note asupra ediției</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="216"/>
+      <location filename="../src/modules/welcome/WelcomePage.cpp" line="212"/>
       <source>%1 support</source>
       <translation>%1 suport</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="319"/>
       <source>About %1 setup</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="320"/>
       <source>About %1 installer</source>
       <translation>Despre programul de instalare %1</translation>
     </message>
@@ -4146,19 +4141,16 @@ Output
     </message>
   </context>
   <context>
-    <name>about</name>
+    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/modules/welcomeq/about.qml" line="79"/>
-      <source>Back</source>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+      <source>About</source>
       <translation type="unfinished"/>
     </message>
-  </context>
-  <context>
-    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/calamares/calamares-sidebar.qml" line="79"/>
-      <source>Show debug information</source>
-      <translation>Arată informația de depanare</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+      <source>Debug</source>
+      <translation>Depanare</translation>
     </message>
   </context>
   <context>
@@ -4495,26 +4487,21 @@ Output
     </message>
     <message>
       <location filename="../src/modules/welcomeq/welcomeq.qml" line="66"/>
-      <source>About</source>
-      <translation type="unfinished"/>
-    </message>
-    <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="80"/>
       <source>Support</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="91"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="77"/>
       <source>Known issues</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="102"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="88"/>
       <source>Release notes</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="114"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="100"/>
       <source>Donate</source>
       <translation type="unfinished"/>
     </message>
diff --git a/lang/calamares_ru.ts b/lang/calamares_ru.ts
index a17bc4b8b82a0ea946baed7875fb132d97918483..a5b16898b863be30a3478ffad25d7039830dac40 100644
--- a/lang/calamares_ru.ts
+++ b/lang/calamares_ru.ts
@@ -156,7 +156,7 @@
       <translation>Дерево виджетов</translation>
     </message>
     <message>
-      <location filename="../src/calamares/DebugWindow.cpp" line="239"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="244"/>
       <source>Debug information</source>
       <translation>Отладочная информация</translation>
     </message>
@@ -171,7 +171,7 @@
     <message>
       <location filename="../src/libcalamaresui/viewpages/ExecutionViewStep.cpp" line="118"/>
       <source>Install</source>
-      <translation>Установить</translation>
+      <translation>Установка</translation>
     </message>
   </context>
   <context>
@@ -286,7 +286,7 @@
         <numerusform>Ожидание %n модуля.</numerusform>
         <numerusform>Ожидание %n модулей.</numerusform>
         <numerusform>Ожидание %n модулей.</numerusform>
-        <numerusform>Ожидание %n модуля(модулей).</numerusform>
+        <numerusform>Ожидание %n модуля (модулей).</numerusform>
       </translation>
     </message>
     <message numerus="yes">
@@ -510,12 +510,12 @@ The installer will quit and all changes will be lost.</source>
   <context>
     <name>CalamaresWindow</name>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="369"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
       <source>%1 Setup Program</source>
       <translation>Программа установки %1</translation>
     </message>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="370"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
       <source>%1 Installer</source>
       <translation>Программа установки %1</translation>
     </message>
@@ -876,12 +876,12 @@ The installer will quit and all changes will be lost.</source>
     <message>
       <location filename="../src/modules/welcome/Config.cpp" line="274"/>
       <source>&lt;h1&gt;Welcome to the Calamares installer for %1&lt;/h1&gt;</source>
-      <translation>&lt;h1&gt;Добро пожаловать в программу установки Calamares для %1 .&lt;/h1&gt;</translation>
+      <translation>&lt;h1&gt;Добро пожаловать в программу установки Calamares для %1&lt;/h1&gt;</translation>
     </message>
     <message>
       <location filename="../src/modules/welcome/Config.cpp" line="275"/>
       <source>&lt;h1&gt;Welcome to the %1 installer&lt;/h1&gt;</source>
-      <translation>&lt;h1&gt;Добро пожаловать в программу установки %1 .&lt;/h1&gt;</translation>
+      <translation>&lt;h1&gt;Добро пожаловать в программу установки %1&lt;/h1&gt;</translation>
     </message>
     <message>
       <location filename="../src/modules/users/Config.cpp" line="236"/>
@@ -1460,7 +1460,7 @@ The installer will quit and all changes will be lost.</source>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="260"/>
-      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphraseor delete and create a new encrypted partition.</source>
+      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphrase or delete and create a new encrypted partition.</source>
       <translation type="unfinished"/>
     </message>
   </context>
@@ -1474,7 +1474,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
       <location filename="../src/modules/partition/gui/EncryptWidget.ui" line="36"/>
       <source>En&amp;crypt system</source>
-      <translation>Система &amp;шифрования</translation>
+      <translation>Настроить &amp;шифрование</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/EncryptWidget.ui" line="43"/>
@@ -1617,7 +1617,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
       <location filename="../src/modules/finishedq/FinishedQmlViewStep.cpp" line="35"/>
       <source>Finish</source>
-      <translation>Завершить</translation>
+      <translation>Завершение</translation>
     </message>
   </context>
   <context>
@@ -1625,7 +1625,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
       <location filename="../src/modules/finished/FinishedViewStep.cpp" line="46"/>
       <source>Finish</source>
-      <translation>Завершить</translation>
+      <translation>Завершение</translation>
     </message>
   </context>
   <context>
@@ -1712,7 +1712,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
       <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="198"/>
       <source>The installer is not running with administrator rights.</source>
-      <translation>Программа установки не запущена с привилегиями администратора.</translation>
+      <translation>Программа установки запущена без прав администратора.</translation>
     </message>
     <message>
       <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="206"/>
@@ -2624,7 +2624,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
       <location filename="../src/modules/keyboard/KeyboardPage.ui" line="135"/>
       <source>Type here to test your keyboard</source>
-      <translation>Эта область - для тестирования клавиатуры</translation>
+      <translation>Протестируйте клавиатуру здесь</translation>
     </message>
   </context>
   <context>
@@ -4039,61 +4039,56 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.ui" line="140"/>
-      <source>&amp;About</source>
-      <translation>&amp;О программе</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="150"/>
       <source>Open donations website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="143"/>
       <source>&amp;Donate</source>
       <translation>Пожертвовать</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="163"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
       <source>Open help and support website</source>
       <translation>Открыть сайт справки и поддержки</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="156"/>
       <source>&amp;Support</source>
       <translation>П&amp;оддержка</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="176"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
       <source>Open issues and bug-tracking website</source>
       <translation>Открыть сайт со списком известных проблем и отслеживанием ошибок</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="169"/>
       <source>&amp;Known issues</source>
       <translation>&amp;Известные проблемы</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="189"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
       <source>Open release notes website</source>
       <translation>Открыть сайт с заметками о выпуске</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="192"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="182"/>
       <source>&amp;Release notes</source>
       <translation>&amp;Примечания к выпуску</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="216"/>
+      <location filename="../src/modules/welcome/WelcomePage.cpp" line="212"/>
       <source>%1 support</source>
       <translation>%1 поддержка</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="319"/>
       <source>About %1 setup</source>
       <translation>О установке %1</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="320"/>
       <source>About %1 installer</source>
       <translation>О программе установки %1</translation>
     </message>
@@ -4159,19 +4154,16 @@ Output:
     </message>
   </context>
   <context>
-    <name>about</name>
+    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/modules/welcomeq/about.qml" line="79"/>
-      <source>Back</source>
-      <translation>Назад</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+      <source>About</source>
+      <translation>О Программе</translation>
     </message>
-  </context>
-  <context>
-    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/calamares/calamares-sidebar.qml" line="79"/>
-      <source>Show debug information</source>
-      <translation>Показать отладочную информацию</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+      <source>Debug</source>
+      <translation>Отладка</translation>
     </message>
   </context>
   <context>
@@ -4268,7 +4260,7 @@ Output:
     <message>
       <location filename="../src/modules/keyboardq/keyboardq.qml" line="265"/>
       <source>Type here to test your keyboard</source>
-      <translation>Эта область - для тестирования клавиатуры</translation>
+      <translation>Протестируйте клавиатуру здесь</translation>
     </message>
     <message>
       <location filename="../src/modules/keyboardq/keyboardq.qml" line="180"/>
@@ -4510,26 +4502,21 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcomeq/welcomeq.qml" line="66"/>
-      <source>About</source>
-      <translation>О Программе</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="80"/>
       <source>Support</source>
       <translation>Поддержка</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="91"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="77"/>
       <source>Known issues</source>
       <translation>Известные проблемы</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="102"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="88"/>
       <source>Release notes</source>
       <translation>Примечания к выпуску</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="114"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="100"/>
       <source>Donate</source>
       <translation>Пожертвовать</translation>
     </message>
diff --git a/lang/calamares_si.ts b/lang/calamares_si.ts
index 7f1505f70c02c9142c4c56d851de7241afe2f9de..067afae9afeb11970e20a74081d1e9d85217ae3f 100644
--- a/lang/calamares_si.ts
+++ b/lang/calamares_si.ts
@@ -156,7 +156,7 @@
       <translation>විජට් ගස</translation>
     </message>
     <message>
-      <location filename="../src/calamares/DebugWindow.cpp" line="239"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="244"/>
       <source>Debug information</source>
       <translation>දෝශ නිරාකරණ තොරතුරු</translation>
     </message>
@@ -507,12 +507,12 @@ The installer will quit and all changes will be lost.</source>
   <context>
     <name>CalamaresWindow</name>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="369"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
       <source>%1 Setup Program</source>
       <translation>%1 සැකසුම් වැඩසටහන</translation>
     </message>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="370"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
       <source>%1 Installer</source>
       <translation>%1 ස්ථාපකය</translation>
     </message>
@@ -1457,7 +1457,7 @@ The installer will quit and all changes will be lost.</source>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="260"/>
-      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphraseor delete and create a new encrypted partition.</source>
+      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphrase or delete and create a new encrypted partition.</source>
       <translation type="unfinished"/>
     </message>
   </context>
@@ -4022,61 +4022,56 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.ui" line="140"/>
-      <source>&amp;About</source>
-      <translation>ගැන (&amp;A)</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="150"/>
       <source>Open donations website</source>
       <translation>පරිත්‍යාග වෙබ් අඩවිය විවෘත කරන්න</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="143"/>
       <source>&amp;Donate</source>
       <translation>පරිත්‍යාග කරන්න (&amp;D)</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="163"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
       <source>Open help and support website</source>
       <translation>උදව් සහ සහාය වෙබ් අඩවිය විවෘත කරන්න</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="156"/>
       <source>&amp;Support</source>
       <translation>සහාය (&amp;S)</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="176"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
       <source>Open issues and bug-tracking website</source>
       <translation>ගැටළු සහ දෝෂ ලුහුබැඳීමේ වෙබ් අඩවිය විවෘත කරන්න</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="169"/>
       <source>&amp;Known issues</source>
       <translation>දන්නා ගැටළු (&amp;K)</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="189"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
       <source>Open release notes website</source>
       <translation>නිකුතු සටහන් වෙබ් අඩවිය විවෘත කරන්න</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="192"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="182"/>
       <source>&amp;Release notes</source>
       <translation>නිකුත් කිරීමේ සටහන් (&amp;R)</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="216"/>
+      <location filename="../src/modules/welcome/WelcomePage.cpp" line="212"/>
       <source>%1 support</source>
       <translation>%1 සහාය</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="319"/>
       <source>About %1 setup</source>
       <translation>%1 පිහිටුවීම ගැන</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="320"/>
       <source>About %1 installer</source>
       <translation>%1 ස්ථාපකය ගැන</translation>
     </message>
@@ -4142,19 +4137,16 @@ Output:
     </message>
   </context>
   <context>
-    <name>about</name>
+    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/modules/welcomeq/about.qml" line="79"/>
-      <source>Back</source>
-      <translation>ආපසු</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+      <source>About</source>
+      <translation>ගැන</translation>
     </message>
-  </context>
-  <context>
-    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/calamares/calamares-sidebar.qml" line="79"/>
-      <source>Show debug information</source>
-      <translation>දෝශ නිරාකරණ තොරතුරු පෙන්වන්න</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+      <source>Debug</source>
+      <translation type="unfinished"/>
     </message>
   </context>
   <context>
@@ -4519,26 +4511,21 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcomeq/welcomeq.qml" line="66"/>
-      <source>About</source>
-      <translation>ගැන</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="80"/>
       <source>Support</source>
       <translation>සහාය</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="91"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="77"/>
       <source>Known issues</source>
       <translation>දන්නා ගැටළු</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="102"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="88"/>
       <source>Release notes</source>
       <translation>නිකුත් කිරීමේ සටහන්</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="114"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="100"/>
       <source>Donate</source>
       <translation>පරිත්‍යාග කරන්න</translation>
     </message>
diff --git a/lang/calamares_sk.ts b/lang/calamares_sk.ts
index 50ff9d432aaf884fa73e5544be1dc858398f0fa1..c11b2b050af27c36da27302ec9aae60bddaa341b 100644
--- a/lang/calamares_sk.ts
+++ b/lang/calamares_sk.ts
@@ -156,7 +156,7 @@
       <translation>Strom miniaplikácií</translation>
     </message>
     <message>
-      <location filename="../src/calamares/DebugWindow.cpp" line="239"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="244"/>
       <source>Debug information</source>
       <translation>Ladiace informácie</translation>
     </message>
@@ -507,12 +507,12 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.</translation>
   <context>
     <name>CalamaresWindow</name>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="369"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
       <source>%1 Setup Program</source>
       <translation>Inštalačný program distribúcie %1</translation>
     </message>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="370"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
       <source>%1 Installer</source>
       <translation>Inštalátor distribúcie %1</translation>
     </message>
@@ -1458,7 +1458,7 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="260"/>
-      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphraseor delete and create a new encrypted partition.</source>
+      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphrase or delete and create a new encrypted partition.</source>
       <translation type="unfinished"/>
     </message>
   </context>
@@ -4040,61 +4040,56 @@ Výstup:
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.ui" line="140"/>
-      <source>&amp;About</source>
-      <translation>&amp;O inštalátore</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="150"/>
       <source>Open donations website</source>
       <translation>Otvoriť webovú stránku s príspevkami</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="143"/>
       <source>&amp;Donate</source>
       <translation>&amp;Prispieť</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="163"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
       <source>Open help and support website</source>
       <translation>Otvoriť webovú stránku s pomocou a podporou</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="156"/>
       <source>&amp;Support</source>
       <translation>Po&amp;dpora</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="176"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
       <source>Open issues and bug-tracking website</source>
       <translation>Otvoriť webovú stránku s problémami a chybami</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="169"/>
       <source>&amp;Known issues</source>
       <translation>&amp;Známe problémy</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="189"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
       <source>Open release notes website</source>
       <translation>Otvoriť webovú stránku s poznámkami k vydaniu</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="192"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="182"/>
       <source>&amp;Release notes</source>
       <translation>&amp;Poznámky k vydaniu</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="216"/>
+      <location filename="../src/modules/welcome/WelcomePage.cpp" line="212"/>
       <source>%1 support</source>
       <translation>Podpora distribúcie %1</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="319"/>
       <source>About %1 setup</source>
       <translation>O inštalátore %1</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="320"/>
       <source>About %1 installer</source>
       <translation>O inštalátore %1</translation>
     </message>
@@ -4160,19 +4155,16 @@ Výstup:
     </message>
   </context>
   <context>
-    <name>about</name>
+    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/modules/welcomeq/about.qml" line="79"/>
-      <source>Back</source>
-      <translation>Späť</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+      <source>About</source>
+      <translation>O inštalátore</translation>
     </message>
-  </context>
-  <context>
-    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/calamares/calamares-sidebar.qml" line="79"/>
-      <source>Show debug information</source>
-      <translation>Zobraziť ladiace informácie</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+      <source>Debug</source>
+      <translation>Ladiť</translation>
     </message>
   </context>
   <context>
@@ -4516,26 +4508,21 @@ Výstup:
     </message>
     <message>
       <location filename="../src/modules/welcomeq/welcomeq.qml" line="66"/>
-      <source>About</source>
-      <translation>O inštalátore</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="80"/>
       <source>Support</source>
       <translation>Podpora</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="91"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="77"/>
       <source>Known issues</source>
       <translation>Známe problémy</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="102"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="88"/>
       <source>Release notes</source>
       <translation>Poznámky k vydaniu</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="114"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="100"/>
       <source>Donate</source>
       <translation>Prispieť</translation>
     </message>
diff --git a/lang/calamares_sl.ts b/lang/calamares_sl.ts
index ddc82adc13ee893f5f33a430015f3df56f0c7ac2..3f4d2adb0cb889c10533a7ceac3690b7f202929c 100644
--- a/lang/calamares_sl.ts
+++ b/lang/calamares_sl.ts
@@ -156,7 +156,7 @@
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/calamares/DebugWindow.cpp" line="239"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="244"/>
       <source>Debug information</source>
       <translation type="unfinished"/>
     </message>
@@ -506,12 +506,12 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene.</translation>
   <context>
     <name>CalamaresWindow</name>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="369"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
       <source>%1 Setup Program</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="370"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
       <source>%1 Installer</source>
       <translation>%1 Namestilnik</translation>
     </message>
@@ -1456,7 +1456,7 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene.</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="260"/>
-      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphraseor delete and create a new encrypted partition.</source>
+      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphrase or delete and create a new encrypted partition.</source>
       <translation type="unfinished"/>
     </message>
   </context>
@@ -4031,61 +4031,56 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.ui" line="140"/>
-      <source>&amp;About</source>
-      <translation type="unfinished"/>
-    </message>
-    <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="150"/>
       <source>Open donations website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="143"/>
       <source>&amp;Donate</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="163"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
       <source>Open help and support website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="156"/>
       <source>&amp;Support</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="176"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
       <source>Open issues and bug-tracking website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="169"/>
       <source>&amp;Known issues</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="189"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
       <source>Open release notes website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="192"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="182"/>
       <source>&amp;Release notes</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="216"/>
+      <location filename="../src/modules/welcome/WelcomePage.cpp" line="212"/>
       <source>%1 support</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="319"/>
       <source>About %1 setup</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="320"/>
       <source>About %1 installer</source>
       <translation type="unfinished"/>
     </message>
@@ -4151,19 +4146,16 @@ Output:
     </message>
   </context>
   <context>
-    <name>about</name>
+    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/modules/welcomeq/about.qml" line="79"/>
-      <source>Back</source>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+      <source>About</source>
       <translation type="unfinished"/>
     </message>
-  </context>
-  <context>
-    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/calamares/calamares-sidebar.qml" line="79"/>
-      <source>Show debug information</source>
-      <translation type="unfinished"/>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+      <source>Debug</source>
+      <translation>Razhroščevanje</translation>
     </message>
   </context>
   <context>
@@ -4500,26 +4492,21 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcomeq/welcomeq.qml" line="66"/>
-      <source>About</source>
-      <translation type="unfinished"/>
-    </message>
-    <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="80"/>
       <source>Support</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="91"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="77"/>
       <source>Known issues</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="102"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="88"/>
       <source>Release notes</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="114"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="100"/>
       <source>Donate</source>
       <translation type="unfinished"/>
     </message>
diff --git a/lang/calamares_sq.ts b/lang/calamares_sq.ts
index 25d9c8f5263a995503bcf2e267336d09c31fef83..1c8ac3f474dbdb29370fb63c9ae9e67083e87353 100644
--- a/lang/calamares_sq.ts
+++ b/lang/calamares_sq.ts
@@ -156,7 +156,7 @@
       <translation>Pemë Widget-esh</translation>
     </message>
     <message>
-      <location filename="../src/calamares/DebugWindow.cpp" line="239"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="244"/>
       <source>Debug information</source>
       <translation>Të dhëna diagnostikimi</translation>
     </message>
@@ -507,12 +507,12 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej.</translation>
   <context>
     <name>CalamaresWindow</name>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="369"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
       <source>%1 Setup Program</source>
       <translation>Programi i Rregullimit të %1</translation>
     </message>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="370"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
       <source>%1 Installer</source>
       <translation>Instalues %1</translation>
     </message>
@@ -1457,7 +1457,7 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej.</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="260"/>
-      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphraseor delete and create a new encrypted partition.</source>
+      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphrase or delete and create a new encrypted partition.</source>
       <translation type="unfinished"/>
     </message>
   </context>
@@ -4020,61 +4020,56 @@ Përfundim:
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.ui" line="140"/>
-      <source>&amp;About</source>
-      <translation>&amp;Mbi</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="150"/>
       <source>Open donations website</source>
       <translation>Hap sajtin e dhurimeve</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="143"/>
       <source>&amp;Donate</source>
       <translation>&amp;Dhuroni</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="163"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
       <source>Open help and support website</source>
       <translation>Hap sajtin e ndihmës dhe asistencës</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="156"/>
       <source>&amp;Support</source>
       <translation>&amp;Asistencë</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="176"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
       <source>Open issues and bug-tracking website</source>
       <translation>Hap sajtin ndjekjes së problemeve dhe të metave</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="169"/>
       <source>&amp;Known issues</source>
       <translation>&amp;Probleme të njohura</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="189"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
       <source>Open release notes website</source>
       <translation>Hapni sajtin e shënimeve mbi hedhjet në qarkullim</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="192"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="182"/>
       <source>&amp;Release notes</source>
       <translation>Shënime &amp;versioni</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="216"/>
+      <location filename="../src/modules/welcome/WelcomePage.cpp" line="212"/>
       <source>%1 support</source>
       <translation>Asistencë %1</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="319"/>
       <source>About %1 setup</source>
       <translation>Mbi rregullimin e %1</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="320"/>
       <source>About %1 installer</source>
       <translation>Rreth instaluesit %1</translation>
     </message>
@@ -4140,19 +4135,16 @@ Përfundim:
     </message>
   </context>
   <context>
-    <name>about</name>
+    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/modules/welcomeq/about.qml" line="79"/>
-      <source>Back</source>
-      <translation>Mbrapsht</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+      <source>About</source>
+      <translation>Mbi</translation>
     </message>
-  </context>
-  <context>
-    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/calamares/calamares-sidebar.qml" line="79"/>
-      <source>Show debug information</source>
-      <translation>Shfaq të dhëna diagnostikimi</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+      <source>Debug</source>
+      <translation type="unfinished"/>
     </message>
   </context>
   <context>
@@ -4517,26 +4509,21 @@ Përfundim:
     </message>
     <message>
       <location filename="../src/modules/welcomeq/welcomeq.qml" line="66"/>
-      <source>About</source>
-      <translation>Mbi</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="80"/>
       <source>Support</source>
       <translation>Asistencë</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="91"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="77"/>
       <source>Known issues</source>
       <translation>Probleme të njohura</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="102"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="88"/>
       <source>Release notes</source>
       <translation>Shënime hedhjeje në qarkullim</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="114"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="100"/>
       <source>Donate</source>
       <translation>Dhuroni</translation>
     </message>
diff --git a/lang/calamares_sr.ts b/lang/calamares_sr.ts
index dcbfdbba8399cd7d9f2c2779a933b25a242098e2..f81e621f3bd231856ff6206608a36449df083c90 100644
--- a/lang/calamares_sr.ts
+++ b/lang/calamares_sr.ts
@@ -156,7 +156,7 @@
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/calamares/DebugWindow.cpp" line="239"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="244"/>
       <source>Debug information</source>
       <translation type="unfinished"/>
     </message>
@@ -504,12 +504,12 @@ The installer will quit and all changes will be lost.</source>
   <context>
     <name>CalamaresWindow</name>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="369"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
       <source>%1 Setup Program</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="370"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
       <source>%1 Installer</source>
       <translation>%1 инсталер</translation>
     </message>
@@ -1454,7 +1454,7 @@ The installer will quit and all changes will be lost.</source>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="260"/>
-      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphraseor delete and create a new encrypted partition.</source>
+      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphrase or delete and create a new encrypted partition.</source>
       <translation type="unfinished"/>
     </message>
   </context>
@@ -4020,61 +4020,56 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.ui" line="140"/>
-      <source>&amp;About</source>
-      <translation>&amp;О програму</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="150"/>
       <source>Open donations website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="143"/>
       <source>&amp;Donate</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="163"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
       <source>Open help and support website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="156"/>
       <source>&amp;Support</source>
       <translation>По&amp;дршка</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="176"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
       <source>Open issues and bug-tracking website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="169"/>
       <source>&amp;Known issues</source>
       <translation>&amp;Познати проблеми</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="189"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
       <source>Open release notes website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="192"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="182"/>
       <source>&amp;Release notes</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="216"/>
+      <location filename="../src/modules/welcome/WelcomePage.cpp" line="212"/>
       <source>%1 support</source>
       <translation>%1 подршка</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="319"/>
       <source>About %1 setup</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="320"/>
       <source>About %1 installer</source>
       <translation>О %1 инсталатеру</translation>
     </message>
@@ -4140,19 +4135,16 @@ Output:
     </message>
   </context>
   <context>
-    <name>about</name>
+    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/modules/welcomeq/about.qml" line="79"/>
-      <source>Back</source>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+      <source>About</source>
       <translation type="unfinished"/>
     </message>
-  </context>
-  <context>
-    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/calamares/calamares-sidebar.qml" line="79"/>
-      <source>Show debug information</source>
-      <translation type="unfinished"/>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+      <source>Debug</source>
+      <translation>Уклањање грешака</translation>
     </message>
   </context>
   <context>
@@ -4489,26 +4481,21 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcomeq/welcomeq.qml" line="66"/>
-      <source>About</source>
-      <translation type="unfinished"/>
-    </message>
-    <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="80"/>
       <source>Support</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="91"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="77"/>
       <source>Known issues</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="102"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="88"/>
       <source>Release notes</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="114"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="100"/>
       <source>Donate</source>
       <translation type="unfinished"/>
     </message>
diff --git a/lang/calamares_sr@latin.ts b/lang/calamares_sr@latin.ts
index 6c28b5c7f2e81c8797e6c1d9c1a7c3e00f111846..d588941c1ee1b238de9932c1cc9fd197019b1db5 100644
--- a/lang/calamares_sr@latin.ts
+++ b/lang/calamares_sr@latin.ts
@@ -156,7 +156,7 @@
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/calamares/DebugWindow.cpp" line="239"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="244"/>
       <source>Debug information</source>
       <translation type="unfinished"/>
     </message>
@@ -504,12 +504,12 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene.</translation>
   <context>
     <name>CalamaresWindow</name>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="369"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
       <source>%1 Setup Program</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="370"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
       <source>%1 Installer</source>
       <translation>%1 Instaler</translation>
     </message>
@@ -1454,7 +1454,7 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene.</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="260"/>
-      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphraseor delete and create a new encrypted partition.</source>
+      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphrase or delete and create a new encrypted partition.</source>
       <translation type="unfinished"/>
     </message>
   </context>
@@ -4020,61 +4020,56 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.ui" line="140"/>
-      <source>&amp;About</source>
-      <translation type="unfinished"/>
-    </message>
-    <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="150"/>
       <source>Open donations website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="143"/>
       <source>&amp;Donate</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="163"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
       <source>Open help and support website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="156"/>
       <source>&amp;Support</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="176"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
       <source>Open issues and bug-tracking website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="169"/>
       <source>&amp;Known issues</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="189"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
       <source>Open release notes website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="192"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="182"/>
       <source>&amp;Release notes</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="216"/>
+      <location filename="../src/modules/welcome/WelcomePage.cpp" line="212"/>
       <source>%1 support</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="319"/>
       <source>About %1 setup</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="320"/>
       <source>About %1 installer</source>
       <translation type="unfinished"/>
     </message>
@@ -4140,19 +4135,16 @@ Output:
     </message>
   </context>
   <context>
-    <name>about</name>
+    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/modules/welcomeq/about.qml" line="79"/>
-      <source>Back</source>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+      <source>About</source>
       <translation type="unfinished"/>
     </message>
-  </context>
-  <context>
-    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/calamares/calamares-sidebar.qml" line="79"/>
-      <source>Show debug information</source>
-      <translation type="unfinished"/>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+      <source>Debug</source>
+      <translation>Otklanjanje greški</translation>
     </message>
   </context>
   <context>
@@ -4489,26 +4481,21 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcomeq/welcomeq.qml" line="66"/>
-      <source>About</source>
-      <translation type="unfinished"/>
-    </message>
-    <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="80"/>
       <source>Support</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="91"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="77"/>
       <source>Known issues</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="102"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="88"/>
       <source>Release notes</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="114"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="100"/>
       <source>Donate</source>
       <translation type="unfinished"/>
     </message>
diff --git a/lang/calamares_sv.ts b/lang/calamares_sv.ts
index 4ae4fdaacc7f3ef883d77249d9c99aac89a040d7..181d2a5c05e8ae202bc14d6a493d304e08b310bb 100644
--- a/lang/calamares_sv.ts
+++ b/lang/calamares_sv.ts
@@ -156,7 +156,7 @@
       <translation>Widgetträd</translation>
     </message>
     <message>
-      <location filename="../src/calamares/DebugWindow.cpp" line="239"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="244"/>
       <source>Debug information</source>
       <translation>Avlusningsinformation</translation>
     </message>
@@ -506,12 +506,12 @@ Alla ändringar kommer att gå förlorade.</translation>
   <context>
     <name>CalamaresWindow</name>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="369"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
       <source>%1 Setup Program</source>
       <translation>%1 Installationsprogram</translation>
     </message>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="370"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
       <source>%1 Installer</source>
       <translation>%1-installationsprogram</translation>
     </message>
@@ -1456,7 +1456,7 @@ Alla ändringar kommer att gå förlorade.</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="260"/>
-      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphraseor delete and create a new encrypted partition.</source>
+      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphrase or delete and create a new encrypted partition.</source>
       <translation>Partition %1 kunde inte dekrypteras med den angivna lösenfrasen. &lt;br/&gt;&lt;br/&gt;Redigera partitionen igen och ange den korrekta lösenfrasen eller ta bort och skapa en ny krypterad partition</translation>
     </message>
   </context>
@@ -4022,61 +4022,56 @@ Installationen kan inte fortsätta.&lt;/p&gt;</translation>
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.ui" line="140"/>
-      <source>&amp;About</source>
-      <translation>&amp;Om</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="150"/>
       <source>Open donations website</source>
       <translation>Besök webbplatsen för donationer</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="143"/>
       <source>&amp;Donate</source>
       <translation>&amp;Donera</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="163"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
       <source>Open help and support website</source>
       <translation>Besök webbplatsen för hjälp och support</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="156"/>
       <source>&amp;Support</source>
       <translation>&amp;Support</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="176"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
       <source>Open issues and bug-tracking website</source>
       <translation>Besök webbplatsen för problem och felsökning</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="169"/>
       <source>&amp;Known issues</source>
       <translation>&amp;Kända problem</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="189"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
       <source>Open release notes website</source>
       <translation>Besök webbplatsen för versionsinformation</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="192"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="182"/>
       <source>&amp;Release notes</source>
       <translation>Versionsinformation, &amp;R</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="216"/>
+      <location filename="../src/modules/welcome/WelcomePage.cpp" line="212"/>
       <source>%1 support</source>
       <translation>%1-support</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="319"/>
       <source>About %1 setup</source>
       <translation>Om inställningarna för %1</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="320"/>
       <source>About %1 installer</source>
       <translation>Om %1-installationsprogrammet</translation>
     </message>
@@ -4142,19 +4137,16 @@ Installationen kan inte fortsätta.&lt;/p&gt;</translation>
     </message>
   </context>
   <context>
-    <name>about</name>
+    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/modules/welcomeq/about.qml" line="79"/>
-      <source>Back</source>
-      <translation>Bakåt</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+      <source>About</source>
+      <translation>Om</translation>
     </message>
-  </context>
-  <context>
-    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/calamares/calamares-sidebar.qml" line="79"/>
-      <source>Show debug information</source>
-      <translation>Visa avlusningsinformation</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+      <source>Debug</source>
+      <translation>Avlusning</translation>
     </message>
   </context>
   <context>
@@ -4519,26 +4511,21 @@ Systems nationella inställningar påverkar nummer och datumformat. Den nuvarand
     </message>
     <message>
       <location filename="../src/modules/welcomeq/welcomeq.qml" line="66"/>
-      <source>About</source>
-      <translation>Om</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="80"/>
       <source>Support</source>
       <translation>Support</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="91"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="77"/>
       <source>Known issues</source>
       <translation>Kända problem</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="102"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="88"/>
       <source>Release notes</source>
       <translation>Versionsinformation</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="114"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="100"/>
       <source>Donate</source>
       <translation>Donera</translation>
     </message>
diff --git a/lang/calamares_ta_IN.ts b/lang/calamares_ta_IN.ts
index dbed543b6d2a1d145048856ce574072d52a56375..0fd9c5d3dbacbbe161f2417fd18d9511ba17dc06 100644
--- a/lang/calamares_ta_IN.ts
+++ b/lang/calamares_ta_IN.ts
@@ -156,7 +156,7 @@
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/calamares/DebugWindow.cpp" line="239"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="244"/>
       <source>Debug information</source>
       <translation type="unfinished"/>
     </message>
@@ -501,12 +501,12 @@ The installer will quit and all changes will be lost.</source>
   <context>
     <name>CalamaresWindow</name>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="369"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
       <source>%1 Setup Program</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="370"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
       <source>%1 Installer</source>
       <translation type="unfinished"/>
     </message>
@@ -1451,7 +1451,7 @@ The installer will quit and all changes will be lost.</source>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="260"/>
-      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphraseor delete and create a new encrypted partition.</source>
+      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphrase or delete and create a new encrypted partition.</source>
       <translation type="unfinished"/>
     </message>
   </context>
@@ -4008,61 +4008,56 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.ui" line="140"/>
-      <source>&amp;About</source>
-      <translation type="unfinished"/>
-    </message>
-    <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="150"/>
       <source>Open donations website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="143"/>
       <source>&amp;Donate</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="163"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
       <source>Open help and support website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="156"/>
       <source>&amp;Support</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="176"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
       <source>Open issues and bug-tracking website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="169"/>
       <source>&amp;Known issues</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="189"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
       <source>Open release notes website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="192"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="182"/>
       <source>&amp;Release notes</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="216"/>
+      <location filename="../src/modules/welcome/WelcomePage.cpp" line="212"/>
       <source>%1 support</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="319"/>
       <source>About %1 setup</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="320"/>
       <source>About %1 installer</source>
       <translation type="unfinished"/>
     </message>
@@ -4128,18 +4123,15 @@ Output:
     </message>
   </context>
   <context>
-    <name>about</name>
+    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/modules/welcomeq/about.qml" line="79"/>
-      <source>Back</source>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+      <source>About</source>
       <translation type="unfinished"/>
     </message>
-  </context>
-  <context>
-    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/calamares/calamares-sidebar.qml" line="79"/>
-      <source>Show debug information</source>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+      <source>Debug</source>
       <translation type="unfinished"/>
     </message>
   </context>
@@ -4477,26 +4469,21 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcomeq/welcomeq.qml" line="66"/>
-      <source>About</source>
-      <translation type="unfinished"/>
-    </message>
-    <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="80"/>
       <source>Support</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="91"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="77"/>
       <source>Known issues</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="102"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="88"/>
       <source>Release notes</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="114"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="100"/>
       <source>Donate</source>
       <translation type="unfinished"/>
     </message>
diff --git a/lang/calamares_te.ts b/lang/calamares_te.ts
index e7ef871de459c6fedd051aca8306ca5b25bab70f..4b00ab35523ddef2f567c112dcd2f908c18aa41b 100644
--- a/lang/calamares_te.ts
+++ b/lang/calamares_te.ts
@@ -158,7 +158,7 @@ automatic ఉంటుంది, మీరు మాన్యువల్ వి
       <translation>విడ్జెట్ ట్రీ</translation>
     </message>
     <message>
-      <location filename="../src/calamares/DebugWindow.cpp" line="239"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="244"/>
       <source>Debug information</source>
       <translation>డీబగ్ సమాచారం</translation>
     </message>
@@ -503,12 +503,12 @@ The installer will quit and all changes will be lost.</source>
   <context>
     <name>CalamaresWindow</name>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="369"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
       <source>%1 Setup Program</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="370"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
       <source>%1 Installer</source>
       <translation type="unfinished"/>
     </message>
@@ -1453,7 +1453,7 @@ The installer will quit and all changes will be lost.</source>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="260"/>
-      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphraseor delete and create a new encrypted partition.</source>
+      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphrase or delete and create a new encrypted partition.</source>
       <translation type="unfinished"/>
     </message>
   </context>
@@ -4010,61 +4010,56 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.ui" line="140"/>
-      <source>&amp;About</source>
-      <translation type="unfinished"/>
-    </message>
-    <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="150"/>
       <source>Open donations website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="143"/>
       <source>&amp;Donate</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="163"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
       <source>Open help and support website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="156"/>
       <source>&amp;Support</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="176"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
       <source>Open issues and bug-tracking website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="169"/>
       <source>&amp;Known issues</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="189"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
       <source>Open release notes website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="192"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="182"/>
       <source>&amp;Release notes</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="216"/>
+      <location filename="../src/modules/welcome/WelcomePage.cpp" line="212"/>
       <source>%1 support</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="319"/>
       <source>About %1 setup</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="320"/>
       <source>About %1 installer</source>
       <translation type="unfinished"/>
     </message>
@@ -4130,18 +4125,15 @@ Output:
     </message>
   </context>
   <context>
-    <name>about</name>
+    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/modules/welcomeq/about.qml" line="79"/>
-      <source>Back</source>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+      <source>About</source>
       <translation type="unfinished"/>
     </message>
-  </context>
-  <context>
-    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/calamares/calamares-sidebar.qml" line="79"/>
-      <source>Show debug information</source>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+      <source>Debug</source>
       <translation type="unfinished"/>
     </message>
   </context>
@@ -4479,26 +4471,21 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcomeq/welcomeq.qml" line="66"/>
-      <source>About</source>
-      <translation type="unfinished"/>
-    </message>
-    <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="80"/>
       <source>Support</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="91"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="77"/>
       <source>Known issues</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="102"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="88"/>
       <source>Release notes</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="114"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="100"/>
       <source>Donate</source>
       <translation type="unfinished"/>
     </message>
diff --git a/lang/calamares_tg.ts b/lang/calamares_tg.ts
index 39ba940674a54913a36c95f09ec025a63b30c247..404053a438613c25825784862b3a857bb8a9f3a7 100644
--- a/lang/calamares_tg.ts
+++ b/lang/calamares_tg.ts
@@ -156,7 +156,7 @@
       <translation>Дарахти виҷетҳо</translation>
     </message>
     <message>
-      <location filename="../src/calamares/DebugWindow.cpp" line="239"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="244"/>
       <source>Debug information</source>
       <translation>Иттилооти ислоҳи нуқсонҳо</translation>
     </message>
@@ -503,12 +503,12 @@ The installer will quit and all changes will be lost.</source>
   <context>
     <name>CalamaresWindow</name>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="369"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
       <source>%1 Setup Program</source>
       <translation>Барномаи танзимкунии %1</translation>
     </message>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="370"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
       <source>%1 Installer</source>
       <translation>Насбкунандаи %1</translation>
     </message>
@@ -1453,7 +1453,7 @@ The installer will quit and all changes will be lost.</source>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="260"/>
-      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphraseor delete and create a new encrypted partition.</source>
+      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphrase or delete and create a new encrypted partition.</source>
       <translation type="unfinished"/>
     </message>
   </context>
@@ -4018,61 +4018,56 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.ui" line="140"/>
-      <source>&amp;About</source>
-      <translation>&amp;Дар бораи барнома</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="150"/>
       <source>Open donations website</source>
       <translation>Сомонаи саҳмгузориро кушоед</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="143"/>
       <source>&amp;Donate</source>
       <translation>&amp;Саҳмгузорӣ</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="163"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
       <source>Open help and support website</source>
       <translation>Сомонаи кумак ва дастгириро кушоед</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="156"/>
       <source>&amp;Support</source>
       <translation>&amp;Дастгирӣ</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="176"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
       <source>Open issues and bug-tracking website</source>
       <translation>Сомонаи масъалаҳо ва пайгирии нуқсонҳоро кушоед</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="169"/>
       <source>&amp;Known issues</source>
       <translation>&amp;Масъалаҳои маълум</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="189"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
       <source>Open release notes website</source>
       <translation>Сомонаро бо қайдҳои нашр кушоед</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="192"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="182"/>
       <source>&amp;Release notes</source>
       <translation>&amp;Қайдҳои нашр</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="216"/>
+      <location filename="../src/modules/welcome/WelcomePage.cpp" line="212"/>
       <source>%1 support</source>
       <translation>Дастгирии %1</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="319"/>
       <source>About %1 setup</source>
       <translation>Дар бораи танзими %1</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="320"/>
       <source>About %1 installer</source>
       <translation>Дар бораи насбкунандаи %1</translation>
     </message>
@@ -4138,20 +4133,16 @@ Output:
     </message>
   </context>
   <context>
-    <name>about</name>
+    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/modules/welcomeq/about.qml" line="79"/>
-      <source>Back</source>
-      <translation>Ба қафо</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+      <source>About</source>
+      <translation>Дар бораи барнома</translation>
     </message>
-  </context>
-  <context>
-    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/calamares/calamares-sidebar.qml" line="79"/>
-      <source>Show debug information</source>
-      <translation>Намоиши иттилооти
-ислоҳи нуқсонҳо</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+      <source>Debug</source>
+      <translation type="unfinished"/>
     </message>
   </context>
   <context>
@@ -4512,26 +4503,21 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcomeq/welcomeq.qml" line="66"/>
-      <source>About</source>
-      <translation>Дар бораи барнома</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="80"/>
       <source>Support</source>
       <translation>Дастгирӣ</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="91"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="77"/>
       <source>Known issues</source>
       <translation>Масъалаҳои маълум</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="102"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="88"/>
       <source>Release notes</source>
       <translation>Қайдҳои нашр</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="114"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="100"/>
       <source>Donate</source>
       <translation>Саҳмгузорӣ</translation>
     </message>
diff --git a/lang/calamares_th.ts b/lang/calamares_th.ts
index 9cd94ae733aca8ff94c0bdf444ec112c8a88bd22..305b8b176ab858031aa887f64d8435af4a39ab03 100644
--- a/lang/calamares_th.ts
+++ b/lang/calamares_th.ts
@@ -156,7 +156,7 @@
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/calamares/DebugWindow.cpp" line="239"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="244"/>
       <source>Debug information</source>
       <translation>ข้อมูลดีบั๊ก</translation>
     </message>
@@ -500,12 +500,12 @@ The installer will quit and all changes will be lost.</source>
   <context>
     <name>CalamaresWindow</name>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="369"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
       <source>%1 Setup Program</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="370"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
       <source>%1 Installer</source>
       <translation>ตัวติดตั้ง %1</translation>
     </message>
@@ -1450,7 +1450,7 @@ The installer will quit and all changes will be lost.</source>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="260"/>
-      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphraseor delete and create a new encrypted partition.</source>
+      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphrase or delete and create a new encrypted partition.</source>
       <translation type="unfinished"/>
     </message>
   </context>
@@ -3998,61 +3998,56 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.ui" line="140"/>
-      <source>&amp;About</source>
-      <translation>&amp;เกี่ยวกับ</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="150"/>
       <source>Open donations website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="143"/>
       <source>&amp;Donate</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="163"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
       <source>Open help and support website</source>
       <translation>เปิดเว็บไซต์ช่วยเหลือและสนับสนุน</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="156"/>
       <source>&amp;Support</source>
       <translation>&amp;S ช่วยเหลือ</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="176"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
       <source>Open issues and bug-tracking website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="169"/>
       <source>&amp;Known issues</source>
       <translation>&amp;K ปัญหาที่รู้จัก</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="189"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
       <source>Open release notes website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="192"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="182"/>
       <source>&amp;Release notes</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="216"/>
+      <location filename="../src/modules/welcome/WelcomePage.cpp" line="212"/>
       <source>%1 support</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="319"/>
       <source>About %1 setup</source>
       <translation>เกี่ยวกับตัวตั้งค่า %1</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="320"/>
       <source>About %1 installer</source>
       <translation>เกี่ยวกับตัวติดตั้ง %1 </translation>
     </message>
@@ -4118,19 +4113,16 @@ Output:
     </message>
   </context>
   <context>
-    <name>about</name>
+    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/modules/welcomeq/about.qml" line="79"/>
-      <source>Back</source>
-      <translation>ย้อนกลับ</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+      <source>About</source>
+      <translation>เกี่ยวกับ</translation>
     </message>
-  </context>
-  <context>
-    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/calamares/calamares-sidebar.qml" line="79"/>
-      <source>Show debug information</source>
-      <translation>แสดงข้อมูลการดีบั๊ก</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+      <source>Debug</source>
+      <translation>แก้ไขข้อบกพร่อง</translation>
     </message>
   </context>
   <context>
@@ -4467,26 +4459,21 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcomeq/welcomeq.qml" line="66"/>
-      <source>About</source>
-      <translation>เกี่ยวกับ</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="80"/>
       <source>Support</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="91"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="77"/>
       <source>Known issues</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="102"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="88"/>
       <source>Release notes</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="114"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="100"/>
       <source>Donate</source>
       <translation type="unfinished"/>
     </message>
diff --git a/lang/calamares_tr_TR.ts b/lang/calamares_tr_TR.ts
index c0acf127b3f370b57ccccf74d448cc9dffa65b87..4024fa8c1c091a097946bee697848a2fc7d4e1c4 100644
--- a/lang/calamares_tr_TR.ts
+++ b/lang/calamares_tr_TR.ts
@@ -6,18 +6,18 @@
     <message>
       <location filename="../src/libcalamares/CalamaresAbout.cpp" line="17"/>
       <source>&lt;h1&gt;%1&lt;/h1&gt;&lt;br/&gt;&lt;strong&gt;%2&lt;br/&gt; for %3&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;</source>
-      <translation type="unfinished"/>
+      <translation>&lt;h1&gt;%1&lt;/h1&gt;&lt;br/&gt;&lt;strong&gt; %2 &lt;br/&gt; %3&lt;/strong&gt; için &lt;br/&gt;&lt;br/&gt;</translation>
     </message>
     <message>
       <location filename="../src/libcalamares/CalamaresAbout.cpp" line="20"/>
       <source>Thanks to &lt;a href="https://calamares.io/team/"&gt;the Calamares team&lt;/a&gt; and the &lt;a href="https://www.transifex.com/calamares/calamares/"&gt;Calamares translators team&lt;/a&gt;.&lt;br/&gt;&lt;br/&gt;&lt;a href="https://calamares.io/"&gt;Calamares&lt;/a&gt; development is sponsored by &lt;br/&gt;&lt;a href="http://www.blue-systems.com/"&gt;Blue Systems&lt;/a&gt; - Liberating Software.</source>
-      <translation type="unfinished"/>
+      <translation>&lt;a href="https://calamares.io/team/"&gt;Calamares takımına&lt;/a&gt; ve &lt;a href="https://www.transifex.com/calamares/calamares/"&gt;Calamares çeviri ekibine&lt;/a&gt; teşekkürler. &lt;br/&gt;&lt;br/&gt;&lt;a href="https://calamares.io/"&gt;Calamares&lt;/a&gt; gelişim sponsoru &lt;br/&gt; &lt;a href="http://www.blue-systems.com/"&gt;Blue Systems&lt;/a&gt; - Özgür Yazılım</translation>
     </message>
     <message>
       <location filename="../src/libcalamares/CalamaresAbout.cpp" line="38"/>
       <source>Copyright %1-%2 %3 &amp;lt;%4&amp;gt;&lt;br/&gt;</source>
       <extracomment>Copyright year-year Name &lt;email-address&gt;</extracomment>
-      <translation type="unfinished"/>
+      <translation>Telif hakkı %1-%2 %3 &amp;lt;%4&amp;gt;&lt;br/&gt;</translation>
     </message>
   </context>
   <context>
@@ -156,7 +156,7 @@
       <translation>Gereç Ağacı</translation>
     </message>
     <message>
-      <location filename="../src/calamares/DebugWindow.cpp" line="239"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="244"/>
       <source>Debug information</source>
       <translation>Hata ayıklama bilgisi</translation>
     </message>
@@ -507,12 +507,12 @@ Yükleyiciden çıkınca tüm değişiklikler kaybedilecek.</translation>
   <context>
     <name>CalamaresWindow</name>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="369"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
       <source>%1 Setup Program</source>
       <translation>%1 Kurulum Uygulaması</translation>
     </message>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="370"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
       <source>%1 Installer</source>
       <translation>%1 Yükleniyor</translation>
     </message>
@@ -1456,12 +1456,12 @@ Kurulum devam edebilir fakat bazı özellikler devre dışı kalabilir.</transla
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="259"/>
       <source>Passphrase for existing partition</source>
-      <translation type="unfinished"/>
+      <translation>Mevcut bölüm için parola</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="260"/>
-      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphraseor delete and create a new encrypted partition.</source>
-      <translation type="unfinished"/>
+      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphrase or delete and create a new encrypted partition.</source>
+      <translation>%1 bölümünün şifresi verilen parola ile çözülemedi. &lt;br/&gt;&lt;br/&gt;Bölümü tekrar düzenleyin ve doğru parolayı girin veya silin ve yeni bir şifreli bölüm oluşturun.</translation>
     </message>
   </context>
   <context>
@@ -4027,61 +4027,56 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.ui" line="140"/>
-      <source>&amp;About</source>
-      <translation>&amp;Hakkında</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="150"/>
       <source>Open donations website</source>
       <translation>Bağış web sitesini aç</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="143"/>
       <source>&amp;Donate</source>
       <translation>&amp;Bağış</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="163"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
       <source>Open help and support website</source>
       <translation>Yardım ve destek web sitesini açın</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="156"/>
       <source>&amp;Support</source>
       <translation>&amp;Destek</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="176"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
       <source>Open issues and bug-tracking website</source>
       <translation>Geri bildirim ve hata izleme web sitesi</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="169"/>
       <source>&amp;Known issues</source>
       <translation>&amp;Bilinen hatalar</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="189"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
       <source>Open release notes website</source>
       <translation>Sürüm Notları web sitesini aç</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="192"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="182"/>
       <source>&amp;Release notes</source>
       <translation>&amp;Sürüm notları</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="216"/>
+      <location filename="../src/modules/welcome/WelcomePage.cpp" line="212"/>
       <source>%1 support</source>
       <translation>%1 destek</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="319"/>
       <source>About %1 setup</source>
       <translation>%1 kurulum hakkında</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="320"/>
       <source>About %1 installer</source>
       <translation>%1 sistem yükleyici hakkında</translation>
     </message>
@@ -4147,19 +4142,16 @@ Output:
     </message>
   </context>
   <context>
-    <name>about</name>
+    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/modules/welcomeq/about.qml" line="79"/>
-      <source>Back</source>
-      <translation>Geri</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+      <source>About</source>
+      <translation>Hakkında</translation>
     </message>
-  </context>
-  <context>
-    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/calamares/calamares-sidebar.qml" line="79"/>
-      <source>Show debug information</source>
-      <translation>Hata ayıklama bilgisini göster</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+      <source>Debug</source>
+      <translation>Hata Ayıklama</translation>
     </message>
   </context>
   <context>
@@ -4524,26 +4516,21 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcomeq/welcomeq.qml" line="66"/>
-      <source>About</source>
-      <translation>Hakkında</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="80"/>
       <source>Support</source>
       <translation>Destek</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="91"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="77"/>
       <source>Known issues</source>
       <translation>Bilinen sorunlar</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="102"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="88"/>
       <source>Release notes</source>
       <translation>Sürüm notları</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="114"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="100"/>
       <source>Donate</source>
       <translation>Bağış</translation>
     </message>
diff --git a/lang/calamares_uk.ts b/lang/calamares_uk.ts
index cadd05d67acfb597dc53b08a0eb1a6c5d1564d77..fd6264aeaf5ab62a465861e946bcf1354dd3264c 100644
--- a/lang/calamares_uk.ts
+++ b/lang/calamares_uk.ts
@@ -156,7 +156,7 @@
       <translation>Дерево віджетів</translation>
     </message>
     <message>
-      <location filename="../src/calamares/DebugWindow.cpp" line="239"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="244"/>
       <source>Debug information</source>
       <translation>Діагностична інформація</translation>
     </message>
@@ -511,12 +511,12 @@ The installer will quit and all changes will be lost.</source>
   <context>
     <name>CalamaresWindow</name>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="369"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
       <source>%1 Setup Program</source>
       <translation>Програма для налаштовування %1</translation>
     </message>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="370"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
       <source>%1 Installer</source>
       <translation>Засіб встановлення %1</translation>
     </message>
@@ -1461,7 +1461,7 @@ The installer will quit and all changes will be lost.</source>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="260"/>
-      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphraseor delete and create a new encrypted partition.</source>
+      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphrase or delete and create a new encrypted partition.</source>
       <translation>Розділ %1 не вдалося розшифрувати з використанням наданого пароля.&lt;br/&gt;&lt;br/&gt;Виконайте редагування розділів ще раз і вкажіть правильний пароль або вилучіть розділ і створіть новий шифрований розділ.</translation>
     </message>
   </context>
@@ -4045,61 +4045,56 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.ui" line="140"/>
-      <source>&amp;About</source>
-      <translation>&amp;Про програму</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="150"/>
       <source>Open donations website</source>
       <translation>Відкрити сторінку сайта із посиланнями для фінансової підтримки</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="143"/>
       <source>&amp;Donate</source>
       <translation>Підтримати &amp;фінансово</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="163"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
       <source>Open help and support website</source>
       <translation>Відкрити сторінку сайта із посиланнями на довідку та технічну підтримку</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="156"/>
       <source>&amp;Support</source>
       <translation>Під&amp;тримка</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="176"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
       <source>Open issues and bug-tracking website</source>
       <translation>Відкрити сторінку сайта стеження за вадами у програмі</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="169"/>
       <source>&amp;Known issues</source>
       <translation>&amp;Відомі проблеми</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="189"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
       <source>Open release notes website</source>
       <translation>Відкрити сторінку сайта із нотатками щодо випуску</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="192"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="182"/>
       <source>&amp;Release notes</source>
       <translation>При&amp;мітки до випуску</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="216"/>
+      <location filename="../src/modules/welcome/WelcomePage.cpp" line="212"/>
       <source>%1 support</source>
       <translation>Підтримка %1</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="319"/>
       <source>About %1 setup</source>
       <translation>Про засіб налаштовування %1</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="320"/>
       <source>About %1 installer</source>
       <translation>Про засіб встановлення %1</translation>
     </message>
@@ -4165,19 +4160,16 @@ Output:
     </message>
   </context>
   <context>
-    <name>about</name>
+    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/modules/welcomeq/about.qml" line="79"/>
-      <source>Back</source>
-      <translation>Назад</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+      <source>About</source>
+      <translation>Про програму</translation>
     </message>
-  </context>
-  <context>
-    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/calamares/calamares-sidebar.qml" line="79"/>
-      <source>Show debug information</source>
-      <translation>Показати діагностичну інформацію</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+      <source>Debug</source>
+      <translation>Діагностика</translation>
     </message>
   </context>
   <context>
@@ -4542,26 +4534,21 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcomeq/welcomeq.qml" line="66"/>
-      <source>About</source>
-      <translation>Про програму</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="80"/>
       <source>Support</source>
       <translation>Підтримка</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="91"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="77"/>
       <source>Known issues</source>
       <translation>Відомі вади</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="102"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="88"/>
       <source>Release notes</source>
       <translation>Нотатки щодо випуску</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="114"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="100"/>
       <source>Donate</source>
       <translation>Підтримати фінансово</translation>
     </message>
diff --git a/lang/calamares_ur.ts b/lang/calamares_ur.ts
index a93b89de523e3119f945e0ef2a25cfba95d15d81..d473add2ae41a30a01a6cd72ce8c2cc019149243 100644
--- a/lang/calamares_ur.ts
+++ b/lang/calamares_ur.ts
@@ -156,7 +156,7 @@
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/calamares/DebugWindow.cpp" line="239"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="244"/>
       <source>Debug information</source>
       <translation type="unfinished"/>
     </message>
@@ -501,12 +501,12 @@ The installer will quit and all changes will be lost.</source>
   <context>
     <name>CalamaresWindow</name>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="369"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
       <source>%1 Setup Program</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="370"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
       <source>%1 Installer</source>
       <translation type="unfinished"/>
     </message>
@@ -1451,7 +1451,7 @@ The installer will quit and all changes will be lost.</source>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="260"/>
-      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphraseor delete and create a new encrypted partition.</source>
+      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphrase or delete and create a new encrypted partition.</source>
       <translation type="unfinished"/>
     </message>
   </context>
@@ -4008,61 +4008,56 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.ui" line="140"/>
-      <source>&amp;About</source>
-      <translation type="unfinished"/>
-    </message>
-    <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="150"/>
       <source>Open donations website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="143"/>
       <source>&amp;Donate</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="163"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
       <source>Open help and support website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="156"/>
       <source>&amp;Support</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="176"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
       <source>Open issues and bug-tracking website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="169"/>
       <source>&amp;Known issues</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="189"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
       <source>Open release notes website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="192"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="182"/>
       <source>&amp;Release notes</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="216"/>
+      <location filename="../src/modules/welcome/WelcomePage.cpp" line="212"/>
       <source>%1 support</source>
       <translation>٪ 1 سپورٹ</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="319"/>
       <source>About %1 setup</source>
       <translation>تقریبا٪ 1 سیٹ اپ</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="320"/>
       <source>About %1 installer</source>
       <translation>لگ بھگ٪ 1 انسٹال</translation>
     </message>
@@ -4128,18 +4123,15 @@ Output:
     </message>
   </context>
   <context>
-    <name>about</name>
+    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/modules/welcomeq/about.qml" line="79"/>
-      <source>Back</source>
-      <translation>واپس</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+      <source>About</source>
+      <translation>متعلق</translation>
     </message>
-  </context>
-  <context>
-    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/calamares/calamares-sidebar.qml" line="79"/>
-      <source>Show debug information</source>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+      <source>Debug</source>
       <translation type="unfinished"/>
     </message>
   </context>
@@ -4478,26 +4470,21 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcomeq/welcomeq.qml" line="66"/>
-      <source>About</source>
-      <translation>متعلق</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="80"/>
       <source>Support</source>
       <translation>حمائیت</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="91"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="77"/>
       <source>Known issues</source>
       <translation>معلوم مسائل</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="102"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="88"/>
       <source>Release notes</source>
       <translation>جاری کردہ نوٹس</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="114"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="100"/>
       <source>Donate</source>
       <translation>عطیہ</translation>
     </message>
diff --git a/lang/calamares_uz.ts b/lang/calamares_uz.ts
new file mode 100644
index 0000000000000000000000000000000000000000..6ee4801112231bc21a27e456d95157196722c4d6
--- /dev/null
+++ b/lang/calamares_uz.ts
@@ -0,0 +1,4480 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS language="uz" version="2.1">
+  <context>
+    <name>AboutData</name>
+    <message>
+      <location filename="../src/libcalamares/CalamaresAbout.cpp" line="17"/>
+      <source>&lt;h1&gt;%1&lt;/h1&gt;&lt;br/&gt;&lt;strong&gt;%2&lt;br/&gt; for %3&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/libcalamares/CalamaresAbout.cpp" line="20"/>
+      <source>Thanks to &lt;a href="https://calamares.io/team/"&gt;the Calamares team&lt;/a&gt; and the &lt;a href="https://www.transifex.com/calamares/calamares/"&gt;Calamares translators team&lt;/a&gt;.&lt;br/&gt;&lt;br/&gt;&lt;a href="https://calamares.io/"&gt;Calamares&lt;/a&gt; development is sponsored by &lt;br/&gt;&lt;a href="http://www.blue-systems.com/"&gt;Blue Systems&lt;/a&gt; - Liberating Software.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/libcalamares/CalamaresAbout.cpp" line="38"/>
+      <source>Copyright %1-%2 %3 &amp;lt;%4&amp;gt;&lt;br/&gt;</source>
+      <extracomment>Copyright year-year Name &lt;email-address&gt;</extracomment>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>AutoMountManagementJob</name>
+    <message>
+      <location filename="../src/modules/partition/jobs/AutoMountManagementJob.cpp" line="22"/>
+      <source>Manage auto-mount settings</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>BootInfoWidget</name>
+    <message>
+      <location filename="../src/modules/partition/gui/BootInfoWidget.cpp" line="62"/>
+      <source>The &lt;strong&gt;boot environment&lt;/strong&gt; of this system.&lt;br&gt;&lt;br&gt;Older x86 systems only support &lt;strong&gt;BIOS&lt;/strong&gt;.&lt;br&gt;Modern systems usually use &lt;strong&gt;EFI&lt;/strong&gt;, but may also show up as BIOS if started in compatibility mode.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/BootInfoWidget.cpp" line="72"/>
+      <source>This system was started with an &lt;strong&gt;EFI&lt;/strong&gt; boot environment.&lt;br&gt;&lt;br&gt;To configure startup from an EFI environment, this installer must deploy a boot loader application, like &lt;strong&gt;GRUB&lt;/strong&gt; or &lt;strong&gt;systemd-boot&lt;/strong&gt; on an &lt;strong&gt;EFI System Partition&lt;/strong&gt;. This is automatic, unless you choose manual partitioning, in which case you must choose it or create it on your own.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/BootInfoWidget.cpp" line="84"/>
+      <source>This system was started with a &lt;strong&gt;BIOS&lt;/strong&gt; boot environment.&lt;br&gt;&lt;br&gt;To configure startup from a BIOS environment, this installer must install a boot loader, like &lt;strong&gt;GRUB&lt;/strong&gt;, either at the beginning of a partition or on the &lt;strong&gt;Master Boot Record&lt;/strong&gt; 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.</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>BootLoaderModel</name>
+    <message>
+      <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="59"/>
+      <source>Master Boot Record of %1</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="92"/>
+      <source>Boot Partition</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="99"/>
+      <source>System Partition</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="129"/>
+      <source>Do not install a boot loader</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="147"/>
+      <source>%1 (%2)</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>Calamares::BlankViewStep</name>
+    <message>
+      <location filename="../src/libcalamaresui/viewpages/BlankViewStep.cpp" line="61"/>
+      <source>Blank Page</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>Calamares::DebugWindow</name>
+    <message>
+      <location filename="../src/calamares/DebugWindow.ui" line="18"/>
+      <source>Form</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/calamares/DebugWindow.ui" line="28"/>
+      <source>GlobalStorage</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/calamares/DebugWindow.ui" line="38"/>
+      <source>JobQueue</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/calamares/DebugWindow.ui" line="48"/>
+      <source>Modules</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/calamares/DebugWindow.ui" line="61"/>
+      <source>Type:</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/calamares/DebugWindow.ui" line="68"/>
+      <location filename="../src/calamares/DebugWindow.ui" line="82"/>
+      <source>none</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/calamares/DebugWindow.ui" line="75"/>
+      <source>Interface:</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/calamares/DebugWindow.ui" line="102"/>
+      <source>Crashes Calamares, so that Dr. Konqui can look at it.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/calamares/DebugWindow.ui" line="115"/>
+      <source>Reloads the stylesheet from the branding directory.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/calamares/DebugWindow.ui" line="141"/>
+      <source>Uploads the session log to the configured pastebin.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/calamares/DebugWindow.ui" line="144"/>
+      <source>Send Session Log</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/calamares/DebugWindow.ui" line="118"/>
+      <source>Reload Stylesheet</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/calamares/DebugWindow.ui" line="128"/>
+      <source>Displays the tree of widget names in the log (for stylesheet debugging).</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/calamares/DebugWindow.ui" line="131"/>
+      <source>Widget Tree</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/calamares/DebugWindow.cpp" line="244"/>
+      <source>Debug information</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>Calamares::ExecutionViewStep</name>
+    <message>
+      <location filename="../src/libcalamaresui/viewpages/ExecutionViewStep.cpp" line="118"/>
+      <source>Set up</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/libcalamaresui/viewpages/ExecutionViewStep.cpp" line="118"/>
+      <source>Install</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>Calamares::FailJob</name>
+    <message>
+      <location filename="../src/libcalamares/JobExample.cpp" line="29"/>
+      <source>Job failed (%1)</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/libcalamares/JobExample.cpp" line="30"/>
+      <source>Programmed job failure was explicitly requested.</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>Calamares::JobThread</name>
+    <message>
+      <location filename="../src/libcalamares/JobQueue.cpp" line="203"/>
+      <source>Done</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>Calamares::NamedJob</name>
+    <message>
+      <location filename="../src/libcalamares/JobExample.cpp" line="17"/>
+      <source>Example job (%1)</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>Calamares::ProcessJob</name>
+    <message>
+      <location filename="../src/libcalamares/ProcessJob.cpp" line="42"/>
+      <source>Run command '%1' in target system.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/libcalamares/ProcessJob.cpp" line="42"/>
+      <source> Run command '%1'.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/libcalamares/ProcessJob.cpp" line="49"/>
+      <source>Running command %1 %2</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>Calamares::PythonJob</name>
+    <message>
+      <location filename="../src/libcalamares/PythonJob.cpp" line="233"/>
+      <source>Running %1 operation.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/libcalamares/PythonJob.cpp" line="262"/>
+      <source>Bad working directory path</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/libcalamares/PythonJob.cpp" line="263"/>
+      <source>Working directory %1 for python job %2 is not readable.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/libcalamares/PythonJob.cpp" line="269"/>
+      <source>Bad main script file</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/libcalamares/PythonJob.cpp" line="270"/>
+      <source>Main script file %1 for python job %2 is not readable.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/libcalamares/PythonJob.cpp" line="343"/>
+      <source>Boost.Python error in job "%1".</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>Calamares::QmlViewStep</name>
+    <message>
+      <location filename="../src/libcalamaresui/viewpages/QmlViewStep.cpp" line="67"/>
+      <source>Loading ...</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/libcalamaresui/viewpages/QmlViewStep.cpp" line="88"/>
+      <source>QML Step &lt;i&gt;%1&lt;/i&gt;.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/libcalamaresui/viewpages/QmlViewStep.cpp" line="268"/>
+      <source>Loading failed.</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>Calamares::RequirementsChecker</name>
+    <message>
+      <location filename="../src/libcalamares/modulesystem/RequirementsChecker.cpp" line="94"/>
+      <source>Requirements checking for module &lt;i&gt;%1&lt;/i&gt; is complete.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+      <location filename="../src/libcalamares/modulesystem/RequirementsChecker.cpp" line="118"/>
+      <source>Waiting for %n module(s).</source>
+      <translation type="unfinished">
+        <numerusform/>
+      </translation>
+    </message>
+    <message numerus="yes">
+      <location filename="../src/libcalamares/modulesystem/RequirementsChecker.cpp" line="119"/>
+      <source>(%n second(s))</source>
+      <translation type="unfinished">
+        <numerusform/>
+      </translation>
+    </message>
+    <message>
+      <location filename="../src/libcalamares/modulesystem/RequirementsChecker.cpp" line="124"/>
+      <source>System-requirements checking is complete.</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>Calamares::ViewManager</name>
+    <message>
+      <location filename="../src/libcalamaresui/ViewManager.cpp" line="160"/>
+      <source>Setup Failed</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/libcalamaresui/ViewManager.cpp" line="160"/>
+      <source>Installation Failed</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/libcalamaresui/ViewManager.cpp" line="163"/>
+      <source>Error</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/libcalamaresui/ViewManager.cpp" line="90"/>
+      <source>&amp;Yes</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/libcalamaresui/ViewManager.cpp" line="91"/>
+      <source>&amp;No</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/libcalamaresui/ViewManager.cpp" line="92"/>
+      <source>&amp;Close</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/libcalamaresui/utils/Paste.cpp" line="184"/>
+      <source>Install Log Paste URL</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/libcalamaresui/utils/Paste.cpp" line="166"/>
+      <source>The upload was unsuccessful. No web-paste was done.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/libcalamaresui/utils/Paste.cpp" line="178"/>
+      <source>Install log posted to
+
+%1
+
+Link copied to clipboard</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/libcalamaresui/ViewManager.cpp" line="189"/>
+      <source>Calamares Initialization Failed</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/libcalamaresui/ViewManager.cpp" line="190"/>
+      <source>%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.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/libcalamaresui/ViewManager.cpp" line="196"/>
+      <source>&lt;br/&gt;The following modules could not be loaded:</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/libcalamaresui/ViewManager.cpp" line="310"/>
+      <source>Continue with setup?</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/libcalamaresui/ViewManager.cpp" line="310"/>
+      <source>Continue with installation?</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/libcalamaresui/ViewManager.cpp" line="312"/>
+      <source>The %1 setup program is about to make changes to your disk in order to set up %2.&lt;br/&gt;&lt;strong&gt;You will not be able to undo these changes.&lt;/strong&gt;</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/libcalamaresui/ViewManager.cpp" line="315"/>
+      <source>The %1 installer is about to make changes to your disk in order to install %2.&lt;br/&gt;&lt;strong&gt;You will not be able to undo these changes.&lt;/strong&gt;</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/libcalamaresui/ViewManager.cpp" line="318"/>
+      <source>&amp;Set up now</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/libcalamaresui/ViewManager.cpp" line="318"/>
+      <source>&amp;Install now</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/libcalamaresui/ViewManager.cpp" line="326"/>
+      <source>Go &amp;back</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/libcalamaresui/ViewManager.cpp" line="376"/>
+      <source>&amp;Set up</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/libcalamaresui/ViewManager.cpp" line="376"/>
+      <source>&amp;Install</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/libcalamaresui/ViewManager.cpp" line="378"/>
+      <source>Setup is complete. Close the setup program.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/libcalamaresui/ViewManager.cpp" line="379"/>
+      <source>The installation is complete. Close the installer.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/libcalamaresui/ViewManager.cpp" line="381"/>
+      <source>Cancel setup without changing the system.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/libcalamaresui/ViewManager.cpp" line="382"/>
+      <source>Cancel installation without changing the system.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/libcalamaresui/ViewManager.cpp" line="392"/>
+      <source>&amp;Next</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/libcalamaresui/ViewManager.cpp" line="397"/>
+      <source>&amp;Back</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/libcalamaresui/ViewManager.cpp" line="403"/>
+      <source>&amp;Done</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/libcalamaresui/ViewManager.cpp" line="422"/>
+      <source>&amp;Cancel</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/libcalamaresui/ViewManager.cpp" line="495"/>
+      <source>Cancel setup?</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/libcalamaresui/ViewManager.cpp" line="495"/>
+      <source>Cancel installation?</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/libcalamaresui/ViewManager.cpp" line="496"/>
+      <source>Do you really want to cancel the current setup process?
+The setup program will quit and all changes will be lost.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/libcalamaresui/ViewManager.cpp" line="498"/>
+      <source>Do you really want to cancel the current install process?
+The installer will quit and all changes will be lost.</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>CalamaresPython::Helper</name>
+    <message>
+      <location filename="../src/libcalamares/PythonHelper.cpp" line="302"/>
+      <source>Unknown exception type</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/libcalamares/PythonHelper.cpp" line="320"/>
+      <source>unparseable Python error</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/libcalamares/PythonHelper.cpp" line="364"/>
+      <source>unparseable Python traceback</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/libcalamares/PythonHelper.cpp" line="371"/>
+      <source>Unfetchable Python error.</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>CalamaresWindow</name>
+    <message>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
+      <source>%1 Setup Program</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
+      <source>%1 Installer</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>ChangeFilesystemLabelJob</name>
+    <message>
+      <location filename="../src/modules/partition/jobs/ChangeFilesystemLabelJob.cpp" line="32"/>
+      <source>Set filesystem label on %1.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/ChangeFilesystemLabelJob.cpp" line="39"/>
+      <source>Set filesystem label &lt;strong&gt;%1&lt;/strong&gt; to partition &lt;strong&gt;%2&lt;/strong&gt;.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/ChangeFilesystemLabelJob.cpp" line="70"/>
+      <source>The installer failed to update partition table on disk '%1'.</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>CheckerContainer</name>
+    <message>
+      <location filename="../src/modules/welcome/checker/CheckerContainer.cpp" line="38"/>
+      <source>Gathering system information...</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>ChoicePage</name>
+    <message>
+      <location filename="../src/modules/partition/gui/ChoicePage.ui" line="18"/>
+      <source>Form</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="139"/>
+      <source>Select storage de&amp;vice:</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="140"/>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1029"/>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1077"/>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1174"/>
+      <source>Current:</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="141"/>
+      <source>After:</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1732"/>
+      <source>&lt;strong&gt;Manual partitioning&lt;/strong&gt;&lt;br/&gt;You can create or resize partitions yourself.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="894"/>
+      <source>Reuse %1 as home partition for %2.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1030"/>
+      <source>&lt;strong&gt;Select a partition to shrink, then drag the bottom bar to resize&lt;/strong&gt;</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1048"/>
+      <source>%1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1106"/>
+      <source>Boot loader location:</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1165"/>
+      <source>&lt;strong&gt;Select a partition to install on&lt;/strong&gt;</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1226"/>
+      <source>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1234"/>
+      <source>The EFI system partition at %1 will be used for starting %2.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1242"/>
+      <source>EFI system partition:</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1402"/>
+      <source>This storage device does not seem to have an operating system on it. What would you like to do?&lt;br/&gt;You will be able to review and confirm your choices before any change is made to the storage device.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1407"/>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1444"/>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1466"/>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1491"/>
+      <source>&lt;strong&gt;Erase disk&lt;/strong&gt;&lt;br/&gt;This will &lt;font color="red"&gt;delete&lt;/font&gt; all data currently present on the selected storage device.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1411"/>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1440"/>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1462"/>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1487"/>
+      <source>&lt;strong&gt;Install alongside&lt;/strong&gt;&lt;br/&gt;The installer will shrink a partition to make room for %1.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1415"/>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1449"/>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1470"/>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1495"/>
+      <source>&lt;strong&gt;Replace a partition&lt;/strong&gt;&lt;br/&gt;Replaces a partition with %1.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1434"/>
+      <source>This storage device has %1 on it. What would you like to do?&lt;br/&gt;You will be able to review and confirm your choices before any change is made to the storage device.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1457"/>
+      <source>This storage device already has an operating system on it. What would you like to do?&lt;br/&gt;You will be able to review and confirm your choices before any change is made to the storage device.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1482"/>
+      <source>This storage device has multiple operating systems on it. What would you like to do?&lt;br/&gt;You will be able to review and confirm your choices before any change is made to the storage device.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1554"/>
+      <source>This storage device already has an operating system on it, but the partition table &lt;strong&gt;%1&lt;/strong&gt; is different from the needed &lt;strong&gt;%2&lt;/strong&gt;.&lt;br/&gt;</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1577"/>
+      <source>This storage device has one of its partitions &lt;strong&gt;mounted&lt;/strong&gt;.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1582"/>
+      <source>This storage device is a part of an &lt;strong&gt;inactive RAID&lt;/strong&gt; device.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1701"/>
+      <source>No Swap</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1710"/>
+      <source>Reuse Swap</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1713"/>
+      <source>Swap (no Hibernate)</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1716"/>
+      <source>Swap (with Hibernate)</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1719"/>
+      <source>Swap to file</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>ClearMountsJob</name>
+    <message>
+      <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="272"/>
+      <source>Successfully unmounted %1.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="279"/>
+      <source>Successfully disabled swap %1.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="305"/>
+      <source>Successfully cleared swap %1.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="319"/>
+      <source>Successfully closed mapper device %1.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="332"/>
+      <source>Successfully disabled volume group %1.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="371"/>
+      <source>Clear mounts for partitioning operations on %1</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="377"/>
+      <source>Clearing mounts for partitioning operations on %1.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="396"/>
+      <source>Cleared all mounts for %1</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>ClearTempMountsJob</name>
+    <message>
+      <location filename="../src/modules/partition/jobs/ClearTempMountsJob.cpp" line="33"/>
+      <source>Clear all temporary mounts.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/ClearTempMountsJob.cpp" line="40"/>
+      <source>Clearing all temporary mounts.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/ClearTempMountsJob.cpp" line="70"/>
+      <source>Cleared all temporary mounts.</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>CommandList</name>
+    <message>
+      <location filename="../src/libcalamares/utils/CommandList.cpp" line="142"/>
+      <location filename="../src/libcalamares/utils/CommandList.cpp" line="155"/>
+      <source>Could not run command.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/libcalamares/utils/CommandList.cpp" line="143"/>
+      <source>The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/libcalamares/utils/CommandList.cpp" line="156"/>
+      <source>The command needs to know the user's name, but no username is defined.</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>Config</name>
+    <message>
+      <location filename="../src/modules/keyboard/Config.cpp" line="360"/>
+      <source>Set keyboard model to %1.&lt;br/&gt;</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/keyboard/Config.cpp" line="367"/>
+      <source>Set keyboard layout to %1/%2.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/locale/Config.cpp" line="359"/>
+      <source>Set timezone to %1/%2.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/locale/Config.cpp" line="397"/>
+      <source>The system language will be set to %1.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/locale/Config.cpp" line="404"/>
+      <source>The numbers and dates locale will be set to %1.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/netinstall/Config.cpp" line="53"/>
+      <source>Network Installation. (Disabled: Incorrect configuration)</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/netinstall/Config.cpp" line="55"/>
+      <source>Network Installation. (Disabled: Received invalid groups data)</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/netinstall/Config.cpp" line="57"/>
+      <source>Network Installation. (Disabled: Internal error)</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/netinstall/Config.cpp" line="61"/>
+      <source>Network Installation. (Disabled: No package list)</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/netinstall/Config.cpp" line="77"/>
+      <source>Package selection</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/netinstall/Config.cpp" line="59"/>
+      <source>Network Installation. (Disabled: Unable to fetch package lists, check your network connection)</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/welcome/Config.cpp" line="56"/>
+      <source>This computer does not satisfy the minimum requirements for setting up %1.&lt;br/&gt;Setup cannot continue. &lt;a href="#details"&gt;Details...&lt;/a&gt;</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/welcome/Config.cpp" line="60"/>
+      <source>This computer does not satisfy the minimum requirements for installing %1.&lt;br/&gt;Installation cannot continue. &lt;a href="#details"&gt;Details...&lt;/a&gt;</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/welcome/Config.cpp" line="67"/>
+      <source>This computer does not satisfy some of the recommended requirements for setting up %1.&lt;br/&gt;Setup can continue, but some features might be disabled.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/welcome/Config.cpp" line="71"/>
+      <source>This computer does not satisfy some of the recommended requirements for installing %1.&lt;br/&gt;Installation can continue, but some features might be disabled.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/welcome/Config.cpp" line="81"/>
+      <source>This program will ask you some questions and set up %2 on your computer.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/welcome/Config.cpp" line="269"/>
+      <source>&lt;h1&gt;Welcome to the Calamares setup program for %1&lt;/h1&gt;</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/welcome/Config.cpp" line="270"/>
+      <source>&lt;h1&gt;Welcome to %1 setup&lt;/h1&gt;</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/welcome/Config.cpp" line="274"/>
+      <source>&lt;h1&gt;Welcome to the Calamares installer for %1&lt;/h1&gt;</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/welcome/Config.cpp" line="275"/>
+      <source>&lt;h1&gt;Welcome to the %1 installer&lt;/h1&gt;</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/Config.cpp" line="236"/>
+      <source>Your username is too long.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/Config.cpp" line="252"/>
+      <source>'%1' is not allowed as username.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/Config.cpp" line="242"/>
+      <source>Your username must start with a lowercase letter or underscore.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/Config.cpp" line="246"/>
+      <source>Only lowercase letters, numbers, underscore and hyphen are allowed.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/Config.cpp" line="301"/>
+      <source>Your hostname is too short.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/Config.cpp" line="305"/>
+      <source>Your hostname is too long.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/Config.cpp" line="311"/>
+      <source>'%1' is not allowed as hostname.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/Config.cpp" line="316"/>
+      <source>Only letters, numbers, underscore and hyphen are allowed.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/Config.cpp" line="585"/>
+      <source>Your passwords do not match!</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/Config.cpp" line="599"/>
+      <source>OK!</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/finished/Config.cpp" line="145"/>
+      <source>Setup Failed</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/finished/Config.cpp" line="145"/>
+      <source>Installation Failed</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/finished/Config.cpp" line="147"/>
+      <source>The setup of %1 did not complete successfully.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/finished/Config.cpp" line="148"/>
+      <source>The installation of %1 did not complete successfully.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/finished/Config.cpp" line="152"/>
+      <source>Setup Complete</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/finished/Config.cpp" line="153"/>
+      <source>Installation Complete</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/finished/Config.cpp" line="154"/>
+      <source>The setup of %1 is complete.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/finished/Config.cpp" line="155"/>
+      <source>The installation of %1 is complete.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/packagechooser/Config.cpp" line="111"/>
+      <source>Package Selection</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/packagechooser/Config.cpp" line="113"/>
+      <source>Please pick a product from the list. The selected product will be installed.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/packagechooser/Config.cpp" line="243"/>
+      <source>Packages</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/packagechooser/Config.cpp" line="249"/>
+      <source>Install option: &lt;strong&gt;%1&lt;/strong&gt;</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/packagechooser/Config.cpp" line="249"/>
+      <source>None</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/summary/Config.cpp" line="94"/>
+      <source>Summary</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/summary/Config.cpp" line="98"/>
+      <source>This is an overview of what will happen once you start the setup procedure.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/summary/Config.cpp" line="103"/>
+      <source>This is an overview of what will happen once you start the install procedure.</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>ContextualProcessJob</name>
+    <message>
+      <location filename="../src/modules/contextualprocess/ContextualProcessJob.cpp" line="119"/>
+      <source>Contextual Processes Job</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>CreatePartitionDialog</name>
+    <message>
+      <location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="18"/>
+      <source>Create a Partition</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="42"/>
+      <source>Si&amp;ze:</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="52"/>
+      <source> MiB</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="59"/>
+      <source>Partition &amp;Type:</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="71"/>
+      <source>Primar&amp;y</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="81"/>
+      <source>E&amp;xtended</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="123"/>
+      <source>Fi&amp;le System:</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="155"/>
+      <source>LVM LV name</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="165"/>
+      <source>&amp;Mount Point:</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="191"/>
+      <source>Flags:</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="224"/>
+      <source>Label for the filesystem</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="234"/>
+      <source>FS Label:</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/CreatePartitionDialog.cpp" line="66"/>
+      <source>En&amp;crypt</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/CreatePartitionDialog.cpp" line="194"/>
+      <source>Logical</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/CreatePartitionDialog.cpp" line="199"/>
+      <source>Primary</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/CreatePartitionDialog.cpp" line="218"/>
+      <source>GPT</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/PartitionDialogHelpers.cpp" line="91"/>
+      <source>Mountpoint already in use. Please select another one.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/PartitionDialogHelpers.cpp" line="96"/>
+      <source>Mountpoint must start with a &lt;tt&gt;/&lt;/tt&gt;.</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>CreatePartitionJob</name>
+    <message>
+      <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="187"/>
+      <source>Create new %1MiB partition on %3 (%2) with entries %4.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="195"/>
+      <source>Create new %1MiB partition on %3 (%2).</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="202"/>
+      <source>Create new %2MiB partition on %4 (%3) with file system %1.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="219"/>
+      <source>Create new &lt;strong&gt;%1MiB&lt;/strong&gt; partition on &lt;strong&gt;%3&lt;/strong&gt; (%2) with entries &lt;em&gt;%4&lt;/em&gt;.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="228"/>
+      <source>Create new &lt;strong&gt;%1MiB&lt;/strong&gt; partition on &lt;strong&gt;%3&lt;/strong&gt; (%2).</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="235"/>
+      <source>Create new &lt;strong&gt;%2MiB&lt;/strong&gt; partition on &lt;strong&gt;%4&lt;/strong&gt; (%3) with file system &lt;strong&gt;%1&lt;/strong&gt;.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="260"/>
+      <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="263"/>
+      <source>Creating new %1 partition on %2.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="280"/>
+      <source>The installer failed to create partition on disk '%1'.</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>CreatePartitionTableDialog</name>
+    <message>
+      <location filename="../src/modules/partition/gui/CreatePartitionTableDialog.ui" line="24"/>
+      <source>Create Partition Table</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/CreatePartitionTableDialog.ui" line="43"/>
+      <source>Creating a new partition table will delete all existing data on the disk.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/CreatePartitionTableDialog.ui" line="69"/>
+      <source>What kind of partition table do you want to create?</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/CreatePartitionTableDialog.ui" line="76"/>
+      <source>Master Boot Record (MBR)</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/CreatePartitionTableDialog.ui" line="86"/>
+      <source>GUID Partition Table (GPT)</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>CreatePartitionTableJob</name>
+    <message>
+      <location filename="../src/modules/partition/jobs/CreatePartitionTableJob.cpp" line="41"/>
+      <source>Create new %1 partition table on %2.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/CreatePartitionTableJob.cpp" line="49"/>
+      <source>Create new &lt;strong&gt;%1&lt;/strong&gt; partition table on &lt;strong&gt;%2&lt;/strong&gt; (%3).</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/CreatePartitionTableJob.cpp" line="59"/>
+      <source>Creating new %1 partition table on %2.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/CreatePartitionTableJob.cpp" line="88"/>
+      <source>The installer failed to create a partition table on %1.</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>CreateUserJob</name>
+    <message>
+      <location filename="../src/modules/users/CreateUserJob.cpp" line="35"/>
+      <source>Create user %1</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CreateUserJob.cpp" line="42"/>
+      <source>Create user &lt;strong&gt;%1&lt;/strong&gt;.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CreateUserJob.cpp" line="125"/>
+      <source>Preserving home directory</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CreateUserJob.cpp" line="49"/>
+      <location filename="../src/modules/users/CreateUserJob.cpp" line="142"/>
+      <source>Creating user %1</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CreateUserJob.cpp" line="150"/>
+      <source>Configuring user %1</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CreateUserJob.cpp" line="158"/>
+      <source>Setting file permissions</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>CreateVolumeGroupDialog</name>
+    <message>
+      <location filename="../src/modules/partition/gui/CreateVolumeGroupDialog.cpp" line="28"/>
+      <source>Create Volume Group</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>CreateVolumeGroupJob</name>
+    <message>
+      <location filename="../src/modules/partition/jobs/CreateVolumeGroupJob.cpp" line="32"/>
+      <source>Create new volume group named %1.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/CreateVolumeGroupJob.cpp" line="38"/>
+      <source>Create new volume group named &lt;strong&gt;%1&lt;/strong&gt;.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/CreateVolumeGroupJob.cpp" line="44"/>
+      <source>Creating new volume group named %1.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/CreateVolumeGroupJob.cpp" line="51"/>
+      <source>The installer failed to create a volume group named '%1'.</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>DeactivateVolumeGroupJob</name>
+    <message>
+      <location filename="../src/modules/partition/jobs/DeactivateVolumeGroupJob.cpp" line="26"/>
+      <location filename="../src/modules/partition/jobs/DeactivateVolumeGroupJob.cpp" line="38"/>
+      <source>Deactivate volume group named %1.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/DeactivateVolumeGroupJob.cpp" line="32"/>
+      <source>Deactivate volume group named &lt;strong&gt;%1&lt;/strong&gt;.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/DeactivateVolumeGroupJob.cpp" line="46"/>
+      <source>The installer failed to deactivate a volume group named %1.</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>DeletePartitionJob</name>
+    <message>
+      <location filename="../src/modules/partition/jobs/DeletePartitionJob.cpp" line="73"/>
+      <source>Delete partition %1.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/DeletePartitionJob.cpp" line="80"/>
+      <source>Delete partition &lt;strong&gt;%1&lt;/strong&gt;.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/DeletePartitionJob.cpp" line="87"/>
+      <source>Deleting partition %1.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/DeletePartitionJob.cpp" line="102"/>
+      <source>The installer failed to delete partition %1.</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>DeviceInfoWidget</name>
+    <message>
+      <location filename="../src/modules/partition/gui/DeviceInfoWidget.cpp" line="143"/>
+      <source>This device has a &lt;strong&gt;%1&lt;/strong&gt; partition table.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/DeviceInfoWidget.cpp" line="97"/>
+      <source>This is a &lt;strong&gt;loop&lt;/strong&gt; device.&lt;br&gt;&lt;br&gt;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.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/DeviceInfoWidget.cpp" line="108"/>
+      <source>This installer &lt;strong&gt;cannot detect a partition table&lt;/strong&gt; on the selected storage device.&lt;br&gt;&lt;br&gt;The device either has no partition table, or the partition table is corrupted or of an unknown type.&lt;br&gt;This installer can create a new partition table for you, either automatically, or through the manual partitioning page.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/DeviceInfoWidget.cpp" line="91"/>
+      <source>&lt;br&gt;&lt;br&gt;This is the recommended partition table type for modern systems which start from an &lt;strong&gt;EFI&lt;/strong&gt; boot environment.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/DeviceInfoWidget.cpp" line="80"/>
+      <source>&lt;br&gt;&lt;br&gt;This partition table type is only advisable on older systems which start from a &lt;strong&gt;BIOS&lt;/strong&gt; boot environment. GPT is recommended in most other cases.&lt;br&gt;&lt;br&gt;&lt;strong&gt;Warning:&lt;/strong&gt; the MBR partition table is an obsolete MS-DOS era standard.&lt;br&gt;Only 4 &lt;em&gt;primary&lt;/em&gt; partitions may be created, and of those 4, one can be an &lt;em&gt;extended&lt;/em&gt; partition, which may in turn contain many &lt;em&gt;logical&lt;/em&gt; partitions.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/DeviceInfoWidget.cpp" line="151"/>
+      <source>The type of &lt;strong&gt;partition table&lt;/strong&gt; on the selected storage device.&lt;br&gt;&lt;br&gt;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.&lt;br&gt;This installer will keep the current partition table unless you explicitly choose otherwise.&lt;br&gt;If unsure, on modern systems GPT is preferred.</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>DeviceModel</name>
+    <message>
+      <location filename="../src/modules/partition/core/DeviceModel.cpp" line="82"/>
+      <source>%1 - %2 (%3)</source>
+      <extracomment>device[name] - size[number] (device-node[name])</extracomment>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/core/DeviceModel.cpp" line="93"/>
+      <source>%1 - (%2)</source>
+      <extracomment>device[name] - (device-node[name])</extracomment>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>DracutLuksCfgJob</name>
+    <message>
+      <location filename="../src/modules/dracutlukscfg/DracutLuksCfgJob.cpp" line="117"/>
+      <source>Write LUKS configuration for Dracut to %1</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/dracutlukscfg/DracutLuksCfgJob.cpp" line="121"/>
+      <source>Skip writing LUKS configuration for Dracut: "/" partition is not encrypted</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/dracutlukscfg/DracutLuksCfgJob.cpp" line="138"/>
+      <source>Failed to open %1</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>DummyCppJob</name>
+    <message>
+      <location filename="../src/modules/dummycpp/DummyCppJob.cpp" line="36"/>
+      <source>Dummy C++ Job</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>EditExistingPartitionDialog</name>
+    <message>
+      <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="24"/>
+      <source>Edit Existing Partition</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="54"/>
+      <source>Con&amp;tent:</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="64"/>
+      <source>&amp;Keep</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="74"/>
+      <source>Format</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="93"/>
+      <source>Warning: Formatting the partition will erase all existing data.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="103"/>
+      <source>&amp;Mount Point:</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="129"/>
+      <source>Si&amp;ze:</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="139"/>
+      <source> MiB</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="146"/>
+      <source>Fi&amp;le System:</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="159"/>
+      <source>Flags:</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="179"/>
+      <source>Label for the filesystem</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="189"/>
+      <source>FS Label:</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="259"/>
+      <source>Passphrase for existing partition</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="260"/>
+      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphrase or delete and create a new encrypted partition.</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>EncryptWidget</name>
+    <message>
+      <location filename="../src/modules/partition/gui/EncryptWidget.ui" line="18"/>
+      <source>Form</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/EncryptWidget.ui" line="36"/>
+      <source>En&amp;crypt system</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/EncryptWidget.ui" line="43"/>
+      <source>Your system does not seem to support encryption well enough to encrypt the entire system. You may enable encryption, but performance may suffer.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/EncryptWidget.ui" line="59"/>
+      <source>Passphrase</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/EncryptWidget.ui" line="69"/>
+      <source>Confirm passphrase</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/EncryptWidget.cpp" line="156"/>
+      <location filename="../src/modules/partition/gui/EncryptWidget.cpp" line="166"/>
+      <source>Please enter the same passphrase in both boxes.</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>ErrorDialog</name>
+    <message>
+      <location filename="../src/libcalamaresui/widgets/ErrorDialog.ui" line="40"/>
+      <source>Details:</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/libcalamaresui/widgets/ErrorDialog.ui" line="56"/>
+      <source>Would you like to paste the install log to the web?</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>FillGlobalStorageJob</name>
+    <message>
+      <location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="172"/>
+      <source>Set partition information</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="201"/>
+      <source>Install %1 on &lt;strong&gt;new&lt;/strong&gt; %2 system partition with features &lt;em&gt;%3&lt;/em&gt;</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="209"/>
+      <source>Install %1 on &lt;strong&gt;new&lt;/strong&gt; %2 system partition.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="218"/>
+      <source>Set up &lt;strong&gt;new&lt;/strong&gt; %2 partition with mount point &lt;strong&gt;%1&lt;/strong&gt; and features &lt;em&gt;%3&lt;/em&gt;.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="226"/>
+      <source>Set up &lt;strong&gt;new&lt;/strong&gt; %2 partition with mount point &lt;strong&gt;%1&lt;/strong&gt;%3.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="240"/>
+      <source>Install %2 on %3 system partition &lt;strong&gt;%1&lt;/strong&gt; with features &lt;em&gt;%4&lt;/em&gt;.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="259"/>
+      <source>Set up %3 partition &lt;strong&gt;%1&lt;/strong&gt; with mount point &lt;strong&gt;%2&lt;/strong&gt; and features &lt;em&gt;%4&lt;/em&gt;.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="268"/>
+      <source>Set up %3 partition &lt;strong&gt;%1&lt;/strong&gt; with mount point &lt;strong&gt;%2&lt;/strong&gt;%4.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="249"/>
+      <source>Install %2 on %3 system partition &lt;strong&gt;%1&lt;/strong&gt;.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="283"/>
+      <source>Install boot loader on &lt;strong&gt;%1&lt;/strong&gt;.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="292"/>
+      <source>Setting up mount points.</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>FinishedPage</name>
+    <message>
+      <location filename="../src/modules/finished/FinishedPage.ui" line="18"/>
+      <source>Form</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/finished/FinishedPage.ui" line="102"/>
+      <source>&amp;Restart now</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/finished/FinishedPage.cpp" line="75"/>
+      <source>&lt;h1&gt;All done.&lt;/h1&gt;&lt;br/&gt;%1 has been set up on your computer.&lt;br/&gt;You may now start using your new system.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/finished/FinishedPage.cpp" line="79"/>
+      <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;When this box is checked, your system will restart immediately when you click on &lt;span style="font-style:italic;"&gt;Done&lt;/span&gt; or close the setup program.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/finished/FinishedPage.cpp" line="87"/>
+      <source>&lt;h1&gt;All done.&lt;/h1&gt;&lt;br/&gt;%1 has been installed on your computer.&lt;br/&gt;You may now restart into your new system, or continue using the %2 Live environment.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/finished/FinishedPage.cpp" line="92"/>
+      <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;When this box is checked, your system will restart immediately when you click on &lt;span style="font-style:italic;"&gt;Done&lt;/span&gt; or close the installer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/finished/FinishedPage.cpp" line="105"/>
+      <source>&lt;h1&gt;Setup Failed&lt;/h1&gt;&lt;br/&gt;%1 has not been set up on your computer.&lt;br/&gt;The error message was: %2.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/finished/FinishedPage.cpp" line="113"/>
+      <source>&lt;h1&gt;Installation Failed&lt;/h1&gt;&lt;br/&gt;%1 has not been installed on your computer.&lt;br/&gt;The error message was: %2.</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>FinishedQmlViewStep</name>
+    <message>
+      <location filename="../src/modules/finishedq/FinishedQmlViewStep.cpp" line="35"/>
+      <source>Finish</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>FinishedViewStep</name>
+    <message>
+      <location filename="../src/modules/finished/FinishedViewStep.cpp" line="46"/>
+      <source>Finish</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>FormatPartitionJob</name>
+    <message>
+      <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="39"/>
+      <source>Format partition %1 (file system: %2, size: %3 MiB) on %4.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="50"/>
+      <source>Format &lt;strong&gt;%3MiB&lt;/strong&gt; partition &lt;strong&gt;%1&lt;/strong&gt; with file system &lt;strong&gt;%2&lt;/strong&gt;.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="63"/>
+      <source>%1 (%2)</source>
+      <comment>partition label %1 (device path %2)</comment>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="65"/>
+      <source>Formatting partition %1 with file system %2.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="76"/>
+      <source>The installer failed to format partition %1 on disk '%2'.</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>GeneralRequirements</name>
+    <message>
+      <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="156"/>
+      <source>has at least %1 GiB available drive space</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="158"/>
+      <source>There is not enough drive space. At least %1 GiB is required.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="166"/>
+      <source>has at least %1 GiB working memory</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="168"/>
+      <source>The system does not have enough working memory. At least %1 GiB is required.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="177"/>
+      <source>is plugged in to a power source</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="178"/>
+      <source>The system is not plugged in to a power source.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="185"/>
+      <source>is connected to the Internet</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="186"/>
+      <source>The system is not connected to the Internet.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="193"/>
+      <source>is running the installer as an administrator (root)</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="197"/>
+      <source>The setup program is not running with administrator rights.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="198"/>
+      <source>The installer is not running with administrator rights.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="206"/>
+      <source>has a screen large enough to show the whole installer</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="210"/>
+      <source>The screen is too small to display the setup program.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="211"/>
+      <source>The screen is too small to display the installer.</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>HostInfoJob</name>
+    <message>
+      <location filename="../src/modules/hostinfo/HostInfoJob.cpp" line="42"/>
+      <source>Collecting information about your machine.</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>IDJob</name>
+    <message>
+      <location filename="../src/modules/oemid/IDJob.cpp" line="30"/>
+      <location filename="../src/modules/oemid/IDJob.cpp" line="39"/>
+      <location filename="../src/modules/oemid/IDJob.cpp" line="52"/>
+      <location filename="../src/modules/oemid/IDJob.cpp" line="59"/>
+      <source>OEM Batch Identifier</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/oemid/IDJob.cpp" line="40"/>
+      <source>Could not create directories &lt;code&gt;%1&lt;/code&gt;.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/oemid/IDJob.cpp" line="53"/>
+      <source>Could not open file &lt;code&gt;%1&lt;/code&gt;.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/oemid/IDJob.cpp" line="60"/>
+      <source>Could not write to file &lt;code&gt;%1&lt;/code&gt;.</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>InitcpioJob</name>
+    <message>
+      <location filename="../src/modules/initcpio/InitcpioJob.cpp" line="32"/>
+      <source>Creating initramfs with mkinitcpio.</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>InitramfsJob</name>
+    <message>
+      <location filename="../src/modules/initramfs/InitramfsJob.cpp" line="28"/>
+      <source>Creating initramfs.</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>InteractiveTerminalPage</name>
+    <message>
+      <location filename="../src/modules/interactiveterminal/InteractiveTerminalPage.cpp" line="46"/>
+      <source>Konsole not installed</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/interactiveterminal/InteractiveTerminalPage.cpp" line="47"/>
+      <source>Please install KDE Konsole and try again!</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/interactiveterminal/InteractiveTerminalPage.cpp" line="118"/>
+      <source>Executing script: &amp;nbsp;&lt;code&gt;%1&lt;/code&gt;</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>InteractiveTerminalViewStep</name>
+    <message>
+      <location filename="../src/modules/interactiveterminal/InteractiveTerminalViewStep.cpp" line="41"/>
+      <source>Script</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>KeyboardQmlViewStep</name>
+    <message>
+      <location filename="../src/modules/keyboardq/KeyboardQmlViewStep.cpp" line="32"/>
+      <source>Keyboard</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>KeyboardViewStep</name>
+    <message>
+      <location filename="../src/modules/keyboard/KeyboardViewStep.cpp" line="42"/>
+      <source>Keyboard</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>LCLocaleDialog</name>
+    <message>
+      <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="23"/>
+      <source>System locale setting</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="30"/>
+      <source>The system locale setting affects the language and character set for some command line user interface elements.&lt;br/&gt;The current setting is &lt;strong&gt;%1&lt;/strong&gt;.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="54"/>
+      <source>&amp;Cancel</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="55"/>
+      <source>&amp;OK</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>LOSHJob</name>
+    <message>
+      <location filename="../src/modules/luksopenswaphookcfg/LOSHJob.cpp" line="36"/>
+      <source>Configuring encrypted swap.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/luksopenswaphookcfg/LOSHJob.cpp" line="88"/>
+      <source>No target system available.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/luksopenswaphookcfg/LOSHJob.cpp" line="96"/>
+      <source>No rootMountPoint is set.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/luksopenswaphookcfg/LOSHJob.cpp" line="101"/>
+      <source>No configFilePath is set.</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>LicensePage</name>
+    <message>
+      <location filename="../src/modules/license/LicensePage.ui" line="18"/>
+      <source>Form</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/license/LicensePage.ui" line="26"/>
+      <source>&lt;h1&gt;License Agreement&lt;/h1&gt;</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/license/LicensePage.cpp" line="135"/>
+      <source>I accept the terms and conditions above.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/license/LicensePage.cpp" line="137"/>
+      <source>Please review the End User License Agreements (EULAs).</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/license/LicensePage.cpp" line="142"/>
+      <source>This setup procedure will install proprietary software that is subject to licensing terms.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/license/LicensePage.cpp" line="145"/>
+      <source>If you do not agree with the terms, the setup procedure cannot continue.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/license/LicensePage.cpp" line="150"/>
+      <source>This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/license/LicensePage.cpp" line="155"/>
+      <source>If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>LicenseViewStep</name>
+    <message>
+      <location filename="../src/modules/license/LicenseViewStep.cpp" line="43"/>
+      <source>License</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>LicenseWidget</name>
+    <message>
+      <location filename="../src/modules/license/LicenseWidget.cpp" line="88"/>
+      <source>URL: %1</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/license/LicenseWidget.cpp" line="109"/>
+      <source>&lt;strong&gt;%1 driver&lt;/strong&gt;&lt;br/&gt;by %2</source>
+      <extracomment>%1 is an untranslatable product name, example: Creative Audigy driver</extracomment>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/license/LicenseWidget.cpp" line="116"/>
+      <source>&lt;strong&gt;%1 graphics driver&lt;/strong&gt;&lt;br/&gt;&lt;font color="Grey"&gt;by %2&lt;/font&gt;</source>
+      <extracomment>%1 is usually a vendor name, example: Nvidia graphics driver</extracomment>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/license/LicenseWidget.cpp" line="122"/>
+      <source>&lt;strong&gt;%1 browser plugin&lt;/strong&gt;&lt;br/&gt;&lt;font color="Grey"&gt;by %2&lt;/font&gt;</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/license/LicenseWidget.cpp" line="128"/>
+      <source>&lt;strong&gt;%1 codec&lt;/strong&gt;&lt;br/&gt;&lt;font color="Grey"&gt;by %2&lt;/font&gt;</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/license/LicenseWidget.cpp" line="134"/>
+      <source>&lt;strong&gt;%1 package&lt;/strong&gt;&lt;br/&gt;&lt;font color="Grey"&gt;by %2&lt;/font&gt;</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/license/LicenseWidget.cpp" line="140"/>
+      <source>&lt;strong&gt;%1&lt;/strong&gt;&lt;br/&gt;&lt;font color="Grey"&gt;by %2&lt;/font&gt;</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/license/LicenseWidget.cpp" line="163"/>
+      <source>File: %1</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/license/LicenseWidget.cpp" line="186"/>
+      <source>Hide license text</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/license/LicenseWidget.cpp" line="186"/>
+      <source>Show the license text</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/license/LicenseWidget.cpp" line="190"/>
+      <source>Open license agreement in browser.</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>LocalePage</name>
+    <message>
+      <location filename="../src/modules/locale/LocalePage.cpp" line="130"/>
+      <source>Region:</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/locale/LocalePage.cpp" line="131"/>
+      <source>Zone:</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/locale/LocalePage.cpp" line="132"/>
+      <location filename="../src/modules/locale/LocalePage.cpp" line="133"/>
+      <source>&amp;Change...</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>LocaleQmlViewStep</name>
+    <message>
+      <location filename="../src/modules/localeq/LocaleQmlViewStep.cpp" line="32"/>
+      <source>Location</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>LocaleTests</name>
+    <message>
+      <location filename="../src/libcalamares/locale/Tests.cpp" line="273"/>
+      <source>Quit</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>LocaleViewStep</name>
+    <message>
+      <location filename="../src/modules/locale/LocaleViewStep.cpp" line="76"/>
+      <source>Location</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>LuksBootKeyFileJob</name>
+    <message>
+      <location filename="../src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp" line="33"/>
+      <source>Configuring LUKS key file.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp" line="235"/>
+      <location filename="../src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp" line="243"/>
+      <source>No partitions are defined.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp" line="279"/>
+      <location filename="../src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp" line="286"/>
+      <location filename="../src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp" line="300"/>
+      <source>Encrypted rootfs setup error</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp" line="280"/>
+      <source>Root partition %1 is LUKS but no passphrase has been set.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp" line="287"/>
+      <source>Could not create LUKS key file for root partition %1.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp" line="301"/>
+      <source>Could not configure LUKS key file on partition %1.</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>MachineIdJob</name>
+    <message>
+      <location filename="../src/modules/machineid/MachineIdJob.cpp" line="37"/>
+      <source>Generate machine-id.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/machineid/MachineIdJob.cpp" line="53"/>
+      <source>Configuration Error</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/machineid/MachineIdJob.cpp" line="54"/>
+      <source>No root mount point is set for MachineId.</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>Map</name>
+    <message>
+      <location filename="../src/modules/localeq/Map.qml" line="237"/>
+      <source>Timezone: %1</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/localeq/Map.qml" line="258"/>
+      <source>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.</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>NetInstallViewStep</name>
+    <message>
+      <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="50"/>
+      <source>Package selection</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="51"/>
+      <source>Office software</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="52"/>
+      <source>Office package</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="53"/>
+      <source>Browser software</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="54"/>
+      <source>Browser package</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="55"/>
+      <source>Web browser</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="56"/>
+      <source>Kernel</source>
+      <comment>label for netinstall module, Linux kernel</comment>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="57"/>
+      <source>Services</source>
+      <comment>label for netinstall module, system services</comment>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="58"/>
+      <source>Login</source>
+      <comment>label for netinstall module, choose login manager</comment>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="59"/>
+      <source>Desktop</source>
+      <comment>label for netinstall module, choose desktop environment</comment>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="61"/>
+      <source>Communication</source>
+      <comment>label for netinstall module</comment>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="62"/>
+      <source>Development</source>
+      <comment>label for netinstall module</comment>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="63"/>
+      <source>Office</source>
+      <comment>label for netinstall module</comment>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="64"/>
+      <source>Multimedia</source>
+      <comment>label for netinstall module</comment>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="65"/>
+      <source>Internet</source>
+      <comment>label for netinstall module</comment>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="66"/>
+      <source>Theming</source>
+      <comment>label for netinstall module</comment>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="67"/>
+      <source>Gaming</source>
+      <comment>label for netinstall module</comment>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="68"/>
+      <source>Utilities</source>
+      <comment>label for netinstall module</comment>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="60"/>
+      <source>Applications</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>NotesQmlViewStep</name>
+    <message>
+      <location filename="../src/modules/notesqml/NotesQmlViewStep.cpp" line="23"/>
+      <source>Notes</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>OEMPage</name>
+    <message>
+      <location filename="../src/modules/oemid/OEMPage.ui" line="32"/>
+      <source>Ba&amp;tch:</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/oemid/OEMPage.ui" line="42"/>
+      <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enter a batch-identifier here. This will be stored in the target system.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/oemid/OEMPage.ui" line="52"/>
+      <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;h1&gt;OEM Configuration&lt;/h1&gt;&lt;p&gt;Calamares will use OEM settings while configuring the target system.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>OEMViewStep</name>
+    <message>
+      <location filename="../src/modules/oemid/OEMViewStep.cpp" line="122"/>
+      <source>OEM Configuration</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/oemid/OEMViewStep.cpp" line="128"/>
+      <source>Set the OEM Batch Identifier to &lt;code&gt;%1&lt;/code&gt;.</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>Offline</name>
+    <message>
+      <location filename="../src/modules/localeq/Offline.qml" line="41"/>
+      <source>Select your preferred Region, or use the default settings.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/localeq/Offline.qml" line="99"/>
+      <location filename="../src/modules/localeq/Offline.qml" line="175"/>
+      <location filename="../src/modules/localeq/Offline.qml" line="219"/>
+      <source>Timezone: %1</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/localeq/Offline.qml" line="116"/>
+      <source>Select your preferred Zone within your Region.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/localeq/Offline.qml" line="188"/>
+      <source>Zones</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/localeq/Offline.qml" line="235"/>
+      <source>You can fine-tune Language and Locale settings below.</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>PWQ</name>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="51"/>
+      <source>Password is too short</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="67"/>
+      <source>Password is too long</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="188"/>
+      <source>Password is too weak</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="196"/>
+      <source>Memory allocation error when setting '%1'</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="199"/>
+      <source>Memory allocation error</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="201"/>
+      <source>The password is the same as the old one</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="203"/>
+      <source>The password is a palindrome</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="205"/>
+      <source>The password differs with case changes only</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="207"/>
+      <source>The password is too similar to the old one</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="209"/>
+      <source>The password contains the user name in some form</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="211"/>
+      <source>The password contains words from the real name of the user in some form</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="214"/>
+      <source>The password contains forbidden words in some form</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="221"/>
+      <source>The password contains too few digits</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="228"/>
+      <source>The password contains too few uppercase letters</source>
+      <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="232"/>
+      <source>The password contains fewer than %n lowercase letters</source>
+      <translation type="unfinished">
+        <numerusform/>
+      </translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="235"/>
+      <source>The password contains too few lowercase letters</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="242"/>
+      <source>The password contains too few non-alphanumeric characters</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="249"/>
+      <source>The password is too short</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="258"/>
+      <source>The password does not contain enough character classes</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="265"/>
+      <source>The password contains too many same characters consecutively</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="275"/>
+      <source>The password contains too many characters of the same class consecutively</source>
+      <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="218"/>
+      <source>The password contains fewer than %n digits</source>
+      <translation type="unfinished">
+        <numerusform/>
+      </translation>
+    </message>
+    <message numerus="yes">
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="225"/>
+      <source>The password contains fewer than %n uppercase letters</source>
+      <translation type="unfinished">
+        <numerusform/>
+      </translation>
+    </message>
+    <message numerus="yes">
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="239"/>
+      <source>The password contains fewer than %n non-alphanumeric characters</source>
+      <translation type="unfinished">
+        <numerusform/>
+      </translation>
+    </message>
+    <message numerus="yes">
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="246"/>
+      <source>The password is shorter than %n characters</source>
+      <translation type="unfinished">
+        <numerusform/>
+      </translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="251"/>
+      <source>The password is a rotated version of the previous one</source>
+      <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="255"/>
+      <source>The password contains fewer than %n character classes</source>
+      <translation type="unfinished">
+        <numerusform/>
+      </translation>
+    </message>
+    <message numerus="yes">
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="262"/>
+      <source>The password contains more than %n same characters consecutively</source>
+      <translation type="unfinished">
+        <numerusform/>
+      </translation>
+    </message>
+    <message numerus="yes">
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="269"/>
+      <source>The password contains more than %n characters of the same class consecutively</source>
+      <translation type="unfinished">
+        <numerusform/>
+      </translation>
+    </message>
+    <message numerus="yes">
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="280"/>
+      <source>The password contains monotonic sequence longer than %n characters</source>
+      <translation type="unfinished">
+        <numerusform/>
+      </translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="286"/>
+      <source>The password contains too long of a monotonic character sequence</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="289"/>
+      <source>No password supplied</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="291"/>
+      <source>Cannot obtain random numbers from the RNG device</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="293"/>
+      <source>Password generation failed - required entropy too low for settings</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="298"/>
+      <source>The password fails the dictionary check - %1</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="301"/>
+      <source>The password fails the dictionary check</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="305"/>
+      <source>Unknown setting - %1</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="307"/>
+      <source>Unknown setting</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="311"/>
+      <source>Bad integer value of setting - %1</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="313"/>
+      <source>Bad integer value</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="317"/>
+      <source>Setting %1 is not of integer type</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="319"/>
+      <source>Setting is not of integer type</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="323"/>
+      <source>Setting %1 is not of string type</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="325"/>
+      <source>Setting is not of string type</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="327"/>
+      <source>Opening the configuration file failed</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="329"/>
+      <source>The configuration file is malformed</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="331"/>
+      <source>Fatal failure</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="333"/>
+      <source>Unknown error</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/Config.cpp" line="830"/>
+      <source>Password is empty</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>PackageChooserPage</name>
+    <message>
+      <location filename="../src/modules/packagechooser/page_package.ui" line="24"/>
+      <source>Form</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/packagechooser/page_package.ui" line="50"/>
+      <source>Product Name</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/packagechooser/page_package.ui" line="63"/>
+      <source>TextLabel</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/packagechooser/page_package.ui" line="79"/>
+      <source>Long Product Description</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/packagechooser/PackageChooserPage.cpp" line="25"/>
+      <source>Package Selection</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/packagechooser/PackageChooserPage.cpp" line="26"/>
+      <source>Please pick a product from the list. The selected product will be installed.</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>PackageModel</name>
+    <message>
+      <location filename="../src/modules/netinstall/PackageModel.cpp" line="205"/>
+      <source>Name</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/netinstall/PackageModel.cpp" line="205"/>
+      <source>Description</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>Page_Keyboard</name>
+    <message>
+      <location filename="../src/modules/keyboard/KeyboardPage.ui" line="18"/>
+      <source>Form</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/keyboard/KeyboardPage.ui" line="74"/>
+      <source>Keyboard Model:</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/keyboard/KeyboardPage.ui" line="135"/>
+      <source>Type here to test your keyboard</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>Page_UserSetup</name>
+    <message>
+      <location filename="../src/modules/users/page_usersetup.ui" line="18"/>
+      <source>Form</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/page_usersetup.ui" line="40"/>
+      <source>What is your name?</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/page_usersetup.ui" line="55"/>
+      <source>Your Full Name</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/page_usersetup.ui" line="124"/>
+      <source>What name do you want to use to log in?</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/page_usersetup.ui" line="148"/>
+      <source>login</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/page_usersetup.ui" line="223"/>
+      <source>What is the name of this computer?</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/page_usersetup.ui" line="247"/>
+      <source>&lt;small&gt;This name will be used if you make the computer visible to others on a network.&lt;/small&gt;</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/page_usersetup.ui" line="250"/>
+      <source>Computer Name</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/page_usersetup.ui" line="325"/>
+      <source>Choose a password to keep your account safe.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/page_usersetup.ui" line="349"/>
+      <location filename="../src/modules/users/page_usersetup.ui" line="374"/>
+      <source>&lt;small&gt;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.&lt;/small&gt;</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/page_usersetup.ui" line="355"/>
+      <location filename="../src/modules/users/page_usersetup.ui" line="525"/>
+      <source>Password</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/page_usersetup.ui" line="380"/>
+      <location filename="../src/modules/users/page_usersetup.ui" line="550"/>
+      <source>Repeat Password</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/page_usersetup.ui" line="455"/>
+      <source>When this box is checked, password-strength checking is done and you will not be able to use a weak password.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/page_usersetup.ui" line="458"/>
+      <source>Require strong passwords.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/page_usersetup.ui" line="465"/>
+      <source>Log in automatically without asking for the password.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/page_usersetup.ui" line="472"/>
+      <source>Use the same password for the administrator account.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/page_usersetup.ui" line="495"/>
+      <source>Choose a password for the administrator account.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/page_usersetup.ui" line="519"/>
+      <location filename="../src/modules/users/page_usersetup.ui" line="544"/>
+      <source>&lt;small&gt;Enter the same password twice, so that it can be checked for typing errors.&lt;/small&gt;</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>PartitionLabelsView</name>
+    <message>
+      <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="189"/>
+      <source>Root</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="193"/>
+      <source>Home</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="197"/>
+      <source>Boot</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="202"/>
+      <source>EFI system</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="206"/>
+      <source>Swap</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="210"/>
+      <source>New partition for %1</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="214"/>
+      <source>New partition</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="238"/>
+      <source>%1  %2</source>
+      <extracomment>size[number] filesystem[name]</extracomment>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>PartitionModel</name>
+    <message>
+      <location filename="../src/modules/partition/core/PartitionModel.cpp" line="157"/>
+      <location filename="../src/modules/partition/core/PartitionModel.cpp" line="201"/>
+      <source>Free Space</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/core/PartitionModel.cpp" line="161"/>
+      <location filename="../src/modules/partition/core/PartitionModel.cpp" line="205"/>
+      <source>New partition</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/core/PartitionModel.cpp" line="298"/>
+      <source>Name</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/core/PartitionModel.cpp" line="300"/>
+      <source>File System</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/core/PartitionModel.cpp" line="302"/>
+      <source>File System Label</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/core/PartitionModel.cpp" line="304"/>
+      <source>Mount Point</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/core/PartitionModel.cpp" line="306"/>
+      <source>Size</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>PartitionPage</name>
+    <message>
+      <location filename="../src/modules/partition/gui/PartitionPage.ui" line="18"/>
+      <source>Form</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/PartitionPage.ui" line="26"/>
+      <source>Storage de&amp;vice:</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/PartitionPage.ui" line="55"/>
+      <source>&amp;Revert All Changes</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/PartitionPage.ui" line="91"/>
+      <source>New Partition &amp;Table</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/PartitionPage.ui" line="111"/>
+      <source>Cre&amp;ate</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/PartitionPage.ui" line="118"/>
+      <source>&amp;Edit</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/PartitionPage.ui" line="125"/>
+      <source>&amp;Delete</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/PartitionPage.ui" line="136"/>
+      <source>New Volume Group</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/PartitionPage.ui" line="143"/>
+      <source>Resize Volume Group</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/PartitionPage.ui" line="150"/>
+      <source>Deactivate Volume Group</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/PartitionPage.ui" line="157"/>
+      <source>Remove Volume Group</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/PartitionPage.ui" line="184"/>
+      <source>I&amp;nstall boot loader on:</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="228"/>
+      <source>Are you sure you want to create a new partition table on %1?</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="263"/>
+      <source>Can not create new partition</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="264"/>
+      <source>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.</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>PartitionViewStep</name>
+    <message>
+      <location filename="../src/modules/partition/PartitionViewStep.cpp" line="56"/>
+      <source>Gathering system information...</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/PartitionViewStep.cpp" line="111"/>
+      <source>Partitions</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/PartitionViewStep.cpp" line="254"/>
+      <source>Unsafe partition actions are enabled.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/PartitionViewStep.cpp" line="257"/>
+      <source>Partitioning is configured to &lt;b&gt;always&lt;/b&gt; fail.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/PartitionViewStep.cpp" line="260"/>
+      <source>No partitions will be changed.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/PartitionViewStep.cpp" line="300"/>
+      <source>Current:</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/PartitionViewStep.cpp" line="318"/>
+      <source>After:</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/PartitionViewStep.cpp" line="529"/>
+      <source>No EFI system partition configured</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/PartitionViewStep.cpp" line="533"/>
+      <source>EFI system partition configured incorrectly</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/PartitionViewStep.cpp" line="538"/>
+      <source>An EFI system partition is necessary to start %1.&lt;br/&gt;&lt;br/&gt;To configure an EFI system partition, go back and select or create a suitable filesystem.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/PartitionViewStep.cpp" line="549"/>
+      <source>The filesystem must be mounted on &lt;strong&gt;%1&lt;/strong&gt;.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/PartitionViewStep.cpp" line="555"/>
+      <source>The filesystem must have type FAT32.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/PartitionViewStep.cpp" line="563"/>
+      <source>The filesystem must be at least %1 MiB in size.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/PartitionViewStep.cpp" line="569"/>
+      <source>The filesystem must have flag &lt;strong&gt;%1&lt;/strong&gt; set.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/PartitionViewStep.cpp" line="575"/>
+      <source>You can continue without setting up an EFI system partition but your system may fail to start.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/PartitionViewStep.cpp" line="593"/>
+      <source>Option to use GPT on BIOS</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/PartitionViewStep.cpp" line="594"/>
+      <source>A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.&lt;br/&gt;&lt;br/&gt;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 &lt;strong&gt;%2&lt;/strong&gt; flag enabled.&lt;br/&gt;&lt;br/&gt;An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/PartitionViewStep.cpp" line="626"/>
+      <source>Boot partition not encrypted</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/PartitionViewStep.cpp" line="627"/>
+      <source>A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.&lt;br/&gt;&lt;br/&gt;There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.&lt;br/&gt;You may continue if you wish, but filesystem unlocking will happen later during system startup.&lt;br/&gt;To encrypt the boot partition, go back and recreate it, selecting &lt;strong&gt;Encrypt&lt;/strong&gt; in the partition creation window.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/PartitionViewStep.cpp" line="718"/>
+      <source>has at least one disk device available.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/PartitionViewStep.cpp" line="719"/>
+      <source>There are no partitions to install on.</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>PlasmaLnfJob</name>
+    <message>
+      <location filename="../src/modules/plasmalnf/PlasmaLnfJob.cpp" line="33"/>
+      <source>Plasma Look-and-Feel Job</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/plasmalnf/PlasmaLnfJob.cpp" line="57"/>
+      <location filename="../src/modules/plasmalnf/PlasmaLnfJob.cpp" line="58"/>
+      <source>Could not select KDE Plasma Look-and-Feel package</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>PlasmaLnfPage</name>
+    <message>
+      <location filename="../src/modules/plasmalnf/page_plasmalnf.ui" line="18"/>
+      <source>Form</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/plasmalnf/PlasmaLnfPage.cpp" line="79"/>
+      <source>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.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/plasmalnf/PlasmaLnfPage.cpp" line="84"/>
+      <source>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.</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>PlasmaLnfViewStep</name>
+    <message>
+      <location filename="../src/modules/plasmalnf/PlasmaLnfViewStep.cpp" line="43"/>
+      <source>Look-and-Feel</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>PreserveFiles</name>
+    <message>
+      <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="53"/>
+      <source>Saving files for later ...</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="61"/>
+      <source>No files configured to save for later.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="85"/>
+      <source>Not all of the configured files could be preserved.</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>ProcessResult</name>
+    <message>
+      <location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="309"/>
+      <source>
+There was no output from the command.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="310"/>
+      <source>
+Output:
+</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="314"/>
+      <source>External command crashed.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="315"/>
+      <source>Command &lt;i&gt;%1&lt;/i&gt; crashed.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="320"/>
+      <source>External command failed to start.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="321"/>
+      <source>Command &lt;i&gt;%1&lt;/i&gt; failed to start.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="325"/>
+      <source>Internal error when starting command.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="326"/>
+      <source>Bad parameters for process job call.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="330"/>
+      <source>External command failed to finish.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="331"/>
+      <source>Command &lt;i&gt;%1&lt;/i&gt; failed to finish in %2 seconds.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="338"/>
+      <source>External command finished with errors.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="339"/>
+      <source>Command &lt;i&gt;%1&lt;/i&gt; finished with exit code %2.</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>QObject</name>
+    <message>
+      <location filename="../src/libcalamares/locale/Translation.cpp" line="145"/>
+      <source>%1 (%2)</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/libcalamares/partition/FileSystem.cpp" line="33"/>
+      <source>unknown</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/libcalamares/partition/FileSystem.cpp" line="35"/>
+      <source>extended</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/libcalamares/partition/FileSystem.cpp" line="37"/>
+      <source>unformatted</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/libcalamares/partition/FileSystem.cpp" line="39"/>
+      <source>swap</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/keyboard/keyboardwidget/keyboardglobal.cpp" line="130"/>
+      <location filename="../src/modules/keyboard/keyboardwidget/keyboardglobal.cpp" line="167"/>
+      <source>Default</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/machineid/Workers.cpp" line="64"/>
+      <location filename="../src/modules/machineid/Workers.cpp" line="72"/>
+      <location filename="../src/modules/machineid/Workers.cpp" line="76"/>
+      <location filename="../src/modules/machineid/Workers.cpp" line="93"/>
+      <source>File not found</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/machineid/Workers.cpp" line="65"/>
+      <source>Path &lt;pre&gt;%1&lt;/pre&gt; must be an absolute path.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/machineid/MachineIdJob.cpp" line="83"/>
+      <source>Directory not found</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/machineid/MachineIdJob.cpp" line="84"/>
+      <location filename="../src/modules/machineid/Workers.cpp" line="94"/>
+      <source>Could not create new random file &lt;pre&gt;%1&lt;/pre&gt;.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/packagechooser/PackageModel.cpp" line="74"/>
+      <source>No product</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/packagechooser/PackageModel.cpp" line="82"/>
+      <source>No description provided.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/PartitionDialogHelpers.cpp" line="44"/>
+      <source>(no mount point)</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="40"/>
+      <source>Unpartitioned space or unknown partition table</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>Recommended</name>
+    <message>
+      <location filename="../src/modules/welcomeq/Recommended.qml" line="40"/>
+      <source>&lt;p&gt;This computer does not satisfy some of the recommended requirements for setting up %1.&lt;br/&gt;
+        Setup can continue, but some features might be disabled.&lt;/p&gt;</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>RemoveUserJob</name>
+    <message>
+      <location filename="../src/modules/removeuser/RemoveUserJob.cpp" line="34"/>
+      <source>Remove live user from target system</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>RemoveVolumeGroupJob</name>
+    <message>
+      <location filename="../src/modules/partition/jobs/RemoveVolumeGroupJob.cpp" line="26"/>
+      <location filename="../src/modules/partition/jobs/RemoveVolumeGroupJob.cpp" line="38"/>
+      <source>Remove Volume Group named %1.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/RemoveVolumeGroupJob.cpp" line="32"/>
+      <source>Remove Volume Group named &lt;strong&gt;%1&lt;/strong&gt;.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/RemoveVolumeGroupJob.cpp" line="46"/>
+      <source>The installer failed to remove a volume group named '%1'.</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>ReplaceWidget</name>
+    <message>
+      <location filename="../src/modules/partition/gui/ReplaceWidget.ui" line="18"/>
+      <source>Form</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="128"/>
+      <source>Select where to install %1.&lt;br/&gt;&lt;font color="red"&gt;Warning: &lt;/font&gt;this will delete all files on the selected partition.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="150"/>
+      <source>The selected item does not appear to be a valid partition.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="158"/>
+      <source>%1 cannot be installed on empty space. Please select an existing partition.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="168"/>
+      <source>%1 cannot be installed on an extended partition. Please select an existing primary or logical partition.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="178"/>
+      <source>%1 cannot be installed on this partition.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="184"/>
+      <source>Data partition (%1)</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="204"/>
+      <source>Unknown system partition (%1)</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="208"/>
+      <source>%1 system partition (%2)</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="220"/>
+      <source>&lt;strong&gt;%4&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="242"/>
+      <source>&lt;strong&gt;%2&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="253"/>
+      <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="269"/>
+      <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="294"/>
+      <source>&lt;strong&gt;%3&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;%1 will be installed on %2.&lt;br/&gt;&lt;font color="red"&gt;Warning: &lt;/font&gt;all data on partition %2 will be lost.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="261"/>
+      <source>The EFI system partition at %1 will be used for starting %2.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="277"/>
+      <source>EFI system partition:</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>Requirements</name>
+    <message>
+      <location filename="../src/modules/welcomeq/Requirements.qml" line="38"/>
+      <source>&lt;p&gt;This computer does not satisfy the minimum requirements for installing %1.&lt;br/&gt;
+        Installation cannot continue.&lt;/p&gt;</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/welcomeq/Requirements.qml" line="40"/>
+      <source>&lt;p&gt;This computer does not satisfy some of the recommended requirements for setting up %1.&lt;br/&gt;
+        Setup can continue, but some features might be disabled.&lt;/p&gt;</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>ResizeFSJob</name>
+    <message>
+      <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="45"/>
+      <source>Resize Filesystem Job</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="168"/>
+      <source>Invalid configuration</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="169"/>
+      <source>The file-system resize job has an invalid configuration and will not run.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="174"/>
+      <source>KPMCore not Available</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="175"/>
+      <source>Calamares cannot start KPMCore for the file-system resize job.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="183"/>
+      <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="192"/>
+      <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="203"/>
+      <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="212"/>
+      <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="230"/>
+      <source>Resize Failed</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="185"/>
+      <source>The filesystem %1 could not be found in this system, and cannot be resized.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="186"/>
+      <source>The device %1 could not be found in this system, and cannot be resized.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="194"/>
+      <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="205"/>
+      <source>The filesystem %1 cannot be resized.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="195"/>
+      <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="206"/>
+      <source>The device %1 cannot be resized.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="213"/>
+      <source>The filesystem %1 must be resized, but cannot.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="214"/>
+      <source>The device %1 must be resized, but cannot</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>ResizePartitionJob</name>
+    <message>
+      <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="41"/>
+      <source>Resize partition %1.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="48"/>
+      <source>Resize &lt;strong&gt;%2MiB&lt;/strong&gt; partition &lt;strong&gt;%1&lt;/strong&gt; to &lt;strong&gt;%3MiB&lt;/strong&gt;.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="59"/>
+      <source>Resizing %2MiB partition %1 to %3MiB.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="77"/>
+      <source>The installer failed to resize partition %1 on disk '%2'.</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>ResizeVolumeGroupDialog</name>
+    <message>
+      <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="30"/>
+      <source>Resize Volume Group</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>ResizeVolumeGroupJob</name>
+    <message>
+      <location filename="../src/modules/partition/jobs/ResizeVolumeGroupJob.cpp" line="28"/>
+      <location filename="../src/modules/partition/jobs/ResizeVolumeGroupJob.cpp" line="46"/>
+      <source>Resize volume group named %1 from %2 to %3.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/ResizeVolumeGroupJob.cpp" line="37"/>
+      <source>Resize volume group named &lt;strong&gt;%1&lt;/strong&gt; from &lt;strong&gt;%2&lt;/strong&gt; to &lt;strong&gt;%3&lt;/strong&gt;.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/ResizeVolumeGroupJob.cpp" line="57"/>
+      <source>The installer failed to resize a volume group named '%1'.</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>ResultsListDialog</name>
+    <message>
+      <location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="138"/>
+      <source>For best results, please ensure that this computer:</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="139"/>
+      <source>System requirements</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>ScanningDialog</name>
+    <message>
+      <location filename="../src/modules/partition/gui/ScanningDialog.cpp" line="68"/>
+      <source>Scanning storage devices...</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/ScanningDialog.cpp" line="68"/>
+      <source>Partitioning</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>SetHostNameJob</name>
+    <message>
+      <location filename="../src/modules/users/SetHostNameJob.cpp" line="36"/>
+      <source>Set hostname %1</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/SetHostNameJob.cpp" line="43"/>
+      <source>Set hostname &lt;strong&gt;%1&lt;/strong&gt;.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/SetHostNameJob.cpp" line="50"/>
+      <source>Setting hostname %1.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/SetHostNameJob.cpp" line="124"/>
+      <location filename="../src/modules/users/SetHostNameJob.cpp" line="131"/>
+      <source>Internal Error</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/SetHostNameJob.cpp" line="142"/>
+      <location filename="../src/modules/users/SetHostNameJob.cpp" line="159"/>
+      <source>Cannot write hostname to target system</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>SetKeyboardLayoutJob</name>
+    <message>
+      <location filename="../src/modules/keyboard/SetKeyboardLayoutJob.cpp" line="55"/>
+      <source>Set keyboard model to %1, layout to %2-%3</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/keyboard/SetKeyboardLayoutJob.cpp" line="368"/>
+      <source>Failed to write keyboard configuration for the virtual console.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/keyboard/SetKeyboardLayoutJob.cpp" line="369"/>
+      <location filename="../src/modules/keyboard/SetKeyboardLayoutJob.cpp" line="397"/>
+      <location filename="../src/modules/keyboard/SetKeyboardLayoutJob.cpp" line="414"/>
+      <source>Failed to write to %1</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/keyboard/SetKeyboardLayoutJob.cpp" line="396"/>
+      <source>Failed to write keyboard configuration for X11.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/keyboard/SetKeyboardLayoutJob.cpp" line="413"/>
+      <source>Failed to write keyboard configuration to existing /etc/default directory.</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>SetPartFlagsJob</name>
+    <message>
+      <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="45"/>
+      <source>Set flags on partition %1.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="51"/>
+      <source>Set flags on %1MiB %2 partition.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="55"/>
+      <source>Set flags on new partition.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="67"/>
+      <source>Clear flags on partition &lt;strong&gt;%1&lt;/strong&gt;.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="73"/>
+      <source>Clear flags on %1MiB &lt;strong&gt;%2&lt;/strong&gt; partition.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="77"/>
+      <source>Clear flags on new partition.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="82"/>
+      <source>Flag partition &lt;strong&gt;%1&lt;/strong&gt; as &lt;strong&gt;%2&lt;/strong&gt;.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="91"/>
+      <source>Flag %1MiB &lt;strong&gt;%2&lt;/strong&gt; partition as &lt;strong&gt;%3&lt;/strong&gt;.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="98"/>
+      <source>Flag new partition as &lt;strong&gt;%1&lt;/strong&gt;.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="110"/>
+      <source>Clearing flags on partition &lt;strong&gt;%1&lt;/strong&gt;.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="116"/>
+      <source>Clearing flags on %1MiB &lt;strong&gt;%2&lt;/strong&gt; partition.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="121"/>
+      <source>Clearing flags on new partition.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="126"/>
+      <source>Setting flags &lt;strong&gt;%2&lt;/strong&gt; on partition &lt;strong&gt;%1&lt;/strong&gt;.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="135"/>
+      <source>Setting flags &lt;strong&gt;%3&lt;/strong&gt; on %1MiB &lt;strong&gt;%2&lt;/strong&gt; partition.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="142"/>
+      <source>Setting flags &lt;strong&gt;%1&lt;/strong&gt; on new partition.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="156"/>
+      <source>The installer failed to set flags on partition %1.</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>SetPasswordJob</name>
+    <message>
+      <location filename="../src/modules/users/SetPasswordJob.cpp" line="40"/>
+      <source>Set password for user %1</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/SetPasswordJob.cpp" line="47"/>
+      <source>Setting password for user %1.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/SetPasswordJob.cpp" line="81"/>
+      <source>Bad destination system path.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/SetPasswordJob.cpp" line="82"/>
+      <source>rootMountPoint is %1</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/SetPasswordJob.cpp" line="88"/>
+      <source>Cannot disable root account.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/SetPasswordJob.cpp" line="89"/>
+      <source>passwd terminated with error code %1.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/SetPasswordJob.cpp" line="97"/>
+      <source>Cannot set password for user %1.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/SetPasswordJob.cpp" line="98"/>
+      <source>usermod terminated with error code %1.</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>SetTimezoneJob</name>
+    <message>
+      <location filename="../src/modules/locale/SetTimezoneJob.cpp" line="34"/>
+      <source>Set timezone to %1/%2</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/locale/SetTimezoneJob.cpp" line="62"/>
+      <source>Cannot access selected timezone path.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/locale/SetTimezoneJob.cpp" line="63"/>
+      <source>Bad path: %1</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/locale/SetTimezoneJob.cpp" line="71"/>
+      <source>Cannot set timezone.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/locale/SetTimezoneJob.cpp" line="72"/>
+      <source>Link creation failed, target: %1; link name: %2</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/locale/SetTimezoneJob.cpp" line="77"/>
+      <source>Cannot set timezone,</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/locale/SetTimezoneJob.cpp" line="78"/>
+      <source>Cannot open /etc/timezone for writing</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>SetupGroupsJob</name>
+    <message>
+      <location filename="../src/modules/users/MiscJobs.cpp" line="182"/>
+      <source>Preparing groups.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/MiscJobs.cpp" line="194"/>
+      <location filename="../src/modules/users/MiscJobs.cpp" line="199"/>
+      <source>Could not create groups in target system</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/MiscJobs.cpp" line="200"/>
+      <source>These groups are missing in the target system: %1</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>SetupSudoJob</name>
+    <message>
+      <location filename="../src/modules/users/MiscJobs.cpp" line="34"/>
+      <source>Configure &lt;pre&gt;sudo&lt;/pre&gt; users.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/MiscJobs.cpp" line="71"/>
+      <source>Cannot chmod sudoers file.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/MiscJobs.cpp" line="76"/>
+      <source>Cannot create sudoers file for writing.</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>ShellProcessJob</name>
+    <message>
+      <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="40"/>
+      <source>Shell Processes Job</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>SlideCounter</name>
+    <message>
+      <location filename="../src/qml/calamares/slideshow/SlideCounter.qml" line="27"/>
+      <source>%L1 / %L2</source>
+      <extracomment>slide counter, %1 of %2 (numeric)</extracomment>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>StandardButtons</name>
+    <message>
+      <location filename="../src/libcalamaresui/widgets/TranslationFix.cpp" line="23"/>
+      <source>&amp;OK</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/libcalamaresui/widgets/TranslationFix.cpp" line="24"/>
+      <source>&amp;Yes</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/libcalamaresui/widgets/TranslationFix.cpp" line="25"/>
+      <source>&amp;No</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/libcalamaresui/widgets/TranslationFix.cpp" line="26"/>
+      <source>&amp;Cancel</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/libcalamaresui/widgets/TranslationFix.cpp" line="27"/>
+      <source>&amp;Close</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>TrackingInstallJob</name>
+    <message>
+      <location filename="../src/modules/tracking/TrackingJobs.cpp" line="101"/>
+      <source>Installation feedback</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/tracking/TrackingJobs.cpp" line="107"/>
+      <source>Sending installation feedback.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/tracking/TrackingJobs.cpp" line="125"/>
+      <source>Internal error in install-tracking.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/tracking/TrackingJobs.cpp" line="126"/>
+      <source>HTTP request timed out.</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>TrackingKUserFeedbackJob</name>
+    <message>
+      <location filename="../src/modules/tracking/TrackingJobs.cpp" line="193"/>
+      <source>KDE user feedback</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/tracking/TrackingJobs.cpp" line="199"/>
+      <source>Configuring KDE user feedback.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/tracking/TrackingJobs.cpp" line="221"/>
+      <location filename="../src/modules/tracking/TrackingJobs.cpp" line="229"/>
+      <source>Error in KDE user feedback configuration.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/tracking/TrackingJobs.cpp" line="222"/>
+      <source>Could not configure KDE user feedback correctly, script error %1.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/tracking/TrackingJobs.cpp" line="230"/>
+      <source>Could not configure KDE user feedback correctly, Calamares error %1.</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>TrackingMachineUpdateManagerJob</name>
+    <message>
+      <location filename="../src/modules/tracking/TrackingJobs.cpp" line="136"/>
+      <source>Machine feedback</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/tracking/TrackingJobs.cpp" line="142"/>
+      <source>Configuring machine feedback.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/tracking/TrackingJobs.cpp" line="165"/>
+      <location filename="../src/modules/tracking/TrackingJobs.cpp" line="174"/>
+      <source>Error in machine feedback configuration.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/tracking/TrackingJobs.cpp" line="167"/>
+      <source>Could not configure machine feedback correctly, script error %1.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/tracking/TrackingJobs.cpp" line="176"/>
+      <source>Could not configure machine feedback correctly, Calamares error %1.</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>TrackingPage</name>
+    <message>
+      <location filename="../src/modules/tracking/page_trackingstep.ui" line="18"/>
+      <source>Form</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/tracking/page_trackingstep.ui" line="28"/>
+      <source>Placeholder</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/tracking/page_trackingstep.ui" line="76"/>
+      <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click here to send &lt;span style=" font-weight:600;"&gt;no information at all&lt;/span&gt; about your installation.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/tracking/page_trackingstep.ui" line="275"/>
+      <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a href="placeholder"&gt;&lt;span style=" text-decoration: underline; color:#2980b9;"&gt;Click here for more information about user feedback&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/tracking/TrackingPage.cpp" line="95"/>
+      <source>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.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/tracking/TrackingPage.cpp" line="100"/>
+      <source>By selecting this you will send information about your installation and hardware. This information will only be sent &lt;b&gt;once&lt;/b&gt; after the installation finishes.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/tracking/TrackingPage.cpp" line="103"/>
+      <source>By selecting this you will periodically send information about your &lt;b&gt;machine&lt;/b&gt; installation, hardware and applications, to %1.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/tracking/TrackingPage.cpp" line="107"/>
+      <source>By selecting this you will regularly send information about your &lt;b&gt;user&lt;/b&gt; installation, hardware, applications and application usage patterns, to %1.</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>TrackingViewStep</name>
+    <message>
+      <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="49"/>
+      <source>Feedback</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>UmountJob</name>
+    <message>
+      <location filename="../src/modules/umount/UmountJob.cpp" line="39"/>
+      <source>Unmount file systems.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/umount/UmountJob.cpp" line="124"/>
+      <source>No target system available.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/umount/UmountJob.cpp" line="132"/>
+      <source>No rootMountPoint is set.</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>UsersPage</name>
+    <message>
+      <location filename="../src/modules/users/UsersPage.cpp" line="190"/>
+      <source>&lt;small&gt;If more than one person will use this computer, you can create multiple accounts after setup.&lt;/small&gt;</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/UsersPage.cpp" line="196"/>
+      <source>&lt;small&gt;If more than one person will use this computer, you can create multiple accounts after installation.&lt;/small&gt;</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>UsersQmlViewStep</name>
+    <message>
+      <location filename="../src/modules/usersq/UsersQmlViewStep.cpp" line="35"/>
+      <source>Users</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>UsersViewStep</name>
+    <message>
+      <location filename="../src/modules/users/UsersViewStep.cpp" line="48"/>
+      <source>Users</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>VariantModel</name>
+    <message>
+      <location filename="../src/calamares/VariantModel.cpp" line="232"/>
+      <source>Key</source>
+      <comment>Column header for key/value</comment>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/calamares/VariantModel.cpp" line="236"/>
+      <source>Value</source>
+      <comment>Column header for key/value</comment>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>VolumeGroupBaseDialog</name>
+    <message>
+      <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="18"/>
+      <source>Create Volume Group</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="24"/>
+      <source>List of Physical Volumes</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="34"/>
+      <source>Volume Group Name:</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="47"/>
+      <source>Volume Group Type:</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="60"/>
+      <source>Physical Extent Size:</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="70"/>
+      <source> MiB</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="86"/>
+      <source>Total Size:</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="106"/>
+      <source>Used Size:</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="126"/>
+      <source>Total Sectors:</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="146"/>
+      <source>Quantity of LVs:</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>WelcomePage</name>
+    <message>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="18"/>
+      <source>Form</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="79"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="98"/>
+      <source>Select application and system language</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="140"/>
+      <source>Open donations website</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="143"/>
+      <source>&amp;Donate</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
+      <source>Open help and support website</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="156"/>
+      <source>&amp;Support</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
+      <source>Open issues and bug-tracking website</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="169"/>
+      <source>&amp;Known issues</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
+      <source>Open release notes website</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="182"/>
+      <source>&amp;Release notes</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/welcome/WelcomePage.cpp" line="212"/>
+      <source>%1 support</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/calamares/DebugWindow.cpp" line="319"/>
+      <source>About %1 setup</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/calamares/DebugWindow.cpp" line="320"/>
+      <source>About %1 installer</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>WelcomeQmlViewStep</name>
+    <message>
+      <location filename="../src/modules/welcomeq/WelcomeQmlViewStep.cpp" line="40"/>
+      <source>Welcome</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>WelcomeViewStep</name>
+    <message>
+      <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="46"/>
+      <source>Welcome</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>ZfsJob</name>
+    <message>
+      <location filename="../src/modules/zfs/ZfsJob.cpp" line="101"/>
+      <source>Create ZFS pools and datasets</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/zfs/ZfsJob.cpp" line="162"/>
+      <source>Failed to create zpool on </source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/zfs/ZfsJob.cpp" line="180"/>
+      <source>Configuration Error</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/zfs/ZfsJob.cpp" line="181"/>
+      <source>No partitions are available for ZFS.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/zfs/ZfsJob.cpp" line="192"/>
+      <source>Internal data missing</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/zfs/ZfsJob.cpp" line="192"/>
+      <location filename="../src/modules/zfs/ZfsJob.cpp" line="257"/>
+      <source>Failed to create zpool</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/zfs/ZfsJob.cpp" line="329"/>
+      <source>Failed to create dataset</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/zfs/ZfsJob.cpp" line="330"/>
+      <source>The output was: </source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>calamares-sidebar</name>
+    <message>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+      <source>About</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+      <source>Debug</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>finishedq</name>
+    <message>
+      <location filename="../src/modules/finishedq/finishedq.qml" line="36"/>
+      <source>Installation Completed</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/finishedq/finishedq.qml" line="43"/>
+      <source>%1 has been installed on your computer.&lt;br/&gt;
+            You may now restart into your new system, or continue using the Live environment.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/finishedq/finishedq.qml" line="65"/>
+      <source>Close Installer</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/finishedq/finishedq.qml" line="71"/>
+      <source>Restart System</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/finishedq/finishedq.qml" line="89"/>
+      <source>&lt;p&gt;A full log of the install is available as installation.log in the home directory of the Live user.&lt;br/&gt;
+            This log is copied to /var/log/installation.log of the target system.&lt;/p&gt;</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>finishedq@mobile</name>
+    <message>
+      <location filename="../src/modules/finishedq/finishedq@mobile.qml" line="36"/>
+      <source>Installation Completed</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/finishedq/finishedq@mobile.qml" line="43"/>
+      <source>%1 has been installed on your computer.&lt;br/&gt;
+            You may now restart your device.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/finishedq/finishedq@mobile.qml" line="65"/>
+      <source>Close</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/finishedq/finishedq@mobile.qml" line="71"/>
+      <source>Restart</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>i18n</name>
+    <message>
+      <location filename="../src/modules/localeq/i18n.qml" line="50"/>
+      <source>&lt;h1&gt;Languages&lt;/h1&gt; &lt;/br&gt;
+                    The system locale setting affects the language and character set for some command line user interface elements. The current setting is &lt;strong&gt;%1&lt;/strong&gt;.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/localeq/i18n.qml" line="123"/>
+      <source>&lt;h1&gt;Locales&lt;/h1&gt; &lt;/br&gt;
+                    The system locale setting affects the numbers and dates format. The current setting is &lt;strong&gt;%1&lt;/strong&gt;.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/localeq/i18n.qml" line="189"/>
+      <source>Back</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>keyboardq</name>
+    <message>
+      <location filename="../src/modules/keyboardq/keyboardq.qml" line="60"/>
+      <source>To activate keyboard preview, select a layout.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/keyboardq/keyboardq.qml" line="86"/>
+      <source>Keyboard Model:</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/keyboardq/keyboardq.qml" line="256"/>
+      <source>Layouts</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/keyboardq/keyboardq.qml" line="265"/>
+      <source>Type here to test your keyboard</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/keyboardq/keyboardq.qml" line="180"/>
+      <source>Variants</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>localeq</name>
+    <message>
+      <location filename="../src/modules/localeq/localeq.qml" line="81"/>
+      <source>Change</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>notesqml</name>
+    <message>
+      <location filename="../src/modules/notesqml/notesqml.qml" line="50"/>
+      <source>&lt;h3&gt;%1&lt;/h3&gt;
+            &lt;p&gt;These are example release notes.&lt;/p&gt;</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>packagechooserq</name>
+    <message>
+      <location filename="../src/modules/packagechooserq/packagechooserq.qml" line="45"/>
+      <source>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.&lt;br/&gt;
+                    Default option.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/packagechooserq/packagechooserq.qml" line="59"/>
+      <source>LibreOffice</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/packagechooserq/packagechooserq.qml" line="108"/>
+      <source>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.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/packagechooserq/packagechooserq.qml" line="121"/>
+      <source>No Office Suite</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/packagechooserq/packagechooserq.qml" line="172"/>
+      <source>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.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/packagechooserq/packagechooserq.qml" line="185"/>
+      <source>Minimal Install</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/packagechooserq/packagechooserq.qml" line="233"/>
+      <source>Please select an option for your install, or use the default: LibreOffice included.</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>release_notes</name>
+    <message>
+      <location filename="../src/modules/welcomeq/release_notes.qml" line="45"/>
+      <source>&lt;h3&gt;%1&lt;/h3&gt;
+            &lt;p&gt;This an example QML file, showing options in RichText with Flickable content.&lt;/p&gt;
+
+            &lt;p&gt;QML with RichText can use HTML tags, Flickable content is useful for touchscreens.&lt;/p&gt;
+
+            &lt;p&gt;&lt;b&gt;This is bold text&lt;/b&gt;&lt;/p&gt;
+            &lt;p&gt;&lt;i&gt;This is italic text&lt;/i&gt;&lt;/p&gt;
+            &lt;p&gt;&lt;u&gt;This is underlined text&lt;/u&gt;&lt;/p&gt;
+            &lt;p&gt;&lt;center&gt;This text will be center-aligned.&lt;/center&gt;&lt;/p&gt;
+            &lt;p&gt;&lt;s&gt;This is strikethrough&lt;/s&gt;&lt;/p&gt;
+
+            &lt;p&gt;Code example:
+            &lt;code&gt;ls -l /home&lt;/code&gt;&lt;/p&gt;
+
+            &lt;p&gt;&lt;b&gt;Lists:&lt;/b&gt;&lt;/p&gt;
+            &lt;ul&gt;
+                &lt;li&gt;Intel CPU systems&lt;/li&gt;
+                &lt;li&gt;AMD CPU systems&lt;/li&gt;
+            &lt;/ul&gt;
+
+            &lt;p&gt;The vertical scrollbar is adjustable, current width set to 10.&lt;/p&gt;</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/welcomeq/release_notes.qml" line="76"/>
+      <source>Back</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>usersq</name>
+    <message>
+      <location filename="../src/modules/usersq/usersq.qml" line="43"/>
+      <source>Pick your user name and credentials to login and perform admin tasks</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/usersq/usersq.qml" line="56"/>
+      <source>What is your name?</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/usersq/usersq.qml" line="63"/>
+      <source>Your Full Name</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/usersq/usersq.qml" line="80"/>
+      <source>What name do you want to use to log in?</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/usersq/usersq.qml" line="87"/>
+      <source>Login Name</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/usersq/usersq.qml" line="116"/>
+      <source>If more than one person will use this computer, you can create multiple accounts after installation.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/usersq/usersq.qml" line="129"/>
+      <source>Only lowercase letters, numbers, underscore and hyphen are allowed.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/usersq/usersq.qml" line="138"/>
+      <source>root is not allowed as username.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/usersq/usersq.qml" line="147"/>
+      <source>What is the name of this computer?</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/usersq/usersq.qml" line="153"/>
+      <source>Computer Name</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/usersq/usersq.qml" line="180"/>
+      <source>This name will be used if you make the computer visible to others on a network.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/usersq/usersq.qml" line="202"/>
+      <source>localhost is not allowed as hostname.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/usersq/usersq.qml" line="211"/>
+      <source>Choose a password to keep your account safe.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/usersq/usersq.qml" line="221"/>
+      <source>Password</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/usersq/usersq.qml" line="238"/>
+      <source>Repeat Password</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/usersq/usersq.qml" line="265"/>
+      <source>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.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/usersq/usersq.qml" line="410"/>
+      <source>Validate passwords quality</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/usersq/usersq.qml" line="420"/>
+      <source>When this box is checked, password-strength checking is done and you will not be able to use a weak password.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/usersq/usersq.qml" line="402"/>
+      <source>Log in automatically without asking for the password</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/usersq/usersq.qml" line="193"/>
+      <source>Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/usersq/usersq.qml" line="297"/>
+      <source>Reuse user password as root password</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/usersq/usersq.qml" line="305"/>
+      <source>Use the same password for the administrator account.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/usersq/usersq.qml" line="318"/>
+      <source>Choose a root password to keep your account safe.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/usersq/usersq.qml" line="328"/>
+      <source>Root Password</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/usersq/usersq.qml" line="346"/>
+      <source>Repeat Root Password</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/usersq/usersq.qml" line="372"/>
+      <source>Enter the same password twice, so that it can be checked for typing errors.</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>welcomeq</name>
+    <message>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="35"/>
+      <source>&lt;h3&gt;Welcome to the %1 &lt;quote&gt;%2&lt;/quote&gt; installer&lt;/h3&gt;
+            &lt;p&gt;This program will ask you some questions and set up %1 on your computer.&lt;/p&gt;</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="66"/>
+      <source>Support</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="77"/>
+      <source>Known issues</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="88"/>
+      <source>Release notes</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="100"/>
+      <source>Donate</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+</TS>
diff --git a/lang/calamares_vi.ts b/lang/calamares_vi.ts
index ec0ac362dae2e6121df16df3a12cbfe71931c400..ff92501fcea8b4cec41ed13ba0203277e21417be 100644
--- a/lang/calamares_vi.ts
+++ b/lang/calamares_vi.ts
@@ -156,7 +156,7 @@
       <translation>Cây công cụ</translation>
     </message>
     <message>
-      <location filename="../src/calamares/DebugWindow.cpp" line="239"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="244"/>
       <source>Debug information</source>
       <translation>Thông tin gỡ lỗi</translation>
     </message>
@@ -501,12 +501,12 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.<
   <context>
     <name>CalamaresWindow</name>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="369"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
       <source>%1 Setup Program</source>
       <translation>%1 Thiết lập chương trình</translation>
     </message>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="370"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
       <source>%1 Installer</source>
       <translation>%1 cài đặt hệ điều hành</translation>
     </message>
@@ -1451,7 +1451,7 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.<
     </message>
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="260"/>
-      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphraseor delete and create a new encrypted partition.</source>
+      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphrase or delete and create a new encrypted partition.</source>
       <translation type="unfinished"/>
     </message>
   </context>
@@ -4007,61 +4007,56 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.ui" line="140"/>
-      <source>&amp;About</source>
-      <translation>&amp;Giới thiệu</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="150"/>
       <source>Open donations website</source>
       <translation>Mở trang web ủng hộ</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="143"/>
       <source>&amp;Donate</source>
       <translation>Ủng &amp;hộ</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="163"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
       <source>Open help and support website</source>
       <translation>Mở trang web trợ giúp</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="156"/>
       <source>&amp;Support</source>
       <translation>&amp;Hỗ trợ</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="176"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
       <source>Open issues and bug-tracking website</source>
       <translation>Mở trang web theo dõi lỗi và vấn đề</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="169"/>
       <source>&amp;Known issues</source>
       <translation>&amp;Vấn đề đã biết</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="189"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
       <source>Open release notes website</source>
       <translation>Mở trang web ghi chú phát hành</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="192"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="182"/>
       <source>&amp;Release notes</source>
       <translation>&amp;Ghi chú phát hành</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="216"/>
+      <location filename="../src/modules/welcome/WelcomePage.cpp" line="212"/>
       <source>%1 support</source>
       <translation>Hỗ trợ %1</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="319"/>
       <source>About %1 setup</source>
       <translation>Về thiết lập %1</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="320"/>
       <source>About %1 installer</source>
       <translation>Về bộ cài đặt %1</translation>
     </message>
@@ -4127,19 +4122,16 @@ Output:
     </message>
   </context>
   <context>
-    <name>about</name>
+    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/modules/welcomeq/about.qml" line="79"/>
-      <source>Back</source>
-      <translation>Quay lại</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+      <source>About</source>
+      <translation>Giới thiệu</translation>
     </message>
-  </context>
-  <context>
-    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/calamares/calamares-sidebar.qml" line="79"/>
-      <source>Show debug information</source>
-      <translation>Hiện thông tin gỡ lỗi</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+      <source>Debug</source>
+      <translation type="unfinished"/>
     </message>
   </context>
   <context>
@@ -4500,26 +4492,21 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcomeq/welcomeq.qml" line="66"/>
-      <source>About</source>
-      <translation>Giới thiệu</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="80"/>
       <source>Support</source>
       <translation>Hỗ trợ</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="91"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="77"/>
       <source>Known issues</source>
       <translation>Các vấn đề đã biết</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="102"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="88"/>
       <source>Release notes</source>
       <translation>Ghi chú phát hành</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="114"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="100"/>
       <source>Donate</source>
       <translation>Ủng hộ</translation>
     </message>
diff --git a/lang/calamares_zh.ts b/lang/calamares_zh.ts
index 3f057c506c9371e8ba016ab7f793966c1cc193ca..71d060fd8efb61b48594feed543b99c7bc59a544 100644
--- a/lang/calamares_zh.ts
+++ b/lang/calamares_zh.ts
@@ -156,7 +156,7 @@
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/calamares/DebugWindow.cpp" line="239"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="244"/>
       <source>Debug information</source>
       <translation type="unfinished"/>
     </message>
@@ -499,12 +499,12 @@ The installer will quit and all changes will be lost.</source>
   <context>
     <name>CalamaresWindow</name>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="369"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
       <source>%1 Setup Program</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="370"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
       <source>%1 Installer</source>
       <translation type="unfinished"/>
     </message>
@@ -1449,7 +1449,7 @@ The installer will quit and all changes will be lost.</source>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="260"/>
-      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphraseor delete and create a new encrypted partition.</source>
+      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphrase or delete and create a new encrypted partition.</source>
       <translation type="unfinished"/>
     </message>
   </context>
@@ -3997,61 +3997,56 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.ui" line="140"/>
-      <source>&amp;About</source>
-      <translation type="unfinished"/>
-    </message>
-    <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="150"/>
       <source>Open donations website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="143"/>
       <source>&amp;Donate</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="163"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
       <source>Open help and support website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="156"/>
       <source>&amp;Support</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="176"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
       <source>Open issues and bug-tracking website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="169"/>
       <source>&amp;Known issues</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="189"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
       <source>Open release notes website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="192"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="182"/>
       <source>&amp;Release notes</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="216"/>
+      <location filename="../src/modules/welcome/WelcomePage.cpp" line="212"/>
       <source>%1 support</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="319"/>
       <source>About %1 setup</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="320"/>
       <source>About %1 installer</source>
       <translation type="unfinished"/>
     </message>
@@ -4117,18 +4112,15 @@ Output:
     </message>
   </context>
   <context>
-    <name>about</name>
+    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/modules/welcomeq/about.qml" line="79"/>
-      <source>Back</source>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+      <source>About</source>
       <translation type="unfinished"/>
     </message>
-  </context>
-  <context>
-    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/calamares/calamares-sidebar.qml" line="79"/>
-      <source>Show debug information</source>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+      <source>Debug</source>
       <translation type="unfinished"/>
     </message>
   </context>
@@ -4466,26 +4458,21 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcomeq/welcomeq.qml" line="66"/>
-      <source>About</source>
-      <translation type="unfinished"/>
-    </message>
-    <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="80"/>
       <source>Support</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="91"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="77"/>
       <source>Known issues</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="102"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="88"/>
       <source>Release notes</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="114"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="100"/>
       <source>Donate</source>
       <translation type="unfinished"/>
     </message>
diff --git a/lang/calamares_zh_CN.ts b/lang/calamares_zh_CN.ts
index cb88308c5f4e8fdb6eed4f3bab6b7305ce0767cf..f5b7a575db3252aec1a92aefb6aec860c7664351 100644
--- a/lang/calamares_zh_CN.ts
+++ b/lang/calamares_zh_CN.ts
@@ -157,7 +157,7 @@
       <translation>树形控件</translation>
     </message>
     <message>
-      <location filename="../src/calamares/DebugWindow.cpp" line="239"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="244"/>
       <source>Debug information</source>
       <translation>调试信息</translation>
     </message>
@@ -506,12 +506,12 @@ The installer will quit and all changes will be lost.</source>
   <context>
     <name>CalamaresWindow</name>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="369"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
       <source>%1 Setup Program</source>
       <translation>%1 安装程序</translation>
     </message>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="370"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
       <source>%1 Installer</source>
       <translation>%1 安装程序</translation>
     </message>
@@ -1459,7 +1459,7 @@ The installer will quit and all changes will be lost.</source>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="260"/>
-      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphraseor delete and create a new encrypted partition.</source>
+      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphrase or delete and create a new encrypted partition.</source>
       <translation type="unfinished"/>
     </message>
   </context>
@@ -4015,61 +4015,56 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.ui" line="140"/>
-      <source>&amp;About</source>
-      <translation>关于(&amp;A)</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="150"/>
       <source>Open donations website</source>
       <translation>打开捐赠信息网页</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="143"/>
       <source>&amp;Donate</source>
       <translation>捐赠(&amp;D)</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="163"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
       <source>Open help and support website</source>
       <translation>打开帮助和支持页面</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="156"/>
       <source>&amp;Support</source>
       <translation>支持信息(&amp;S)</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="176"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
       <source>Open issues and bug-tracking website</source>
       <translation>打开问题追踪网站</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="169"/>
       <source>&amp;Known issues</source>
       <translation>已知问题(&amp;K)</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="189"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
       <source>Open release notes website</source>
       <translation>打开发布日志网页</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="192"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="182"/>
       <source>&amp;Release notes</source>
       <translation>发行注记(&amp;R)</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="216"/>
+      <location filename="../src/modules/welcome/WelcomePage.cpp" line="212"/>
       <source>%1 support</source>
       <translation>%1 的支持信息</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="319"/>
       <source>About %1 setup</source>
       <translation>关于 %1 安装程序</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="320"/>
       <source>About %1 installer</source>
       <translation>关于 %1 安装程序</translation>
     </message>
@@ -4135,19 +4130,16 @@ Output:
     </message>
   </context>
   <context>
-    <name>about</name>
+    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/modules/welcomeq/about.qml" line="79"/>
-      <source>Back</source>
-      <translation>后退</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+      <source>About</source>
+      <translation>关于</translation>
     </message>
-  </context>
-  <context>
-    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/calamares/calamares-sidebar.qml" line="79"/>
-      <source>Show debug information</source>
-      <translation>显示调试信息</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+      <source>Debug</source>
+      <translation>调试</translation>
     </message>
   </context>
   <context>
@@ -4513,26 +4505,21 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcomeq/welcomeq.qml" line="66"/>
-      <source>About</source>
-      <translation>关于</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="80"/>
       <source>Support</source>
       <translation>支持</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="91"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="77"/>
       <source>Known issues</source>
       <translation>已知问题</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="102"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="88"/>
       <source>Release notes</source>
       <translation>发行说明</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="114"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="100"/>
       <source>Donate</source>
       <translation>捐赠</translation>
     </message>
diff --git a/lang/calamares_zh_HK.ts b/lang/calamares_zh_HK.ts
index 61a23d3f7d4c34b0b9213da7c8fb02c3f9e5e21e..57e63b41928ed5927f2a8e64ebb47ff8b887f6de 100644
--- a/lang/calamares_zh_HK.ts
+++ b/lang/calamares_zh_HK.ts
@@ -156,7 +156,7 @@
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/calamares/DebugWindow.cpp" line="239"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="244"/>
       <source>Debug information</source>
       <translation type="unfinished"/>
     </message>
@@ -499,12 +499,12 @@ The installer will quit and all changes will be lost.</source>
   <context>
     <name>CalamaresWindow</name>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="369"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
       <source>%1 Setup Program</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="370"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
       <source>%1 Installer</source>
       <translation type="unfinished"/>
     </message>
@@ -1449,7 +1449,7 @@ The installer will quit and all changes will be lost.</source>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="260"/>
-      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphraseor delete and create a new encrypted partition.</source>
+      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphrase or delete and create a new encrypted partition.</source>
       <translation type="unfinished"/>
     </message>
   </context>
@@ -3997,61 +3997,56 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.ui" line="140"/>
-      <source>&amp;About</source>
-      <translation type="unfinished"/>
-    </message>
-    <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="150"/>
       <source>Open donations website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="143"/>
       <source>&amp;Donate</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="163"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
       <source>Open help and support website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="156"/>
       <source>&amp;Support</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="176"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
       <source>Open issues and bug-tracking website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="169"/>
       <source>&amp;Known issues</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="189"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
       <source>Open release notes website</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="192"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="182"/>
       <source>&amp;Release notes</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="216"/>
+      <location filename="../src/modules/welcome/WelcomePage.cpp" line="212"/>
       <source>%1 support</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="319"/>
       <source>About %1 setup</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="320"/>
       <source>About %1 installer</source>
       <translation type="unfinished"/>
     </message>
@@ -4117,18 +4112,15 @@ Output:
     </message>
   </context>
   <context>
-    <name>about</name>
+    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/modules/welcomeq/about.qml" line="79"/>
-      <source>Back</source>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+      <source>About</source>
       <translation type="unfinished"/>
     </message>
-  </context>
-  <context>
-    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/calamares/calamares-sidebar.qml" line="79"/>
-      <source>Show debug information</source>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+      <source>Debug</source>
       <translation type="unfinished"/>
     </message>
   </context>
@@ -4466,26 +4458,21 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcomeq/welcomeq.qml" line="66"/>
-      <source>About</source>
-      <translation type="unfinished"/>
-    </message>
-    <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="80"/>
       <source>Support</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="91"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="77"/>
       <source>Known issues</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="102"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="88"/>
       <source>Release notes</source>
       <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="114"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="100"/>
       <source>Donate</source>
       <translation type="unfinished"/>
     </message>
diff --git a/lang/calamares_zh_TW.ts b/lang/calamares_zh_TW.ts
index 2a55f95fde510657b1330e2ee94b590c480291a4..e6d8a27f4a3a4be622ac7a8fdf5d5d387dc78c92 100644
--- a/lang/calamares_zh_TW.ts
+++ b/lang/calamares_zh_TW.ts
@@ -6,18 +6,18 @@
     <message>
       <location filename="../src/libcalamares/CalamaresAbout.cpp" line="17"/>
       <source>&lt;h1&gt;%1&lt;/h1&gt;&lt;br/&gt;&lt;strong&gt;%2&lt;br/&gt; for %3&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;</source>
-      <translation type="unfinished"/>
+      <translation>&lt;h1&gt;%1&lt;/h1&gt;&lt;br/&gt;&lt;strong&gt;%2&lt;br/&gt; for %3&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;</translation>
     </message>
     <message>
       <location filename="../src/libcalamares/CalamaresAbout.cpp" line="20"/>
       <source>Thanks to &lt;a href="https://calamares.io/team/"&gt;the Calamares team&lt;/a&gt; and the &lt;a href="https://www.transifex.com/calamares/calamares/"&gt;Calamares translators team&lt;/a&gt;.&lt;br/&gt;&lt;br/&gt;&lt;a href="https://calamares.io/"&gt;Calamares&lt;/a&gt; development is sponsored by &lt;br/&gt;&lt;a href="http://www.blue-systems.com/"&gt;Blue Systems&lt;/a&gt; - Liberating Software.</source>
-      <translation type="unfinished"/>
+      <translation>感謝 &lt;a href="https://calamares.io/team/"&gt;Calamares 團隊&lt;/a&gt;與 &lt;a href="https://www.transifex.com/calamares/calamares/"&gt;Calamares 翻譯者團隊&lt;/a&gt;。&lt;br/&gt;&lt;br/&gt;&lt;a href="https://calamares.io/"&gt;Calamares&lt;/a&gt; 的開發由 &lt;br/&gt;&lt;a href="http://www.blue-systems.com/"&gt;Blue Systems&lt;/a&gt; - Liberating Software 贊助。</translation>
     </message>
     <message>
       <location filename="../src/libcalamares/CalamaresAbout.cpp" line="38"/>
       <source>Copyright %1-%2 %3 &amp;lt;%4&amp;gt;&lt;br/&gt;</source>
       <extracomment>Copyright year-year Name &lt;email-address&gt;</extracomment>
-      <translation type="unfinished"/>
+      <translation>Copyright %1-%2 %3 &amp;lt;%4&amp;gt;&lt;br/&gt;</translation>
     </message>
   </context>
   <context>
@@ -156,7 +156,7 @@
       <translation>小工具樹</translation>
     </message>
     <message>
-      <location filename="../src/calamares/DebugWindow.cpp" line="239"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="244"/>
       <source>Debug information</source>
       <translation>除錯資訊</translation>
     </message>
@@ -505,12 +505,12 @@ The installer will quit and all changes will be lost.</source>
   <context>
     <name>CalamaresWindow</name>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="369"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="392"/>
       <source>%1 Setup Program</source>
       <translation>%1 設定程式</translation>
     </message>
     <message>
-      <location filename="../src/calamares/CalamaresWindow.cpp" line="370"/>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="393"/>
       <source>%1 Installer</source>
       <translation>%1 安裝程式</translation>
     </message>
@@ -1451,12 +1451,12 @@ The installer will quit and all changes will be lost.</source>
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="259"/>
       <source>Passphrase for existing partition</source>
-      <translation type="unfinished"/>
+      <translation>既有分割區的密碼</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="260"/>
-      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphraseor delete and create a new encrypted partition.</source>
-      <translation type="unfinished"/>
+      <source>Partition %1 could not be decrypted with the given passphrase.&lt;br/&gt;&lt;br/&gt;Edit the partition again and give the correct passphrase or delete and create a new encrypted partition.</source>
+      <translation>分割區 %1 無法使用給予的密碼解密。&lt;br/&gt;&lt;br/&gt;再次編輯分割區並給予正確的密碼或刪除並建立新的加密分割區。</translation>
     </message>
   </context>
   <context>
@@ -4011,61 +4011,56 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.ui" line="140"/>
-      <source>&amp;About</source>
-      <translation>關於(&amp;A)</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="150"/>
       <source>Open donations website</source>
       <translation>開啟捐款網頁</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="143"/>
       <source>&amp;Donate</source>
       <translation>捐款(&amp;D)</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="163"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
       <source>Open help and support website</source>
       <translation>開啟說明與支援網頁</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="156"/>
       <source>&amp;Support</source>
       <translation>支援(&amp;S)</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="176"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
       <source>Open issues and bug-tracking website</source>
       <translation>開啟問題與錯誤追蹤網頁</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="169"/>
       <source>&amp;Known issues</source>
       <translation>已知問題(&amp;K)</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="189"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
       <source>Open release notes website</source>
       <translation>開啟發行記事網站</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.ui" line="192"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="182"/>
       <source>&amp;Release notes</source>
       <translation>發行註記(&amp;R)</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="216"/>
+      <location filename="../src/modules/welcome/WelcomePage.cpp" line="212"/>
       <source>%1 support</source>
       <translation>%1 支援</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="319"/>
       <source>About %1 setup</source>
       <translation>關於 %1 安裝程式</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <location filename="../src/calamares/DebugWindow.cpp" line="320"/>
       <source>About %1 installer</source>
       <translation>關於 %1 安裝程式</translation>
     </message>
@@ -4131,19 +4126,16 @@ Output:
     </message>
   </context>
   <context>
-    <name>about</name>
+    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/modules/welcomeq/about.qml" line="79"/>
-      <source>Back</source>
-      <translation>返回</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="89"/>
+      <source>About</source>
+      <translation>關於</translation>
     </message>
-  </context>
-  <context>
-    <name>calamares-sidebar</name>
     <message>
-      <location filename="../src/calamares/calamares-sidebar.qml" line="79"/>
-      <source>Show debug information</source>
-      <translation>顯示除錯資訊</translation>
+      <location filename="../src/calamares/calamares-sidebar.qml" line="115"/>
+      <source>Debug</source>
+      <translation>Debug</translation>
     </message>
   </context>
   <context>
@@ -4508,26 +4500,21 @@ Output:
     </message>
     <message>
       <location filename="../src/modules/welcomeq/welcomeq.qml" line="66"/>
-      <source>About</source>
-      <translation>關於</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="80"/>
       <source>Support</source>
       <translation>支援</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="91"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="77"/>
       <source>Known issues</source>
       <translation>已知問題</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="102"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="88"/>
       <source>Release notes</source>
       <translation>發行記事</translation>
     </message>
     <message>
-      <location filename="../src/modules/welcomeq/welcomeq.qml" line="114"/>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="100"/>
       <source>Donate</source>
       <translation>捐助</translation>
     </message>
diff --git a/lang/python.pot b/lang/python.pot
index 2d16bb38d089f65377ae0a906ba39b7168bd08e3..7321113a2bba20ef760e75130299de47c0db100b 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 <EMAIL@ADDRESS>, YEAR.
-#
+# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -12,35 +12,35 @@ msgstr ""
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\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 <pre>{!s}</pre> to use."
-msgstr ""
+msgstr "No partitions are defined for <pre>{!s}</pre> 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 ""
 "<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
 msgstr ""
+"<code>systemctl {arg!s}</code> 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 <code>{name!s}</code>."
-msgstr ""
+msgstr "Cannot enable systemd service <code>{name!s}</code>."
 
 #: src/modules/services-systemd/main.py:65
 msgid "Cannot enable systemd target <code>{name!s}</code>."
-msgstr ""
+msgstr "Cannot enable systemd target <code>{name!s}</code>."
 
 #: src/modules/services-systemd/main.py:67
 msgid "Cannot enable systemd timer <code>{name!s}</code>."
-msgstr ""
+msgstr "Cannot enable systemd timer <code>{name!s}</code>."
 
 #: src/modules/services-systemd/main.py:71
 msgid "Cannot disable systemd target <code>{name!s}</code>."
-msgstr ""
+msgstr "Cannot disable systemd target <code>{name!s}</code>."
 
 #: src/modules/services-systemd/main.py:73
 msgid "Cannot mask systemd unit <code>{name!s}</code>."
-msgstr ""
+msgstr "Cannot mask systemd unit <code>{name!s}</code>."
 
 #: src/modules/services-systemd/main.py:75
 msgid ""
-"Unknown systemd commands <code>{command!s}</code> and <code>{suffix!s}</"
-"code> for unit {name!s}."
+"Unknown systemd commands <code>{command!s}</code> and "
+"<code>{suffix!s}</code> for unit {name!s}."
 msgstr ""
+"Unknown systemd commands <code>{command!s}</code> and "
+"<code>{suffix!s}</code> 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 <pre>{!s}</pre> to use."
-msgstr ""
+msgstr "No root mount point is given for <pre>{!s}</pre> 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 <code>{arg!s}</code> for service {name!s} in run-"
 "level {level!s}."
 msgstr ""
+"Unknown service-action <code>{arg!s}</code> for service {name!s} in run-"
+"level {level!s}."
 
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "<code>rc-update {arg!s}</code> call in chroot returned error code {num!s}."
 msgstr ""
+"<code>rc-update {arg!s}</code> 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 <code>{path!s}</code>, which does not "
 "exist."
 msgstr ""
+"The path for runlevel {level!s} is <code>{path!s}</code>, 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 <code>{path!s}</code>, which does not exist."
+"The path for service {name!s} is <code>{path!s}</code>, which does not "
+"exist."
 msgstr ""
+"The path for service {name!s} is <code>{path!s}</code>, 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 <pre>{!s}</pre> "
 "returned error code {!s}."
 msgstr ""
+"The package manager could not prepare updates. The command <pre>{!s}</pre> "
+"returned error code {!s}."
 
 #: src/modules/packages/main.py:738
 msgid ""
-"The package manager could not update the system. The command <pre>{!s}</pre> "
-"returned error code {!s}."
+"The package manager could not update the system. The command <pre>{!s}</pre>"
+" returned error code {!s}."
 msgstr ""
+"The package manager could not update the system. The command <pre>{!s}</pre>"
+" returned error code {!s}."
 
 #: src/modules/packages/main.py:766
 msgid ""
 "The package manager could not make changes to the installed system. The "
 "command <pre>{!s}</pre> returned error code {!s}."
 msgstr ""
+"The package manager could not make changes to the installed system. The "
+"command <pre>{!s}</pre> 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 <pre>{!s}</"
-"pre> returned error code {!s}."
+"The bootloader could not be installed. The installation command "
+"<pre>{!s}</pre> returned error code {!s}."
 msgstr ""
+"The bootloader could not be installed. The installation command "
+"<pre>{!s}</pre> 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 <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
-msgstr ""
+msgstr "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> 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 81b71f3a727e5456fd64aaa7017056e994e12d40..552481820abb035b382d392814ccf5e3f47ff95e 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/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr ""
 
-#: 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/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "جاري تركيب الأقسام"
 
-#: 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 <pre>{!s}</pre> "
-"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 <pre>{!s}</pre>"
-" 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 <pre>{!s}</pre> 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 <pre>{!s}</pre> to use."
+#: 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 <pre>{!s}</pre> to use."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
 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
-msgid "No partitions are defined for <pre>{!s}</pre> to use."
+#: 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 ""
+"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target <code>{name!s}</code>."
 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:67
+msgid "Cannot enable systemd timer <code>{name!s}</code>."
+msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target <code>{name!s}</code>."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit <code>{name!s}</code>."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands <code>{command!s}</code> and "
+"<code>{suffix!s}</code> for unit {name!s}."
 msgstr ""
 
 #: src/modules/unpackfs/main.py:34
@@ -187,112 +171,72 @@ 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 ""
-"<code>systemctl {arg!s}</code> 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 <code>{name!s}</code>."
-msgstr ""
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "فشلت كتابة ملف ضبط KDM."
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target <code>{name!s}</code>."
-msgstr ""
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "ملف ضبط KDM {!s} غير موجود"
 
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer <code>{name!s}</code>."
-msgstr ""
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "فشلت كتابة ملف ضبط LXDM."
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target <code>{name!s}</code>."
-msgstr ""
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "ملف ضبط LXDM {!s} غير موجود"
 
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit <code>{name!s}</code>."
-msgstr ""
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "فشلت كتابة ملف ضبط LightDM."
 
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands <code>{command!s}</code> and "
-"<code>{suffix!s}</code> for unit {name!s}."
-msgstr ""
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "ملف ضبط LightDM {!s} غير موجود"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "عملية بايثون دميه"
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "فشل ضبط LightDM"
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "عملية  دميه خطوه بايثون {}"
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr "لم يتم تصيب LightDM"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "تثبيت محمل الإقلاع"
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "فشلت كتابة ملف ضبط SLIM."
 
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "ملف ضبط SLIM {!s} غير موجود"
 
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/bootloader/main.py:783
+#: src/modules/displaymanager/main.py:993
 msgid ""
-"The bootloader could not be installed. The installation command "
-"<pre>{!s}</pre> 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"
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr ""
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr "إعداد مدير العرض لم يكتمل"
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
+#: 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 <pre>{!s}</pre> to use."
 msgstr ""
 
-#: src/modules/fstab/main.py:429
-msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
 
 #: src/modules/services-openrc/main.py:29
@@ -338,80 +282,136 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: 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/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command <pre>{!s}</pre> "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "فشلت كتابة ملف ضبط KDM."
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command <pre>{!s}</pre>"
+" returned error code {!s}."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "ملف ضبط KDM {!s} غير موجود"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command <pre>{!s}</pre> returned error code {!s}."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "فشلت كتابة ملف ضبط LXDM."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "تثبيت محمل الإقلاع"
 
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "ملف ضبط LXDM {!s} غير موجود"
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
 
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "فشلت كتابة ملف ضبط LightDM."
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
 
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "ملف ضبط LightDM {!s} غير موجود"
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"<pre>{!s}</pre> returned error code {!s}."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "فشل ضبط LightDM"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "جاري إعداد ساعة الهاردوير"
 
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr "لم يتم تصيب LightDM"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "فشلت كتابة ملف ضبط SLIM."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr ""
 
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "ملف ضبط SLIM {!s} غير موجود"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "كود الخروج كان {}"
 
-#: src/modules/displaymanager/main.py:992
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:993
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:1075
-msgid "Display manager configuration was incomplete"
-msgstr "إعداد مدير العرض لم يكتمل"
-
 #: src/modules/initramfscfg/main.py:32
 msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "جاري إعداد ساعة الهاردوير"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
 msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> 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 ae079b699181007a0ca3acf8def43b713b932b1f..e66d7b52da48b0d8e7ccf217bc823993b892c69a 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 <deep.choudhury@libresoft.in>, 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/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/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "GRUB কনফিগাৰ কৰক।"
 
-#: 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/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "বিভাজন মাউন্ট্ কৰা।"
 
-#: 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 <pre>{!s}</pre> "
-"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 <pre>{!s}</pre>"
-" 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 <pre>{!s}</pre> 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 <pre>{!s}</pre> to use."
-msgstr "ব্যৱহাৰৰ বাবে <pre>{!s}</pre>ৰ কোনো মাউন্ট্ পাইন্ট্ দিয়া হোৱা নাই।"
-
-#: 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 <pre>{!s}</pre> to use."
 msgstr "<pre>{!s}</pre>ৰ ব্যৱহাৰৰ বাবে কোনো বিভাজনৰ বৰ্ণনা দিয়া হোৱা নাই।"
 
-#: 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 ""
+"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
+msgstr "chrootত systemctl <code>{arg!s}</code>ৰ call ক্ৰুটি কোড {num!s}।"
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service <code>{name!s}</code>."
+msgstr "systemd সেৱা <code>{name!s}</code> সক্ৰিয় কৰিব নোৱাৰি।"
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target <code>{name!s}</code>."
+msgstr "systemd গন্তব্য স্থান <code>{name!s}</code> সক্ৰিয় কৰিব নোৱাৰি।"
+
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer <code>{name!s}</code>."
 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 <code>{name!s}</code>."
+msgstr "systemd গন্তব্য স্থান <code>{name!s}</code> নিষ্ক্ৰিয় কৰিব নোৱাৰি।"
 
-#: 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 <code>{name!s}</code>."
+msgstr "systemd একক <code>{name!s}</code> মাস্ক্ কৰিব নোৱাৰি।"
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands <code>{command!s}</code> and "
+"<code>{suffix!s}</code> for unit {name!s}."
+msgstr ""
+"একক {name!s}ৰ বাবে <code>{command!s}</code> আৰু <code>{suffix!s}</code> "
+"অজ্ঞাত systemd কমাণ্ড্।"
 
 #: src/modules/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -178,115 +172,73 @@ 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 ""
-"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
-msgstr "chrootত systemctl <code>{arg!s}</code>ৰ call ক্ৰুটি কোড {num!s}।"
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service <code>{name!s}</code>."
-msgstr "systemd সেৱা <code>{name!s}</code> সক্ৰিয় কৰিব নোৱাৰি।"
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "KDM কনফিগাৰেচন ফাইলত লিখিব নোৱাৰি"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target <code>{name!s}</code>."
-msgstr "systemd গন্তব্য স্থান <code>{name!s}</code> সক্ৰিয় কৰিব নোৱাৰি।"
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "KDM কনফিগ্ ফাইল {!s} উপস্থিত নাই"
 
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer <code>{name!s}</code>."
-msgstr ""
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "LXDM কনফিগাৰেচন ফাইলত লিখিব নোৱাৰি"
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target <code>{name!s}</code>."
-msgstr "systemd গন্তব্য স্থান <code>{name!s}</code> নিষ্ক্ৰিয় কৰিব নোৱাৰি।"
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "LXDM কনফিগ্ ফাইল {!s} উপস্থিত নাই"
 
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit <code>{name!s}</code>."
-msgstr "systemd একক <code>{name!s}</code> মাস্ক্ কৰিব নোৱাৰি।"
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "LightDM কনফিগাৰেচন ফাইলত লিখিব নোৱাৰি"
 
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands <code>{command!s}</code> and "
-"<code>{suffix!s}</code> for unit {name!s}."
-msgstr ""
-"একক {name!s}ৰ বাবে <code>{command!s}</code> আৰু <code>{suffix!s}</code> "
-"অজ্ঞাত systemd কমাণ্ড্।"
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "LightDM কনফিগ্ ফাইল {!s} উপস্থিত নাই"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "ডামী Pythonৰ কায্য"
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "LightDM কনফিগাৰ কৰিব নোৱাৰি"
 
-#: 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/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr "কোনো LightDM স্ৱাগতকৰ্তা ইন্স্তল নাই।"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "বুতলোডাৰ ইন্স্তল কৰক।"
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "SLIM কনফিগাৰেচন ফাইলত লিখিব নোৱাৰি"
 
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "SLIM কনফিগ্ ফাইল {!s} উপস্থিত নাই"
 
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr "displaymanager মডিউলৰ বাবে কোনো ডিস্প্লে প্ৰবন্ধক নাই।"
 
-#: src/modules/bootloader/main.py:783
+#: src/modules/displaymanager/main.py:993
 msgid ""
-"The bootloader could not be installed. The installation command "
-"<pre>{!s}</pre> 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"
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr ""
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr "ডিস্প্লে প্ৰবন্ধক কন্ফিগাৰেচন অসমাপ্ত"
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Plymouth theme কন্ফিগাৰ কৰি আছে।​"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "mkinitcpio কনফিগাৰ কৰি আছে।"
 
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr "fstab লিখি আছে।"
+#: 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 <pre>{!s}</pre> to use."
+msgstr "ব্যৱহাৰৰ বাবে <pre>{!s}</pre>ৰ কোনো মাউন্ট্ পাইন্ট্ দিয়া হোৱা নাই।"
 
-#: src/modules/fstab/main.py:429
-msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
-msgstr ""
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "ডাটা ইন্স্তল কৰি আছে।"
 
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
@@ -334,80 +286,128 @@ msgid ""
 "exist."
 msgstr "{name!s}ৰ বাবে পথ হ'ল <code>{path!s}</code> যিটো উপস্থিত নাই।"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "dracutৰ সৈতে initramfs বনাই আছে।"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Plymouth theme কন্ফিগাৰ কৰি আছে।​"
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "গন্তব্য স্থানত dracut চলোৱাত বিফল হ'ল"
+#: 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/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "KDM কনফিগাৰেচন ফাইলত লিখিব নোৱাৰি"
+#: 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/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "KDM কনফিগ্ ফাইল {!s} উপস্থিত নাই"
+#: 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/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "LXDM কনফিগাৰেচন ফাইলত লিখিব নোৱাৰি"
+#: 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/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "LXDM কনফিগ্ ফাইল {!s} উপস্থিত নাই"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command <pre>{!s}</pre> "
+"returned error code {!s}."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "LightDM কনফিগাৰেচন ফাইলত লিখিব নোৱাৰি"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command <pre>{!s}</pre>"
+" returned error code {!s}."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "LightDM কনফিগ্ ফাইল {!s} উপস্থিত নাই"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command <pre>{!s}</pre> returned error code {!s}."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "LightDM কনফিগাৰ কৰিব নোৱাৰি"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "বুতলোডাৰ ইন্স্তল কৰক।"
 
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr "কোনো LightDM স্ৱাগতকৰ্তা ইন্স্তল নাই।"
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
 
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "SLIM কনফিগাৰেচন ফাইলত লিখিব নোৱাৰি"
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
 
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "SLIM কনফিগ্ ফাইল {!s} উপস্থিত নাই"
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"<pre>{!s}</pre> returned error code {!s}."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:992
-msgid "No display managers selected for the displaymanager module."
-msgstr "displaymanager মডিউলৰ বাবে কোনো ডিস্প্লে প্ৰবন্ধক নাই।"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "হাৰ্ডৱেৰৰ ঘড়ী চেত্ কৰি আছে।"
 
-#: src/modules/displaymanager/main.py:993
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:1075
-msgid "Display manager configuration was incomplete"
-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/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "হাৰ্ডৱেৰৰ ঘড়ী চেত্ কৰি আছে।"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "OpenRC dmcrypt সেৱা কন্ফিগাৰ কৰি আছে।"
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "ডাটা ইন্স্তল কৰি আছে।"
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr "fstab লিখি আছে।"
+
+#: src/modules/fstab/main.py:429
+msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> 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 6e07d8ffe901a3451ce462aef3031b06e6306660..44961d9097b68ad2169a223b39e62ce8fd97084e 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 <enolp@softastur.org>, 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/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr ""
 
-#: 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 ""
 
-#: 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/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr ""
 
-#: 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/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr ""
 
-#: 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 <pre>{!s}</pre> "
-"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 <pre>{!s}</pre>"
-" returned error code {!s}."
+#: 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/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command <pre>{!s}</pre> returned error code {!s}."
+#: 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 <pre>{!s}</pre> to use."
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
 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/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
-msgid "Configuration Error"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 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 <pre>{!s}</pre> to use."
+#: 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 ""
+"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Configurando mkinitcpio."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service <code>{name!s}</code>."
+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
-msgid "No partitions are defined for <pre>{!s}</pre> to use."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target <code>{name!s}</code>."
 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:73
+msgid "Cannot mask systemd unit <code>{name!s}</code>."
+msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Configurando'l serviciu dmcrypt d'OpenRC."
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands <code>{command!s}</code> and "
+"<code>{suffix!s}</code> for unit {name!s}."
+msgstr ""
 
 #: src/modules/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -178,113 +170,73 @@ 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 ""
-"<code>systemctl {arg!s}</code> 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 <code>{name!s}</code>."
-msgstr ""
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "Nun pue escribise'l ficheru de configuración de KDM"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target <code>{name!s}</code>."
-msgstr ""
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "Nun esiste'l ficheru de configuración de KDM {!s}"
 
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer <code>{name!s}</code>."
-msgstr ""
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "Nun pue escribise'l ficheru de configuración de LXDM"
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target <code>{name!s}</code>."
-msgstr ""
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "Nun esiste'l ficheru de configuración de LXDM {!s}"
 
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit <code>{name!s}</code>."
-msgstr ""
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "Nun pue escribise'l ficheru de configuración de LightDM"
 
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands <code>{command!s}</code> and "
-"<code>{suffix!s}</code> for unit {name!s}."
-msgstr ""
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "Nun esiste'l ficheru de configuración de LightDM {!s}"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Trabayu maniquín en Python."
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "Nun pue configurase LightDM"
 
-#: 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/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr "Nun s'instaló nengún saludador de LightDM."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Instalando'l xestor d'arrinque."
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "Nun pue escribise'l ficheru de configuración de SLIM"
 
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "Nun esiste'l ficheru de configuración de SLIM {!s}"
 
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr "Nun s'esbillaron xestores de pantalles pal módulu displaymanager."
 
-#: src/modules/bootloader/main.py:783
+#: src/modules/displaymanager/main.py:993
 msgid ""
-"The bootloader could not be installed. The installation command "
-"<pre>{!s}</pre> 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"
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr ""
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr "La configuración del xestor de pantalles nun se completó"
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Configurando mkinitcpio."
 
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
+#: 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 <pre>{!s}</pre> to use."
 msgstr ""
 
-#: src/modules/fstab/main.py:429
-msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> 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"
@@ -330,80 +282,128 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 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/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/grubcfg/main.py:28
-msgid "Configure 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/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/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "Nun pue escribise'l ficheru de configuración de KDM"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command <pre>{!s}</pre> "
+"returned error code {!s}."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "Nun esiste'l ficheru de configuración de KDM {!s}"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command <pre>{!s}</pre>"
+" returned error code {!s}."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "Nun pue escribise'l ficheru de configuración de LXDM"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command <pre>{!s}</pre> returned error code {!s}."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "Nun esiste'l ficheru de configuración de LXDM {!s}"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Instalando'l xestor d'arrinque."
 
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "Nun pue escribise'l ficheru de configuración de LightDM"
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
 
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "Nun esiste'l ficheru de configuración de LightDM {!s}"
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
 
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "Nun pue configurase LightDM"
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"<pre>{!s}</pre> returned error code {!s}."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr "Nun s'instaló nengún saludador de LightDM."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Configurando'l reló de hardware."
 
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "Nun pue escribise'l ficheru de configuración de SLIM"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "Nun esiste'l ficheru de configuración de SLIM {!s}"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr ""
 
-#: src/modules/displaymanager/main.py:992
-msgid "No display managers selected for the displaymanager module."
-msgstr "Nun s'esbillaron xestores de pantalles pal módulu displaymanager."
+#: 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/displaymanager/main.py:993
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:1075
-msgid "Display manager configuration was incomplete"
-msgstr "La configuración del xestor de pantalles nun se completó"
+#: 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/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Configurando'l reló de hardware."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Configurando'l serviciu dmcrypt d'OpenRC."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Instalando datos."
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> 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 6bf1d5ea2e058c9fe521490c0429e5194822ab91..cc41fb5a644259f18404a002ebbef80f2f2cfb05 100644
--- a/lang/python/az/LC_MESSAGES/python.po
+++ b/lang/python/az/LC_MESSAGES/python.po
@@ -4,16 +4,16 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 # Translators:
-# Kheyyam Gojayev <xxmn77@gmail.com>, 2022
+# Xəyyam Qocayev <xxmn77@gmail.com>, 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 <xxmn77@gmail.com>, 2022\n"
+"Last-Translator: Xəyyam Qocayev <xxmn77@gmail.com>, 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/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/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "GRUB tənzimləmələri"
 
-#: 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:42
+msgid "Mounting partitions."
+msgstr "Disk bölmələri qoşulur."
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command <pre>{!s}</pre> "
-"returned error code {!s}."
-msgstr ""
-"Bu paket meneceri yenilənmələri hazırlaya bilmədi. <pre>{!s}</pre> əmri xəta"
-" kodu {!s} ilə cavab verdi."
+#: 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:738
-msgid ""
-"The package manager could not update the system. The command <pre>{!s}</pre>"
-" returned error code {!s}."
-msgstr ""
-"Paket meneceri sistemi yeniləyə bimədi. <pre>{!s}</pre> əmri xəta kodu {!s} "
-"ilə cavab verdi."
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr "Zpool idxalı baş tutmadı"
 
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command <pre>{!s}</pre> returned error code {!s}."
-msgstr ""
-"Paket meneceri dəyişiklikləri sistemə tətbiq edə bilmədi. <pre>{!s}</pre> "
-"əmri xəta kodu {!s} ilə cavab verdi."
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr "Zpool kiliddən çıxarıla bilmədi"
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Şəbəkə ayarları saxlanılır."
+#: 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/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 <pre>{!s}</pre> to use."
+#: 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 <pre>{!s}</pre> to use."
+msgstr "<pre>{!s}</pre> istifadə etmək üçün bölmələr təyin edilməyib"
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr "zfs qoşulmasında xəta"
+
+#: 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 ""
+"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
 msgstr ""
-"<pre>{!s}</pre> istifadə etmək üçün kök qoşulma nöqtəsi təyin edilməyib."
+"<code>systemctl {arg!s}</code> chroot çağırışına xəta kodu ilə cavab verdi "
+"{num!s}."
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "mkinitcpio tənzimlənir."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service <code>{name!s}</code>."
+msgstr "<code>{name!s}</code> systemd xidməti aktiv edilmədi."
 
-#: 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
-msgid "No partitions are defined for <pre>{!s}</pre> to use."
-msgstr "<pre>{!s}</pre> istifadə etmək üçün bölmələr təyin edilməyib"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target <code>{name!s}</code>."
+msgstr "<code>{name!s}</code> systemd hədəfi aktiv edilmədi"
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "mkinitfs ilə initramfs yaradılır"
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer <code>{name!s}</code>."
+msgstr "<code>{name!s}</code> systemd taymeri aktiv edilə bilmir."
 
-#: 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:71
+msgid "Cannot disable systemd target <code>{name!s}</code>."
+msgstr "<code>{name!s}</code> systemd hədfi sönsürülmədi."
 
-#: 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:73
+msgid "Cannot mask systemd unit <code>{name!s}</code>."
+msgstr "<code>{name!s}</code> systemd vahidi maskalanmır."
 
-#: 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:75
+msgid ""
+"Unknown systemd commands <code>{command!s}</code> and "
+"<code>{suffix!s}</code> for unit {name!s}."
+msgstr ""
+"Naməlum systemd əmrləri <code>{command!s}</code> və <code>{suffix!s}</code> "
+"{name!s} vahidi üçün."
 
 #: src/modules/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -188,121 +177,76 @@ 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 ""
-"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
-msgstr ""
-"<code>systemctl {arg!s}</code> 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 <code>{name!s}</code>."
-msgstr "<code>{name!s}</code> systemd xidməti aktiv edilmədi."
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "KDM tənzimləmə faylı yazıla bilmir"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target <code>{name!s}</code>."
-msgstr "<code>{name!s}</code> systemd hədəfi aktiv edilmədi"
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "KDM tənzimləmə faylı {!s} mövcud deyil"
 
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer <code>{name!s}</code>."
-msgstr "<code>{name!s}</code> systemd taymeri aktiv edilə bilmir."
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "LXDM tənzimləmə faylı yazıla bilmir"
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target <code>{name!s}</code>."
-msgstr "<code>{name!s}</code> systemd hədfi sönsürülmədi."
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "LXDM tənzimləmə faylı {!s} mövcud deyil"
 
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit <code>{name!s}</code>."
-msgstr "<code>{name!s}</code> systemd vahidi maskalanmır."
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "LightDM tənzimləmə faylı yazıla bilmir"
 
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands <code>{command!s}</code> and "
-"<code>{suffix!s}</code> for unit {name!s}."
-msgstr ""
-"Naməlum systemd əmrləri <code>{command!s}</code> və <code>{suffix!s}</code> "
-"{name!s} vahidi üçün."
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "LightDM tənzimləmə faylı {!s} mövcud deyil"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Dummy python işi."
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "LightDM tənzimlənə bilmir"
 
-#: 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/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr "LightDM qarşılama quraşdırılmayıb."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Önyükləyici qurulur."
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "SLİM tənzimləmə faylı yazıla bilmir"
 
-#: 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/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "SLİM tənzimləmə faylı {!s} mövcud deyil"
 
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr "Önyükləyicinin quraşdırılmasında xəta"
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr "displaymanager modulu üçün ekran menecerləri seçilməyib."
 
-#: src/modules/bootloader/main.py:783
+#: src/modules/displaymanager/main.py:993
 msgid ""
-"The bootloader could not be installed. The installation command "
-"<pre>{!s}</pre> returned error code {!s}."
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
-"Önyükləyici quraşdırıla bilmədi. Quraşdırma əmri <pre>{!s}</pre>, 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"
+"Ekran menecerləri siyahısı həm qlobal yaddaşda, həm də displaymanager.conf-"
+"da boşdur və ya təyin olunmamışdır."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Plymouth mövzusu tənzimlənməsi"
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr "Ekran meneceri tənzimləmələri başa çatmadı"
 
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr "fstab yazılır."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "mkinitcpio tənzimlənir."
 
-#: src/modules/fstab/main.py:429
-msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
+#: 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 <pre>{!s}</pre> to use."
 msgstr ""
-"İstifadə etmək üçün, <pre>{!s}</pre> tənzimləməsi, <pre>{!s}</pre> üçün "
-"göstərilməyib."
+"<pre>{!s}</pre> 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"
@@ -352,82 +296,138 @@ msgid ""
 "exist."
 msgstr "{name!s} üçün <code>{path!s}</code> 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/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Plymouth mövzusu tənzimlənməsi"
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "KDM tənzimləmə faylı yazıla bilmir"
+#: 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/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "KDM tənzimləmə faylı {!s} mövcud deyil"
+#: 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/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "LXDM tənzimləmə faylı yazıla bilmir"
+#: 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/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "LXDM tənzimləmə faylı {!s} mövcud deyil"
+#: 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/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "LightDM tənzimləmə faylı yazıla bilmir"
+#: 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/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "LightDM tənzimləmə faylı {!s} mövcud deyil"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command <pre>{!s}</pre> "
+"returned error code {!s}."
+msgstr ""
+"Bu paket meneceri yenilənmələri hazırlaya bilmədi. <pre>{!s}</pre> əmri xəta"
+" kodu {!s} ilə cavab verdi."
 
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "LightDM tənzimlənə bilmir"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command <pre>{!s}</pre>"
+" returned error code {!s}."
+msgstr ""
+"Paket meneceri sistemi yeniləyə bimədi. <pre>{!s}</pre> əmri xəta kodu {!s} "
+"ilə cavab verdi."
 
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr "LightDM qarşılama quraşdırılmayıb."
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command <pre>{!s}</pre> returned error code {!s}."
+msgstr ""
+"Paket meneceri dəyişiklikləri sistemə tətbiq edə bilmədi. <pre>{!s}</pre> "
+"əmri xəta kodu {!s} ilə cavab verdi."
 
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "SLİM tənzimləmə faylı yazıla bilmir"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Önyükləyici qurulur."
 
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "SLİM tənzimləmə faylı {!s} mövcud deyil"
+#: 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/displaymanager/main.py:992
-msgid "No display managers selected for the displaymanager module."
-msgstr "displaymanager modulu üçün ekran menecerləri seçilməyib."
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr "Önyükləyicinin quraşdırılmasında xəta"
 
-#: src/modules/displaymanager/main.py:993
+#: src/modules/bootloader/main.py:783
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"The bootloader could not be installed. The installation command "
+"<pre>{!s}</pre> returned error code {!s}."
 msgstr ""
-"Ekran menecerləri siyahısı həm qlobal yaddaşda, həm də displaymanager.conf-"
-"da boşdur və ya təyin olunmamışdır."
+"Önyükləyici quraşdırıla bilmədi. Quraşdırma əmri <pre>{!s}</pre>, xəta kodu "
+"{!s} ilə cavab verdi."
 
-#: src/modules/displaymanager/main.py:1075
-msgid "Display manager configuration was incomplete"
-msgstr "Ekran meneceri tənzimləmələri başa çatmadı"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Aparat saatını ayarlamaq."
+
+#: 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/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Aparat saatını ayarlamaq."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "OpenRC dmcrypt xidməti tənzimlənir."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Quraşdırılma tarixi."
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr "fstab yazılır."
+
+#: src/modules/fstab/main.py:429
+msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
+msgstr ""
+"İstifadə etmək üçün, <pre>{!s}</pre> tənzimləməsi, <pre>{!s}</pre> üçü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 63f150d45e68d75b5fe4d22181ed577070fb833f..1b344df5f12ade314c2d696c89fc4ef74c9ebd5f 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 <EMAIL@ADDRESS>, YEAR.
 # 
 # Translators:
-# Kheyyam Gojayev <xxmn77@gmail.com>, 2022
+# Xəyyam Qocayev <xxmn77@gmail.com>, 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 <xxmn77@gmail.com>, 2022\n"
+"Last-Translator: Xəyyam Qocayev <xxmn77@gmail.com>, 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/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/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "GRUB tənzimləmələri"
 
-#: 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:42
+msgid "Mounting partitions."
+msgstr "Disk bölmələri qoşulur."
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command <pre>{!s}</pre> "
-"returned error code {!s}."
-msgstr ""
-"Bu paket meneceri yenilənmələri hazırlaya bilmədi. <pre>{!s}</pre> əmri xəta"
-" kodu {!s} ilə cavab verdi."
+#: 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:738
-msgid ""
-"The package manager could not update the system. The command <pre>{!s}</pre>"
-" returned error code {!s}."
-msgstr ""
-"Paket meneceri sistemi yeniləyə bimədi. <pre>{!s}</pre> əmri xəta kodu {!s} "
-"ilə cavab verdi."
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr "Zpool idxalı baş tutmadı"
 
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command <pre>{!s}</pre> returned error code {!s}."
-msgstr ""
-"Paket meneceri dəyişiklikləri sistemə tətbiq edə bilmədi. <pre>{!s}</pre> "
-"əmri xəta kodu {!s} ilə cavab verdi."
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr "Zpool kiliddən çıxarıla bilmədi"
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Şəbəkə ayarları saxlanılır."
+#: 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/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 <pre>{!s}</pre> to use."
+#: 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 <pre>{!s}</pre> to use."
+msgstr "<pre>{!s}</pre> istifadə etmək üçün bölmələr təyin edilməyib"
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr "zfs qoşulmasında xəta"
+
+#: 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 ""
+"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
 msgstr ""
-"<pre>{!s}</pre> istifadə etmək üçün kök qoşulma nöqtəsi təyin edilməyib."
+"<code>systemctl {arg!s}</code> chroot çağırışına xəta kodu ilə cavab verdi "
+"{num!s}."
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "mkinitcpio tənzimlənir."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service <code>{name!s}</code>."
+msgstr "<code>{name!s}</code> systemd xidməti aktiv edilmədi."
 
-#: 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
-msgid "No partitions are defined for <pre>{!s}</pre> to use."
-msgstr "<pre>{!s}</pre> istifadə etmək üçün bölmələr təyin edilməyib"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target <code>{name!s}</code>."
+msgstr "<code>{name!s}</code> systemd hədəfi aktiv edilmədi"
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "mkinitfs ilə initramfs yaradılır"
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer <code>{name!s}</code>."
+msgstr "<code>{name!s}</code> systemd taymeri aktiv edilə bilmir."
 
-#: 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:71
+msgid "Cannot disable systemd target <code>{name!s}</code>."
+msgstr "<code>{name!s}</code> systemd hədfi sönsürülmədi."
 
-#: 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:73
+msgid "Cannot mask systemd unit <code>{name!s}</code>."
+msgstr "<code>{name!s}</code> systemd vahidi maskalanmır."
 
-#: 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:75
+msgid ""
+"Unknown systemd commands <code>{command!s}</code> and "
+"<code>{suffix!s}</code> for unit {name!s}."
+msgstr ""
+"Naməlum systemd əmrləri <code>{command!s}</code> və <code>{suffix!s}</code> "
+"{name!s} vahidi üçün."
 
 #: src/modules/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -188,121 +177,76 @@ 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 ""
-"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
-msgstr ""
-"<code>systemctl {arg!s}</code> 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 <code>{name!s}</code>."
-msgstr "<code>{name!s}</code> systemd xidməti aktiv edilmədi."
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "KDM tənzimləmə faylı yazıla bilmir"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target <code>{name!s}</code>."
-msgstr "<code>{name!s}</code> systemd hədəfi aktiv edilmədi"
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "KDM tənzimləmə faylı {!s} mövcud deyil"
 
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer <code>{name!s}</code>."
-msgstr "<code>{name!s}</code> systemd taymeri aktiv edilə bilmir."
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "LXDM tənzimləmə faylı yazıla bilmir"
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target <code>{name!s}</code>."
-msgstr "<code>{name!s}</code> systemd hədfi sönsürülmədi."
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "LXDM tənzimləmə faylı {!s} mövcud deyil"
 
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit <code>{name!s}</code>."
-msgstr "<code>{name!s}</code> systemd vahidi maskalanmır."
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "LightDM tənzimləmə faylı yazıla bilmir"
 
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands <code>{command!s}</code> and "
-"<code>{suffix!s}</code> for unit {name!s}."
-msgstr ""
-"Naməlum systemd əmrləri <code>{command!s}</code> və <code>{suffix!s}</code> "
-"{name!s} vahidi üçün."
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "LightDM tənzimləmə faylı {!s} mövcud deyil"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Dummy python işi."
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "LightDM tənzimlənə bilmir"
 
-#: 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/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr "LightDM qarşılama quraşdırılmayıb."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Önyükləyici qurulur."
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "SLİM tənzimləmə faylı yazıla bilmir"
 
-#: 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/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "SLİM tənzimləmə faylı {!s} mövcud deyil"
 
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr "Önyükləyicinin quraşdırılmasında xəta"
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr "displaymanager modulu üçün ekran menecerləri seçilməyib."
 
-#: src/modules/bootloader/main.py:783
+#: src/modules/displaymanager/main.py:993
 msgid ""
-"The bootloader could not be installed. The installation command "
-"<pre>{!s}</pre> returned error code {!s}."
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
-"Önyükləyici quraşdırıla bilmədi. Quraşdırma əmri <pre>{!s}</pre>, 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"
+"Ekran menecerləri siyahısı həm qlobal yaddaşda, həm də displaymanager.conf-"
+"da boşdur və ya təyin olunmamışdır."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Plymouth mövzusu tənzimlənməsi"
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr "Ekran meneceri tənzimləmələri başa çatmadı"
 
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr "fstab yazılır."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "mkinitcpio tənzimlənir."
 
-#: src/modules/fstab/main.py:429
-msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
+#: 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 <pre>{!s}</pre> to use."
 msgstr ""
-"İstifadə etmək üçün, <pre>{!s}</pre> tənzimləməsi, <pre>{!s}</pre> üçün "
-"göstərilməyib."
+"<pre>{!s}</pre> 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"
@@ -352,82 +296,138 @@ msgid ""
 "exist."
 msgstr "{name!s} üçün <code>{path!s}</code> 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/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Plymouth mövzusu tənzimlənməsi"
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "KDM tənzimləmə faylı yazıla bilmir"
+#: 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/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "KDM tənzimləmə faylı {!s} mövcud deyil"
+#: 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/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "LXDM tənzimləmə faylı yazıla bilmir"
+#: 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/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "LXDM tənzimləmə faylı {!s} mövcud deyil"
+#: 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/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "LightDM tənzimləmə faylı yazıla bilmir"
+#: 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/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "LightDM tənzimləmə faylı {!s} mövcud deyil"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command <pre>{!s}</pre> "
+"returned error code {!s}."
+msgstr ""
+"Bu paket meneceri yenilənmələri hazırlaya bilmədi. <pre>{!s}</pre> əmri xəta"
+" kodu {!s} ilə cavab verdi."
 
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "LightDM tənzimlənə bilmir"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command <pre>{!s}</pre>"
+" returned error code {!s}."
+msgstr ""
+"Paket meneceri sistemi yeniləyə bimədi. <pre>{!s}</pre> əmri xəta kodu {!s} "
+"ilə cavab verdi."
 
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr "LightDM qarşılama quraşdırılmayıb."
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command <pre>{!s}</pre> returned error code {!s}."
+msgstr ""
+"Paket meneceri dəyişiklikləri sistemə tətbiq edə bilmədi. <pre>{!s}</pre> "
+"əmri xəta kodu {!s} ilə cavab verdi."
 
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "SLİM tənzimləmə faylı yazıla bilmir"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Önyükləyici qurulur."
 
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "SLİM tənzimləmə faylı {!s} mövcud deyil"
+#: 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/displaymanager/main.py:992
-msgid "No display managers selected for the displaymanager module."
-msgstr "displaymanager modulu üçün ekran menecerləri seçilməyib."
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr "Önyükləyicinin quraşdırılmasında xəta"
 
-#: src/modules/displaymanager/main.py:993
+#: src/modules/bootloader/main.py:783
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"The bootloader could not be installed. The installation command "
+"<pre>{!s}</pre> returned error code {!s}."
 msgstr ""
-"Ekran menecerləri siyahısı həm qlobal yaddaşda, həm də displaymanager.conf-"
-"da boşdur və ya təyin olunmamışdır."
+"Önyükləyici quraşdırıla bilmədi. Quraşdırma əmri <pre>{!s}</pre>, xəta kodu "
+"{!s} ilə cavab verdi."
 
-#: src/modules/displaymanager/main.py:1075
-msgid "Display manager configuration was incomplete"
-msgstr "Ekran meneceri tənzimləmələri başa çatmadı"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Aparat saatını ayarlamaq."
+
+#: 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/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Aparat saatını ayarlamaq."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "OpenRC dmcrypt xidməti tənzimlənir."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Quraşdırılma tarixi."
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr "fstab yazılır."
+
+#: src/modules/fstab/main.py:429
+msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
+msgstr ""
+"İstifadə etmək üçün, <pre>{!s}</pre> tənzimləməsi, <pre>{!s}</pre> üçü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 6e89c01bbfced120a4039d91fb1de1fc18b8bc63..1c079d708fd7178eaaefb44a70a4dd9200049ff2 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 <nashtlumach@gmail.com>, 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/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/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Наладзіць GRUB."
 
-#: 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:42
+msgid "Mounting partitions."
+msgstr "Мантаванне раздзелаў."
 
-#: 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 <pre>{!s}</pre> "
-"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 <pre>{!s}</pre>"
-" 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 <pre>{!s}</pre> 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 <pre>{!s}</pre> to use."
-msgstr "Каранёвы пункт мантавання для<pre>{!s}</pre> не пададзены."
-
-#: 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 <pre>{!s}</pre> to use."
 msgstr "Раздзелы для <pre>{!s}</pre> не вызначаныя."
 
-#: 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 ""
+"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
+msgstr "<code>systemctl {arg!s}</code> у chroot вярнуў код памылкі {num!s}."
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service <code>{name!s}</code>."
+msgstr "Немагчыма ўключыць службу systemd <code>{name!s}</code>."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target <code>{name!s}</code>."
+msgstr "Немагчыма ўключыць мэту systemd <code>{name!s}</code>."
+
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer <code>{name!s}</code>."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target <code>{name!s}</code>."
+msgstr "Немагчыма выключыць мэту systemd <code>{name!s}."
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit <code>{name!s}</code>."
+msgstr "Немагчыма замаскаваць адзінку systemd <code>{name!s}</code>. "
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands <code>{command!s}</code> and "
+"<code>{suffix!s}</code> for unit {name!s}."
+msgstr ""
+"Невядомыя systemd загады <code>{command!s}</code> і <code>{suffix!s}</code> "
+"для адзінкі {name!s}."
 
 #: src/modules/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -182,115 +172,75 @@ 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 ""
-"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
-msgstr "<code>systemctl {arg!s}</code> у chroot вярнуў код памылкі {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service <code>{name!s}</code>."
-msgstr "Немагчыма ўключыць службу systemd <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "Немагчыма запісаць файл канфігурацыі KDM"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target <code>{name!s}</code>."
-msgstr "Немагчыма ўключыць мэту systemd <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "Файл канфігурацыі KDM {!s} не існуе"
 
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer <code>{name!s}</code>."
-msgstr ""
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "Немагчыма запісаць файл канфігурацыі LXDM"
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target <code>{name!s}</code>."
-msgstr "Немагчыма выключыць мэту systemd <code>{name!s}."
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "Файл канфігурацыі LXDM {!s} не існуе"
 
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit <code>{name!s}</code>."
-msgstr "Немагчыма замаскаваць адзінку systemd <code>{name!s}</code>. "
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "Немагчыма запісаць файл канфігурацыі LightDM"
 
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands <code>{command!s}</code> and "
-"<code>{suffix!s}</code> for unit {name!s}."
-msgstr ""
-"Невядомыя systemd загады <code>{command!s}</code> і <code>{suffix!s}</code> "
-"для адзінкі {name!s}."
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "Файл канфігурацыі LightDM {!s} не існуе"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Задача Dummy python."
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "Немагчыма наладзіць LightDM"
 
-#: 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/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr "LightDM greeter не ўсталяваны."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Усталяваць загрузчык."
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "Немагчыма запісаць файл канфігурацыі SLIM"
 
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "Файл канфігурацыі SLIM {!s} не існуе"
 
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr "У модулі дысплейных кіраўнікоў нічога не абрана."
 
-#: src/modules/bootloader/main.py:783
+#: src/modules/displaymanager/main.py:993
 msgid ""
-"The bootloader could not be installed. The installation command "
-"<pre>{!s}</pre> 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"
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
+"Спіс дысплейных кіраўнікоў пусты альбо не вызначаны ў both globalstorage і "
+"displaymanager.conf."
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr ""
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr "Наладка дысплейнага кіраўніка не завершаная."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Наладзіць тэму Plymouth"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Наладка mkinitcpio."
 
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr "Запіс fstab."
+#: 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 <pre>{!s}</pre> to use."
+msgstr "Каранёвы пункт мантавання для<pre>{!s}</pre> не пададзены."
 
-#: src/modules/fstab/main.py:429
-msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
-msgstr ""
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Усталёўка даных."
 
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
@@ -338,82 +288,132 @@ msgid ""
 "exist."
 msgstr "Шлях <code>{path!s}</code> да службы {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/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Наладзіць тэму Plymouth"
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "Немагчыма запісаць файл канфігурацыі KDM"
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "Усталяваць пакункі."
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "Файл канфігурацыі KDM {!s} не існуе"
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Апрацоўка пакункаў (%(count)d / %(total)d)"
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "Немагчыма запісаць файл канфігурацыі LXDM"
+#: 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/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "Файл канфігурацыі LXDM {!s} не існуе"
+#: 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/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "Немагчыма запісаць файл канфігурацыі LightDM"
+#: 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/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "Файл канфігурацыі LightDM {!s} не існуе"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command <pre>{!s}</pre> "
+"returned error code {!s}."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "Немагчыма наладзіць LightDM"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command <pre>{!s}</pre>"
+" returned error code {!s}."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr "LightDM greeter не ўсталяваны."
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command <pre>{!s}</pre> returned error code {!s}."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "Немагчыма запісаць файл канфігурацыі SLIM"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Усталяваць загрузчык."
 
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "Файл канфігурацыі SLIM {!s} не існуе"
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
 
-#: src/modules/displaymanager/main.py:992
-msgid "No display managers selected for the displaymanager module."
-msgstr "У модулі дысплейных кіраўнікоў нічога не абрана."
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
 
-#: src/modules/displaymanager/main.py:993
+#: src/modules/bootloader/main.py:783
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"The bootloader could not be installed. The installation command "
+"<pre>{!s}</pre> returned error code {!s}."
 msgstr ""
-"Спіс дысплейных кіраўнікоў пусты альбо не вызначаны ў both globalstorage і "
-"displaymanager.conf."
 
-#: src/modules/displaymanager/main.py:1075
-msgid "Display manager configuration was incomplete"
-msgstr "Наладка дысплейнага кіраўніка не завершаная."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+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/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Наладка апаратнага гадзінніка."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Наладка OpenRC dmcrypt."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Усталёўка даных."
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr "Запіс fstab."
+
+#: src/modules/fstab/main.py:429
+msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> 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 864fe9b8490564e9215b9536060fa3ba1fac8b03..1816f8f389067adddf642ceba3d30272ed951ca1 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 (Жоро) <g.georgiev.shumen@gmail.com>, 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/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/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Конфигурирай GRUB."
 
-#: 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 <pre>{!s}</pre> "
-"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 <pre>{!s}</pre>"
-" 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 <pre>{!s}</pre> 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 <pre>{!s}</pre> to use."
+#: 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 <pre>{!s}</pre> to use."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Конфигуриране на mkinitcpio."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+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
-msgid "No partitions are defined for <pre>{!s}</pre> to use."
+#: 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 ""
+"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target <code>{name!s}</code>."
 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:67
+msgid "Cannot enable systemd timer <code>{name!s}</code>."
+msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Конфигуриране на услугата dmcrypt на OpenRC."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target <code>{name!s}</code>."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit <code>{name!s}</code>."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands <code>{command!s}</code> and "
+"<code>{suffix!s}</code> for unit {name!s}."
+msgstr ""
 
 #: src/modules/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -178,114 +170,72 @@ 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/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "Конфигурационният файл на KDM не може да бъде записан"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
-msgstr ""
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "Конфигурационният файл на KDM {!s} не съществува"
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service <code>{name!s}</code>."
-msgstr ""
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "Конфигурационният файл на LXDM не може да бъде записан"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target <code>{name!s}</code>."
-msgstr ""
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "Конфигурационният файл на LXDM {!s} не съществува"
 
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer <code>{name!s}</code>."
-msgstr ""
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "Конфигурационният файл на LightDM не може да бъде записан"
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target <code>{name!s}</code>."
-msgstr ""
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "Конфигурационният файл на LightDM {!s} не съществува"
 
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands <code>{command!s}</code> and "
-"<code>{suffix!s}</code> for unit {name!s}."
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
 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/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "Конфигурационният файл на SLIM не може да бъде записан"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Инсталирай програма за начално зареждане."
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "Конфигурационният файл на SLIM {!s} не съществува"
 
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
-"Инсталирането на grub е неуспешно – няма определени дялове в мястото за "
-"съхранение"
-
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr "Грешка при инсталирането на програмата за начално зареждане"
 
-#: src/modules/bootloader/main.py:783
+#: src/modules/displaymanager/main.py:993
 msgid ""
-"The bootloader could not be installed. The installation command "
-"<pre>{!s}</pre> 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"
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr ""
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Конфигуриране на mkinitcpio."
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
+#: 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 <pre>{!s}</pre> to use."
 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 <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
 
 #: src/modules/services-openrc/main.py:29
@@ -331,80 +281,130 @@ msgid ""
 "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/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Конфигурирай темата на Plymouth"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Конфигурирай GRUB."
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "Инсталирай пакетите."
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "Конфигурационният файл на KDM не може да бъде записан"
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Обработване на пакетите (%(count)d / %(total)d)"
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "Конфигурационният файл на KDM {!s} не съществува"
+#: 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/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "Конфигурационният файл на LXDM не може да бъде записан"
+#: 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/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "Конфигурационният файл на LXDM {!s} не съществува"
+#: 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/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "Конфигурационният файл на LightDM не може да бъде записан"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command <pre>{!s}</pre> "
+"returned error code {!s}."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "Конфигурационният файл на LightDM {!s} не съществува"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command <pre>{!s}</pre>"
+" returned error code {!s}."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command <pre>{!s}</pre> returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
+#: 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/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "Конфигурационният файл на SLIM не може да бъде записан"
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr "Грешка при инсталирането на програмата за начално зареждане"
 
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "Конфигурационният файл на SLIM {!s} не съществува"
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"<pre>{!s}</pre> returned error code {!s}."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:992
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:993
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:1075
-msgid "Display manager configuration was incomplete"
+#: 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/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: 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 <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: 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 092f8bc3961078bcdcb3e92d2bcdcbf915ca4c76..e9b56c0686d8476135b1e7b8016ccff3370d46f4 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 <d0ef5d977ab7abf012ef53891f8ca2b5_900530>, 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."
-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/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "কনফিগার করুন জিআরইউবি।"
 
-#: 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:42
+msgid "Mounting partitions."
+msgstr "মাউন্ট করছে পার্টিশনগুলো।"
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command <pre>{!s}</pre> "
-"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 <pre>{!s}</pre>"
-" 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 <pre>{!s}</pre> 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 <pre>{!s}</pre> to use."
+#: 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 <pre>{!s}</pre> to use."
+msgstr "কোন পার্টিশন নির্দিষ্ট করা হয়নি<pre>{!এস}</pre> ব্যবহার করার জন্য।"
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: 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 ""
+"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
 msgstr ""
+"<code>সিস্টেমসিটিএল {এআরজি!এস}</code>সিএইচরুট ফেরত ত্রুটি কোড দে{NUM! গুলি}।"
 
-#: 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
-msgid "No partitions are defined for <pre>{!s}</pre> to use."
-msgstr "কোন পার্টিশন নির্দিষ্ট করা হয়নি<pre>{!এস}</pre> ব্যবহার করার জন্য।"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service <code>{name!s}</code>."
+msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit <code>{name!s}</code>."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands <code>{command!s}</code> and "
+"<code>{suffix!s}</code> for unit {name!s}."
 msgstr ""
 
 #: src/modules/unpackfs/main.py:34
@@ -178,113 +171,72 @@ 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 ""
-"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
-msgstr ""
-"<code>সিস্টেমসিটিএল {এআরজি!এস}</code>সিএইচরুট ফেরত ত্রুটি কোড দে{NUM! গুলি}।"
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands <code>{command!s}</code> and "
-"<code>{suffix!s}</code> for unit {name!s}."
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/bootloader/main.py:783
+#: src/modules/displaymanager/main.py:993
 msgid ""
-"The bootloader could not be installed. The installation command "
-"<pre>{!s}</pre> 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"
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
+#: 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 <pre>{!s}</pre> to use."
 msgstr ""
 
-#: src/modules/fstab/main.py:429
-msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
 
 #: src/modules/services-openrc/main.py:29
@@ -330,80 +282,128 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: 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 ""
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
+#: 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/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command <pre>{!s}</pre> "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command <pre>{!s}</pre>"
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command <pre>{!s}</pre> returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"<pre>{!s}</pre> returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:992
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:993
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:1075
-msgid "Display manager configuration was incomplete"
+#: 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/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> 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 2336e78a59e1006785dd1e9eb217996663af7874..2e75cdc45eb93527efbf2ec4559767ba1f268c6f 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 <medipas@gmail.com>, 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/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/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Configura el GRUB."
 
-#: 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:42
+msgid "Mounting partitions."
+msgstr "Es munten les particions."
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command <pre>{!s}</pre> "
-"returned error code {!s}."
-msgstr ""
-"El gestor de paquets no ha pogut preparar les actualitzacions. "
-"L'ordre<pre>{!s}</pre> ha retornat el codi d'error {!s}."
+#: 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:738
-msgid ""
-"The package manager could not update the system. The command <pre>{!s}</pre>"
-" returned error code {!s}."
-msgstr ""
-"El gestor de paquets no ha pogut actualitzar el sistema. L'ordre "
-"<pre>{!s}</pre> ha retornat el codi d'error {!s}."
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr "No s'ha pogut importar zpool."
 
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command <pre>{!s}</pre> returned error code {!s}."
-msgstr ""
-"El gestor de paquets no ha pogut fer canvis al sistema instal·lat. L'ordre "
-"<pre>{!s}</pre> ha retornat el codi d'error {!s}."
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr "No s'ha pogut desblocar zpool."
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Es desa la configuració de la xarxa."
+#: 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/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 <pre>{!s}</pre> to use."
+#: 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 <pre>{!s}</pre> to use."
+msgstr "No s'han definit particions perquè les usi <pre>{!s}</pre>."
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr "error de muntatge de zfs"
+
+#: 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 ""
+"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
 msgstr ""
-"No s'ha proporcionat el punt de muntatge perquè l'usi <pre>{!s}</pre>."
+"La crida de <code>systemctl {arg!s}</code> a chroot ha retornat el codi "
+"d'error {num!s}."
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Es configura mkinitcpio."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service <code>{name!s}</code>."
+msgstr "No es pot habilitar el servei de systemd <code>{name!s}</code>."
 
-#: 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
-msgid "No partitions are defined for <pre>{!s}</pre> to use."
-msgstr "No s'han definit particions perquè les usi <pre>{!s}</pre>."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target <code>{name!s}</code>."
+msgstr "No es pot habilitar la destinació de systemd <code>{name!s}</code>."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Es creen initramfs amb mkinitfs."
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer <code>{name!s}</code>."
+msgstr ""
+"No es pot habilitar el temporitzador de systemd <code>{name!s}</code>."
 
-#: 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:71
+msgid "Cannot disable systemd target <code>{name!s}</code>."
+msgstr "No es pot inhabilitar la destinació de systemd <code>{name!s}</code>."
 
-#: 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:73
+msgid "Cannot mask systemd unit <code>{name!s}</code>."
+msgstr "No es pot emmascarar la unitat de systemd <code>{name!s}</code>."
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Es configura el sevei OpenRC dmcrypt."
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands <code>{command!s}</code> and "
+"<code>{suffix!s}</code> for unit {name!s}."
+msgstr ""
+"Ordres desconegudes de systemd: <code>{command!s}</code> i "
+"<code>{suffix!s}</code>, per a la unitat {name!s}."
 
 #: src/modules/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -187,123 +177,77 @@ 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 ""
-"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
-msgstr ""
-"La crida de <code>systemctl {arg!s}</code> a chroot ha retornat el codi "
-"d'error {num!s}."
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "No es pot escriure el fitxer de configuració del KDM."
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service <code>{name!s}</code>."
-msgstr "No es pot habilitar el servei de systemd <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "El fitxer de configuració del KDM {!s} no existeix."
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target <code>{name!s}</code>."
-msgstr "No es pot habilitar la destinació de systemd <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "No es pot escriure el fitxer de configuració de l'LXDM."
 
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer <code>{name!s}</code>."
-msgstr ""
-"No es pot habilitar el temporitzador de systemd <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "El fitxer de configuració de l'LXDM {!s} no existeix."
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target <code>{name!s}</code>."
-msgstr "No es pot inhabilitar la destinació de systemd <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "No es pot escriure el fitxer de configuració del LightDM."
 
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit <code>{name!s}</code>."
-msgstr "No es pot emmascarar la unitat de systemd <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "El fitxer de configuració del LightDM {!s} no existeix."
 
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands <code>{command!s}</code> and "
-"<code>{suffix!s}</code> for unit {name!s}."
-msgstr ""
-"Ordres desconegudes de systemd: <code>{command!s}</code> i "
-"<code>{suffix!s}</code>, per a la unitat {name!s}."
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "No es pot configurar el LightDM."
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Tasca de python fictícia."
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr "No hi ha benvinguda instal·lada per al LightDM."
 
-#: 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/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "No es pot escriure el fitxer de configuració de l'SLIM."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "S'instal·la el carregador d'arrencada."
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "El fitxer de configuració de l'SLIM {!s} no existeix."
 
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
 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"
+"No hi ha cap gestor de pantalla seleccionat per al mòdul displaymanager."
 
-#: src/modules/bootloader/main.py:783
+#: src/modules/displaymanager/main.py:993
 msgid ""
-"The bootloader could not be installed. The installation command "
-"<pre>{!s}</pre> returned error code {!s}."
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
-"No s'ha pogut instal·lar el carregador d'arrencada. L'ordre d'instal·lació "
-"<pre>{!s}</pre>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"
+"La llista de gestors de pantalla és buida o no definida ni a globalstorage "
+"ni a displaymanager.conf."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Configura el tema del Plymouth"
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr "La configuració del gestor de pantalla no era completa."
 
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr "S'escriu fstab."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Es configura mkinitcpio."
 
-#: src/modules/fstab/main.py:429
-msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
+#: 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 <pre>{!s}</pre> to use."
 msgstr ""
-"No hi ha cap configuració de <pre>{!s}</pre> perquè la usi <pre>{!s}</pre>."
+"No s'ha proporcionat el punt de muntatge perquè l'usi <pre>{!s}</pre>."
+
+#: 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"
@@ -356,83 +300,139 @@ msgid ""
 msgstr ""
 "El camí per al servei {name!s} és <code>{path!s}</code>, 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."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Configura el tema del Plymouth"
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "El fitxer de configuració del KDM {!s} no existeix."
+#: 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/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "No es pot escriure el fitxer de configuració de l'LXDM."
+#: 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/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "El fitxer de configuració de l'LXDM {!s} no existeix."
+#: 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/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "No es pot escriure el fitxer de configuració del LightDM."
+#: 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/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "El fitxer de configuració del LightDM {!s} no existeix."
+#: 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/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "No es pot configurar el LightDM."
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command <pre>{!s}</pre> "
+"returned error code {!s}."
+msgstr ""
+"El gestor de paquets no ha pogut preparar les actualitzacions. "
+"L'ordre<pre>{!s}</pre> ha retornat el codi d'error {!s}."
 
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr "No hi ha benvinguda instal·lada per al LightDM."
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command <pre>{!s}</pre>"
+" returned error code {!s}."
+msgstr ""
+"El gestor de paquets no ha pogut actualitzar el sistema. L'ordre "
+"<pre>{!s}</pre> ha retornat el codi d'error {!s}."
 
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "No es pot escriure el fitxer de configuració de l'SLIM."
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command <pre>{!s}</pre> returned error code {!s}."
+msgstr ""
+"El gestor de paquets no ha pogut fer canvis al sistema instal·lat. L'ordre "
+"<pre>{!s}</pre> ha retornat el codi d'error {!s}."
 
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "El fitxer de configuració de l'SLIM {!s} no existeix."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "S'instal·la el carregador d'arrencada."
 
-#: src/modules/displaymanager/main.py:992
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
 msgstr ""
-"No hi ha cap gestor de pantalla seleccionat per al mòdul displaymanager."
+"No s'ha pogut instal·lar el grub. No s'han definit particions a "
+"l'emmagatzematge global."
 
-#: src/modules/displaymanager/main.py:993
+#: 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 displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"The bootloader could not be installed. The installation command "
+"<pre>{!s}</pre> returned error code {!s}."
 msgstr ""
-"La llista de gestors de pantalla és buida o no definida ni a globalstorage "
-"ni a displaymanager.conf."
+"No s'ha pogut instal·lar el carregador d'arrencada. L'ordre d'instal·lació "
+"<pre>{!s}</pre>ha retornat el codi d'error {!s}."
 
-#: src/modules/displaymanager/main.py:1075
-msgid "Display manager configuration was incomplete"
-msgstr "La configuració del gestor de pantalla no era completa."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "S'estableix el rellotge del maquinari."
+
+#: 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/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "S'estableix el rellotge del maquinari."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Es configura el sevei OpenRC dmcrypt."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "S'instal·len dades."
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr "S'escriu fstab."
+
+#: src/modules/fstab/main.py:429
+msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
+msgstr ""
+"No hi ha cap configuració de <pre>{!s}</pre> perquè la usi <pre>{!s}</pre>."
+
+#: 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 f5a80d1345019bbbe01d15d24fce9990f0b2fda6..f32fa68f55784fd1f3228ba8d6b9cf13f7a0303f 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 <raurodse@gmail.com>, 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/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/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Configura el GRUB"
 
-#: 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/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "S'estan muntant les particions."
 
-#: 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 <pre>{!s}</pre> "
-"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 <pre>{!s}</pre>"
-" 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 <pre>{!s}</pre> 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 <pre>{!s}</pre> to use."
+#: 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 <pre>{!s}</pre> to use."
+msgstr "No s'han definit particions perquè les use <pre>{!s}</pre>."
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
 msgstr ""
-"No s'ha proporcionat el punt de muntatge perquè l'use <pre>{!s}</pre>."
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "S'està configurant mkinitcpio."
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Configura els serveis de systemd"
 
-#: 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
-msgid "No partitions are defined for <pre>{!s}</pre> to use."
-msgstr "No s'han definit particions perquè les use <pre>{!s}</pre>."
+#: 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/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Creació d’initramfs amb mkinitfs."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
+msgstr ""
+"La crida de <code>systemctl {arg!s}</code> a chroot ha retornat el codi "
+"d'error {num!s}."
 
-#: 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:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service <code>{name!s}</code>."
+msgstr "No es pot habilitar el servei de systemd <code>{name!s}</code>."
 
-#: 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:65
+msgid "Cannot enable systemd target <code>{name!s}</code>."
+msgstr "No es pot habilitar la destinació de systemd <code>{name!s}</code>."
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Configuració del servei OpenRC dmcrypt."
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer <code>{name!s}</code>."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target <code>{name!s}</code>."
+msgstr "No es pot inhabilitar la destinació de systemd <code>{name!s}</code>."
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit <code>{name!s}</code>."
+msgstr "No es pot emmascarar la unitat de systemd <code>{name!s}</code>."
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands <code>{command!s}</code> and "
+"<code>{suffix!s}</code> for unit {name!s}."
+msgstr ""
+"Es desconeixen les ordres de systemd: <code>{command!s}</code> i "
+"<code>{suffix!s}</code>, per a la unitat {name!s}."
 
 #: src/modules/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -179,117 +174,77 @@ 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 ""
-"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
-msgstr ""
-"La crida de <code>systemctl {arg!s}</code> 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 <code>{name!s}</code>."
-msgstr "No es pot habilitar el servei de systemd <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "No es pot escriure el fitxer de configuració del KDM."
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target <code>{name!s}</code>."
-msgstr "No es pot habilitar la destinació de systemd <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "El fitxer de configuració del KDM {!s} no existeix."
 
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer <code>{name!s}</code>."
-msgstr ""
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "No es pot escriure el fitxer de configuració de l'LXDM."
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target <code>{name!s}</code>."
-msgstr "No es pot inhabilitar la destinació de systemd <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "El fitxer de configuració de l'LXDM {!s} no existeix."
 
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit <code>{name!s}</code>."
-msgstr "No es pot emmascarar la unitat de systemd <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "No es pot escriure el fitxer de configuració del LightDM."
 
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands <code>{command!s}</code> and "
-"<code>{suffix!s}</code> for unit {name!s}."
-msgstr ""
-"Es desconeixen les ordres de systemd: <code>{command!s}</code> i "
-"<code>{suffix!s}</code>, per a la unitat {name!s}."
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "El fitxer de configuració del LightDM {!s} no existeix."
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Tasca de python de proves."
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "No es pot configurar el LightDM."
 
-#: 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/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr "No hi ha benvinguda instal·lada per al LightDM."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Instal·la el carregador d'arrancada."
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "No es pot escriure el fitxer de configuració de l'SLIM."
 
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "El fitxer de configuració de l'SLIM {!s} no existeix."
 
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
+"No hi ha cap gestor de pantalla seleccionat per al mòdul displaymanager."
 
-#: src/modules/bootloader/main.py:783
+#: src/modules/displaymanager/main.py:993
 msgid ""
-"The bootloader could not be installed. The installation command "
-"<pre>{!s}</pre> 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"
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
+"La llista de gestors de pantalla està buida o no està definida ni en "
+"globalstorage ni en displaymanager.conf."
 
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr ""
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr "La configuració del gestor de pantalla no era completa."
 
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr ""
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "S'està configurant mkinitcpio."
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
+#: 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 <pre>{!s}</pre> to use."
 msgstr ""
+"No s'ha proporcionat el punt de muntatge perquè l'use <pre>{!s}</pre>."
 
-#: 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 <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
-msgstr ""
+#: 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"
@@ -342,83 +297,128 @@ msgid ""
 msgstr ""
 "El camí per al servei {name!s} és <code>{path!s}</code>, 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/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Configura el tema del Plymouth"
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "No es pot escriure el fitxer de configuració del KDM."
+#: 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/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "El fitxer de configuració del KDM {!s} no existeix."
+#: 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/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "No es pot escriure el fitxer de configuració de l'LXDM."
+#: 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/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "El fitxer de configuració de l'LXDM {!s} no existeix."
+#: 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/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "No es pot escriure el fitxer de configuració del LightDM."
+#: 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/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "El fitxer de configuració del LightDM {!s} no existeix."
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command <pre>{!s}</pre> "
+"returned error code {!s}."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "No es pot configurar el LightDM."
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command <pre>{!s}</pre>"
+" returned error code {!s}."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr "No hi ha benvinguda instal·lada per al LightDM."
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command <pre>{!s}</pre> returned error code {!s}."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "No es pot escriure el fitxer de configuració de l'SLIM."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Instal·la el carregador d'arrancada."
 
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "El fitxer de configuració de l'SLIM {!s} no existeix."
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
 
-#: src/modules/displaymanager/main.py:992
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
 msgstr ""
-"No hi ha cap gestor de pantalla seleccionat per al mòdul displaymanager."
 
-#: src/modules/displaymanager/main.py:993
+#: src/modules/bootloader/main.py:783
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"The bootloader could not be installed. The installation command "
+"<pre>{!s}</pre> returned error code {!s}."
 msgstr ""
-"La llista de gestors de pantalla està buida o no està definida ni en "
-"globalstorage ni en displaymanager.conf."
 
-#: src/modules/displaymanager/main.py:1075
-msgid "Display manager configuration was incomplete"
-msgstr "La configuració del gestor de pantalla no era completa."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Configuració del rellotge del maquinari."
+
+#: 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/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Configuració del rellotge del maquinari."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Configuració del servei OpenRC dmcrypt."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "S'estan instal·lant les dades."
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr "Escriptura d’fstab."
+
+#: src/modules/fstab/main.py:429
+msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> 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 c765c28ada3f18aacb8af6a94501424883c3c406..6788e436b8a851a85651a6f8d5c2a4fceffb97b8 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 <pavel.borecki@gmail.com>, 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/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/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Nastavování zavaděče GRUB."
 
-#: 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:42
+msgid "Mounting partitions."
+msgstr "Připojování oddílů."
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command <pre>{!s}</pre> "
-"returned error code {!s}."
-msgstr ""
-"Nástroji pro správu balíčků se nepodařilo připravit aktualizace. Příkaz "
-"<pre>{!s}</pre> vrátil chybový kód {!s}."
+#: 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:738
-msgid ""
-"The package manager could not update the system. The command <pre>{!s}</pre>"
-" returned error code {!s}."
-msgstr ""
-"Nástroji pro správu balíčků se nepodařilo aktualizovat systém. Příkaz "
-"<pre>{!s}</pre> vrátil chybový kód {!s}."
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr "Nepodařilo se naimportovat zfs fond"
 
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command <pre>{!s}</pre> 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 <pre>{!s}</pre> vrátil chybový kód {!s}."
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr "Nepodařilo se odemknout zfs fond"
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Ukládání nastavení sítě."
+#: 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/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 <pre>{!s}</pre> to use."
-msgstr "Pro <pre>{!s}</pre> 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 <pre>{!s}</pre> to use."
 msgstr "Pro <pre>{!s}</pre> 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 ""
+"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
+msgstr ""
+"Volání <code>systemctl {arg!s}</code> 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 <code>{name!s}</code>."
+msgstr "Nedaří se zapnout systemd službu <code>{name!s}</code>."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target <code>{name!s}</code>."
+msgstr "Nedaří se zapnout systemd službu <code>{name!s}</code>."
+
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer <code>{name!s}</code>."
+msgstr "Nedaří se zapnout systemd časovač <code>{name!s}</code>."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target <code>{name!s}</code>."
+msgstr "Nedaří se vypnout systemd cíl <code>{name!s}</code>."
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit <code>{name!s}</code>."
+msgstr "Nedaří se maskovat systemd jednotku <code>{name!s}</code>."
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands <code>{command!s}</code> and "
+"<code>{suffix!s}</code> for unit {name!s}."
+msgstr ""
+"Neznámé systemd příkazy <code>{command!s}</code> a <code>{suffix!s}</code> "
+"pro jednotku {name!s}."
 
 #: src/modules/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -194,122 +179,75 @@ 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 ""
-"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
-msgstr ""
-"Volání <code>systemctl {arg!s}</code> 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 <code>{name!s}</code>."
-msgstr "Nedaří se zapnout systemd službu <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "Nedaří se zapsat soubor s nastaveními pro KDM"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target <code>{name!s}</code>."
-msgstr "Nedaří se zapnout systemd službu <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "Soubor s nastaveními pro KDM {!s} neexistuje"
 
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer <code>{name!s}</code>."
-msgstr "Nedaří se zapnout systemd časovač <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "Nedaří se zapsat soubor s nastaveními pro LXDM"
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target <code>{name!s}</code>."
-msgstr "Nedaří se vypnout systemd cíl <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "Soubor s nastaveními pro LXDM {!s} neexistuje"
 
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit <code>{name!s}</code>."
-msgstr "Nedaří se maskovat systemd jednotku <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "Nedaří se zapsat soubor s nastaveními pro LightDM"
 
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands <code>{command!s}</code> and "
-"<code>{suffix!s}</code> for unit {name!s}."
-msgstr ""
-"Neznámé systemd příkazy <code>{command!s}</code> a <code>{suffix!s}</code> "
-"pro jednotku {name!s}."
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "Soubor s nastaveními pro LightDM {!s} neexistuje"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Testovací úloha python."
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "Nedaří se nastavit LightDM"
 
-#: 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/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr "Není nainstalovaný žádný LightDM přivítač"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Instalace zavaděče systému."
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "Nedaří se zapsat soubor s nastaveními pro SLIM"
 
-#: 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/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "Soubor s nastaveními pro SLIM {!s} neexistuje"
 
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr "Chyba při instalaci zavaděče systému"
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr "Pro modul správce sezení nejsou vybrány žádní správci sezení."
 
-#: src/modules/bootloader/main.py:783
+#: src/modules/displaymanager/main.py:993
 msgid ""
-"The bootloader could not be installed. The installation command "
-"<pre>{!s}</pre> returned error code {!s}."
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
-"Zavaděč systému se nepodařilo nainstalovat. Instalační příkaz <pre>{!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"
+"Seznam správců displejů je prázdný nebo není definován v jak globalstorage, "
+"tak v displaymanager.conf."
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr "Chyba při připojování zfs"
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr "Nastavení správce displeje nebylo úplné"
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Nastavit téma vzhledu pro Plymouth"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Nastavování mkinitcpio."
 
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr "Zapisování fstab."
+#: 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 <pre>{!s}</pre> to use."
+msgstr "Pro <pre>{!s}</pre> není zadán žádný přípojný bod."
 
-#: src/modules/fstab/main.py:429
-msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
-msgstr ""
-"Pro <pre>{!s}</pre> není zadáno žádné nastavení <pre>{!s}</pre>, které "
-"použít. "
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Instalace dat."
 
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
@@ -363,82 +301,144 @@ msgstr ""
 "Popis umístění pro službu {name!s} je <code>{path!s}</code>, 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/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Nastavit téma vzhledu pro Plymouth"
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "Nedaří se zapsat soubor s nastaveními pro KDM"
+#: 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/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "Soubor s nastaveními pro KDM {!s} neexistuje"
+#: 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/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "Nedaří se zapsat soubor s nastaveními pro LXDM"
+#: 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/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "Soubor s nastaveními pro LXDM {!s} neexistuje"
+#: 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/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "Nedaří se zapsat soubor s nastaveními pro LightDM"
+#: 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/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "Soubor s nastaveními pro LightDM {!s} neexistuje"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command <pre>{!s}</pre> "
+"returned error code {!s}."
+msgstr ""
+"Nástroji pro správu balíčků se nepodařilo připravit aktualizace. Příkaz "
+"<pre>{!s}</pre> vrátil chybový kód {!s}."
 
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "Nedaří se nastavit LightDM"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command <pre>{!s}</pre>"
+" returned error code {!s}."
+msgstr ""
+"Nástroji pro správu balíčků se nepodařilo aktualizovat systém. Příkaz "
+"<pre>{!s}</pre> vrátil chybový kód {!s}."
 
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr "Není nainstalovaný žádný LightDM přivítač"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command <pre>{!s}</pre> 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 <pre>{!s}</pre> vrátil chybový kód {!s}."
 
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "Nedaří se zapsat soubor s nastaveními pro SLIM"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Instalace zavaděče systému."
 
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "Soubor s nastaveními pro SLIM {!s} neexistuje"
+#: 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/displaymanager/main.py:992
-msgid "No display managers selected for the displaymanager module."
-msgstr "Pro modul správce sezení nejsou vybrány žádní správci sezení."
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr "Chyba při instalaci zavaděče systému"
 
-#: src/modules/displaymanager/main.py:993
+#: src/modules/bootloader/main.py:783
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"The bootloader could not be installed. The installation command "
+"<pre>{!s}</pre> returned error code {!s}."
 msgstr ""
-"Seznam správců displejů je prázdný nebo není definován v jak globalstorage, "
-"tak v displaymanager.conf."
+"Zavaděč systému se nepodařilo nainstalovat. Instalační příkaz <pre>{!s} "
+"vrátil chybový kód {!s}."
 
-#: src/modules/displaymanager/main.py:1075
-msgid "Display manager configuration was incomplete"
-msgstr "Nastavení správce displeje nebylo úplné"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Nastavování hardwarových hodin."
+
+#: 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/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Nastavování hardwarových hodin."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Nastavování služby OpenRC dmcrypt."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Instalace dat."
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr "Zapisování fstab."
+
+#: src/modules/fstab/main.py:429
+msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
+msgstr ""
+"Pro <pre>{!s}</pre> není zadáno žádné nastavení <pre>{!s}</pre>, 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 05e081e2779e7e6cae5035442c81998cb98e87f5..0a3c67a1b3d5ba7925252a8bb0bcde1bf153c714 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/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/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Konfigurer GRUB."
 
-#: 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/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "Monterer partitioner."
 
-#: 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 <pre>{!s}</pre> "
-"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 <pre>{!s}</pre>"
-" 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 <pre>{!s}</pre> 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 <pre>{!s}</pre> to use."
+#: 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 <pre>{!s}</pre> to use."
+msgstr "Der er ikke angivet nogle partitioner som <pre>{!s}</pre> kan bruge."
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
 msgstr ""
-"Der er ikke angivet noget rodmonteringspunkt som <pre>{!s}</pre> kan bruge."
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Konfigurerer mkinitcpio."
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Konfigurer systemd-tjenester"
 
-#: 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
-msgid "No partitions are defined for <pre>{!s}</pre> to use."
-msgstr "Der er ikke angivet nogle partitioner som <pre>{!s}</pre> kan bruge."
+#: 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/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Opretter initramfs med mkinitfs."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
+msgstr ""
+"<code>systemctl {arg!s}</code>-kald i chroot returnerede fejlkoden {num!s}."
 
-#: 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:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service <code>{name!s}</code>."
+msgstr "Kan ikke aktivere systemd-tjenesten <code>{name!s}</code>."
 
-#: 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:65
+msgid "Cannot enable systemd target <code>{name!s}</code>."
+msgstr "Kan ikke aktivere systemd-målet <code>{name!s}</code>."
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Konfigurerer OpenRC dmcrypt-tjeneste."
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer <code>{name!s}</code>."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target <code>{name!s}</code>."
+msgstr "Kan ikke deaktivere systemd-målet <code>{name!s}</code>."
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit <code>{name!s}</code>."
+msgstr "Kan ikke maskere systemd-enheden <code>{name!s}</code>."
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands <code>{command!s}</code> and "
+"<code>{suffix!s}</code> for unit {name!s}."
+msgstr ""
+"Ukendte systemd-kommandoer <code>{command!s}</code> og "
+"<code>{suffix!s}</code> til enheden {name!s}."
 
 #: src/modules/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -180,116 +174,77 @@ 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 ""
-"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
-msgstr ""
-"<code>systemctl {arg!s}</code>-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 <code>{name!s}</code>."
-msgstr "Kan ikke aktivere systemd-tjenesten <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "Kan ikke skrive KDM-konfigurationsfil"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target <code>{name!s}</code>."
-msgstr "Kan ikke aktivere systemd-målet <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "KDM-konfigurationsfil {!s} findes ikke"
 
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer <code>{name!s}</code>."
-msgstr ""
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "Kan ikke skrive LXDM-konfigurationsfil"
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target <code>{name!s}</code>."
-msgstr "Kan ikke deaktivere systemd-målet <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "LXDM-konfigurationsfil {!s} findes ikke"
 
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit <code>{name!s}</code>."
-msgstr "Kan ikke maskere systemd-enheden <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "Kan ikke skrive LightDM-konfigurationsfil"
 
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands <code>{command!s}</code> and "
-"<code>{suffix!s}</code> for unit {name!s}."
-msgstr ""
-"Ukendte systemd-kommandoer <code>{command!s}</code> og "
-"<code>{suffix!s}</code> til enheden {name!s}."
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "LightDM-konfigurationsfil {!s} findes ikke"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Dummy python-job."
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "Kan ikke konfigurere LightDM"
 
-#: 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/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr "Der er ikke installeret nogen LightDM greeter."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Installér bootloader."
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "Kan ikke skrive SLIM-konfigurationsfil"
 
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "SLIM-konfigurationsfil {!s} findes ikke"
 
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
+"Der er ikke valgt nogen displayhåndteringer til displayhåndtering-modulet."
 
-#: src/modules/bootloader/main.py:783
+#: src/modules/displaymanager/main.py:993
 msgid ""
-"The bootloader could not be installed. The installation command "
-"<pre>{!s}</pre> 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"
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
+"Displayhåndteringerlisten er tom eller udefineret i både globalstorage og "
+"displaymanager.conf."
 
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr ""
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr "Displayhåndtering-konfiguration er ikke komplet"
 
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr ""
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Konfigurerer mkinitcpio."
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
+#: 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 <pre>{!s}</pre> to use."
 msgstr ""
+"Der er ikke angivet noget rodmonteringspunkt som <pre>{!s}</pre> kan bruge."
 
-#: 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 <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
-msgstr ""
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Installerer data."
 
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
@@ -340,83 +295,128 @@ msgid ""
 msgstr ""
 "Stien til tjenesten {name!s} er <code>{path!s}</code>, 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/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Konfigurer Plymouth-tema"
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "Kan ikke skrive KDM-konfigurationsfil"
+#: 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/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "KDM-konfigurationsfil {!s} findes ikke"
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Forarbejder pakker (%(count)d / %(total)d)"
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "Kan ikke skrive LXDM-konfigurationsfil"
+#: 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/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "LXDM-konfigurationsfil {!s} findes ikke"
+#: 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/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "Kan ikke skrive LightDM-konfigurationsfil"
+#: 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/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "LightDM-konfigurationsfil {!s} findes ikke"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command <pre>{!s}</pre> "
+"returned error code {!s}."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "Kan ikke konfigurere LightDM"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command <pre>{!s}</pre>"
+" returned error code {!s}."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr "Der er ikke installeret nogen LightDM greeter."
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command <pre>{!s}</pre> returned error code {!s}."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "Kan ikke skrive SLIM-konfigurationsfil"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Installér bootloader."
 
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "SLIM-konfigurationsfil {!s} findes ikke"
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
 
-#: src/modules/displaymanager/main.py:992
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
 msgstr ""
-"Der er ikke valgt nogen displayhåndteringer til displayhåndtering-modulet."
 
-#: src/modules/displaymanager/main.py:993
+#: src/modules/bootloader/main.py:783
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"The bootloader could not be installed. The installation command "
+"<pre>{!s}</pre> returned error code {!s}."
 msgstr ""
-"Displayhåndteringerlisten er tom eller udefineret i både globalstorage og "
-"displaymanager.conf."
 
-#: src/modules/displaymanager/main.py:1075
-msgid "Display manager configuration was incomplete"
-msgstr "Displayhåndtering-konfiguration er ikke komplet"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Indstiller hardwareur."
+
+#: 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/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Indstiller hardwareur."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Konfigurerer OpenRC dmcrypt-tjeneste."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Installerer data."
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr "Skriver fstab."
+
+#: src/modules/fstab/main.py:429
+msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> 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 03803d311fe687cd44da5a5584caf36b271fd236..c4da5054ff8307de9a50e0f9e38240bd2f4f4bc9 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/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/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "GRUB konfigurieren."
 
-#: 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:42
+msgid "Mounting partitions."
+msgstr "Hänge Partitionen ein."
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command <pre>{!s}</pre> "
-"returned error code {!s}."
-msgstr ""
-"Der Paketmanager konnte die Aktualisierungen nicht vorbereiten. Der Befehl "
-"<pre>{!s}</pre> erzeugte Fehlercode {!s}."
+#: 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:738
-msgid ""
-"The package manager could not update the system. The command <pre>{!s}</pre>"
-" returned error code {!s}."
-msgstr ""
-"Der Paketmanager konnte das System nicht aktualisieren. Der Befehl "
-"<pre>{!s}</pre> erzeugte Fehlercode {!s}."
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr "Zpool konnte nicht importiert werden"
 
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command <pre>{!s}</pre> returned error code {!s}."
-msgstr ""
-"Der Paketmanager konnte das installierte System nicht verändern. Der Befehl "
-"<pre>{!s}</pre> erzeugte Fehlercode {!s}."
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr "Zpool konnte nicht entsperrt werden"
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Speichere Netzwerkkonfiguration."
+#: 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/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 <pre>{!s}</pre> to use."
+#: 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 <pre>{!s}</pre> to use."
+msgstr "Für <pre>{!s}</pre> sind keine zu verwendenden Partitionen definiert."
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr "Fehler beim Einhängen von ZFS"
+
+#: 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 ""
+"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
 msgstr ""
-"Für <pre>{!s}</pre> wurde kein Einhängepunkt für die Root-Partition "
-"angegeben."
+"<code>systemctl {arg!s}</code> Aufruf in chroot lieferte Fehlercode {num!s} "
+"zurück."
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Konfiguriere mkinitcpio. "
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service <code>{name!s}</code>."
+msgstr "Der systemd-Dienst <code>{name!s}</code> kann nicht aktiviert werden."
 
-#: 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
-msgid "No partitions are defined for <pre>{!s}</pre> to use."
-msgstr "Für <pre>{!s}</pre> sind keine zu verwendenden Partitionen definiert."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target <code>{name!s}</code>."
+msgstr "Das systemd-Ziel <code>{name!s}</code> kann nicht aktiviert werden."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Erstelle initramfs mit mkinitfs."
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer <code>{name!s}</code>."
+msgstr "Systemd-Timer <code>{name!s}</code> kann nicht aktiviert werden."
 
-#: 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:71
+msgid "Cannot disable systemd target <code>{name!s}</code>."
+msgstr "Das systemd-Ziel <code>{name!s}</code> kann nicht deaktiviert werden."
 
-#: 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:73
+msgid "Cannot mask systemd unit <code>{name!s}</code>."
+msgstr "Die systemd-Einheit <code>{name!s}</code> kann nicht maskiert 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:75
+msgid ""
+"Unknown systemd commands <code>{command!s}</code> and "
+"<code>{suffix!s}</code> for unit {name!s}."
+msgstr ""
+"Unbekannte systemd-Befehle <code>{command!s}</code> und "
+"<code>{suffix!s}</code> für Einheit {name!s}."
 
 #: src/modules/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -192,123 +180,77 @@ 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 ""
-"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
-msgstr ""
-"<code>systemctl {arg!s}</code> 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 <code>{name!s}</code>."
-msgstr "Der systemd-Dienst <code>{name!s}</code> kann nicht aktiviert werden."
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "Schreiben der KDM-Konfigurationsdatei nicht möglich"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target <code>{name!s}</code>."
-msgstr "Das systemd-Ziel <code>{name!s}</code> kann nicht aktiviert werden."
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "KDM-Konfigurationsdatei {!s} existiert nicht"
 
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer <code>{name!s}</code>."
-msgstr "Systemd-Timer <code>{name!s}</code> kann nicht aktiviert werden."
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "Schreiben der LXDM-Konfigurationsdatei nicht möglich"
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target <code>{name!s}</code>."
-msgstr "Das systemd-Ziel <code>{name!s}</code> kann nicht deaktiviert werden."
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "LXDM-Konfigurationsdatei {!s} existiert nicht"
 
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit <code>{name!s}</code>."
-msgstr "Die systemd-Einheit <code>{name!s}</code> kann nicht maskiert werden."
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "Schreiben der LightDM-Konfigurationsdatei nicht möglich"
 
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands <code>{command!s}</code> and "
-"<code>{suffix!s}</code> for unit {name!s}."
-msgstr ""
-"Unbekannte systemd-Befehle <code>{command!s}</code> und "
-"<code>{suffix!s}</code> für Einheit {name!s}."
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "LightDM-Konfigurationsdatei {!s} existiert nicht"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Dummy Python-Job"
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "Konfiguration von LightDM ist nicht möglich"
 
-#: 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/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr "Keine Benutzeroberfläche für LightDM installiert."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Installiere Bootloader."
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "Schreiben der SLIM-Konfigurationsdatei nicht möglich"
 
-#: 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/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "SLIM-Konfigurationsdatei {!s} existiert nicht"
 
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr "Fehler beim Installieren des Bootloaders"
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr "Keine Displaymanager für das Displaymanager-Modul ausgewählt."
 
-#: src/modules/bootloader/main.py:783
+#: src/modules/displaymanager/main.py:993
 msgid ""
-"The bootloader could not be installed. The installation command "
-"<pre>{!s}</pre> returned error code {!s}."
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
-"Der Bootloader konnte nicht installiert werden. Der Installationsbefehl "
-"<pre>{!s}</pre> 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"
+"Die Liste der Displaymanager ist leer oder weder in globalstorage noch in "
+"displaymanager.conf definiert."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Konfiguriere Plymouth-Thema"
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr "Die Konfiguration des Displaymanager war unvollständig."
 
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr "Schreibe fstab."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Konfiguriere mkinitcpio. "
 
-#: src/modules/fstab/main.py:429
-msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
+#: 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 <pre>{!s}</pre> to use."
 msgstr ""
-"Keine <pre>{!s}</pre> Konfiguration gegeben die <pre>{!s}</pre> benutzen "
-"könnte."
+"Für <pre>{!s}</pre> 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"
@@ -361,82 +303,140 @@ msgstr ""
 "Der Pfad für den Dienst {name!s} is <code>{path!s}</code>, 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/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Konfiguriere Plymouth-Thema"
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "Schreiben der KDM-Konfigurationsdatei nicht möglich"
+#: 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/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "KDM-Konfigurationsdatei {!s} existiert nicht"
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Verarbeite Pakete (%(count)d / %(total)d)"
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "Schreiben der LXDM-Konfigurationsdatei nicht möglich"
+#: 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/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "LXDM-Konfigurationsdatei {!s} existiert nicht"
+#: 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/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "Schreiben der LightDM-Konfigurationsdatei nicht möglich"
+#: 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/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "LightDM-Konfigurationsdatei {!s} existiert nicht"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command <pre>{!s}</pre> "
+"returned error code {!s}."
+msgstr ""
+"Der Paketmanager konnte die Aktualisierungen nicht vorbereiten. Der Befehl "
+"<pre>{!s}</pre> erzeugte Fehlercode {!s}."
 
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "Konfiguration von LightDM ist nicht möglich"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command <pre>{!s}</pre>"
+" returned error code {!s}."
+msgstr ""
+"Der Paketmanager konnte das System nicht aktualisieren. Der Befehl "
+"<pre>{!s}</pre> erzeugte Fehlercode {!s}."
 
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr "Keine Benutzeroberfläche für LightDM installiert."
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command <pre>{!s}</pre> returned error code {!s}."
+msgstr ""
+"Der Paketmanager konnte das installierte System nicht verändern. Der Befehl "
+"<pre>{!s}</pre> erzeugte Fehlercode {!s}."
 
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "Schreiben der SLIM-Konfigurationsdatei nicht möglich"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Installiere Bootloader."
 
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "SLIM-Konfigurationsdatei {!s} existiert nicht"
+#: 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/displaymanager/main.py:992
-msgid "No display managers selected for the displaymanager module."
-msgstr "Keine Displaymanager für das Displaymanager-Modul ausgewählt."
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr "Fehler beim Installieren des Bootloaders"
 
-#: src/modules/displaymanager/main.py:993
+#: src/modules/bootloader/main.py:783
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"The bootloader could not be installed. The installation command "
+"<pre>{!s}</pre> returned error code {!s}."
 msgstr ""
-"Die Liste der Displaymanager ist leer oder weder in globalstorage noch in "
-"displaymanager.conf definiert."
+"Der Bootloader konnte nicht installiert werden. Der Installationsbefehl "
+"<pre>{!s}</pre> erzeugte Fehlercode {!s}."
 
-#: src/modules/displaymanager/main.py:1075
-msgid "Display manager configuration was incomplete"
-msgstr "Die Konfiguration des Displaymanager war unvollständig."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Einstellen der Hardware-Uhr."
+
+#: 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/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Einstellen der Hardware-Uhr."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Konfiguriere den dmcrypt-Dienst von OpenRC."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Installiere Daten."
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr "Schreibe fstab."
+
+#: src/modules/fstab/main.py:429
+msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
+msgstr ""
+"Keine <pre>{!s}</pre> Konfiguration gegeben die <pre>{!s}</pre> 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 852b9a13270c28aa3a7ceda7888488c33a3b60eb..37fdd6641fe9cc628569ecc623c4db5fc2daba7e 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 <iefstathios@gmail.com>, 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/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr ""
 
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr ""
 
-#: 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:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr ""
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command <pre>{!s}</pre> "
-"returned error code {!s}."
+#: 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/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command <pre>{!s}</pre>"
-" returned error code {!s}."
+#: 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 <pre>{!s}</pre> to use."
 msgstr ""
 
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command <pre>{!s}</pre> returned error code {!s}."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 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/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
-msgid "Configuration Error"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 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 <pre>{!s}</pre> to use."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service <code>{name!s}</code>."
 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
-msgid "No partitions are defined for <pre>{!s}</pre> to use."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands <code>{command!s}</code> and "
+"<code>{suffix!s}</code> for unit {name!s}."
 msgstr ""
 
 #: src/modules/unpackfs/main.py:34
@@ -178,113 +170,73 @@ 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 ""
-"<code>systemctl {arg!s}</code> 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 <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands <code>{command!s}</code> and "
-"<code>{suffix!s}</code> for unit {name!s}."
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr ""
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "Αδυναμία ρύθμισης LightDM"
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/bootloader/main.py:783
+#: src/modules/displaymanager/main.py:993
 msgid ""
-"The bootloader could not be installed. The installation command "
-"<pre>{!s}</pre> 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"
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/initcpiocfg/main.py: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 <pre>{!s}</pre> to use."
 msgstr ""
 
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr "Εγγραγή fstab."
-
-#: src/modules/fstab/main.py:429
-msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
-msgstr ""
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Εγκατάσταση δεδομένων."
 
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
@@ -329,80 +281,128 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: 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/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Ρύθμιση GRUB."
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
+#: 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 <pre>{!s}</pre> "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command <pre>{!s}</pre>"
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command <pre>{!s}</pre> returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "Αδυναμία ρύθμισης LightDM"
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"<pre>{!s}</pre> returned error code {!s}."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:992
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:993
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:1075
-msgid "Display manager configuration was incomplete"
+#: 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/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Εγκατάσταση δεδομένων."
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr "Εγγραγή fstab."
+
+#: src/modules/fstab/main.py:429
+msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> 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 ac9021b4a2c23a35ded2c24d3d3ac66d8f8afa2b..911555c2c0d3283342f0fa471f7e6f3dff9a9e85 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/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr ""
 
-#: 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/mount/main.py:42
+msgid "Mounting partitions."
+msgstr ""
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command <pre>{!s}</pre> "
-"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 <pre>{!s}</pre>"
-" 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 <pre>{!s}</pre> 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 "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 "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 <pre>{!s}</pre> to use."
+#: 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 <pre>{!s}</pre> to use."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
 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
-msgid "No partitions are defined for <pre>{!s}</pre> to use."
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"<code>systemctl {arg!s}</code> 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 <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target <code>{name!s}</code>."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer <code>{name!s}</code>."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target <code>{name!s}</code>."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit <code>{name!s}</code>."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands <code>{command!s}</code> and "
+"<code>{suffix!s}</code> for unit {name!s}."
 msgstr ""
 
 #: src/modules/unpackfs/main.py:34
@@ -179,112 +171,72 @@ 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/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "Cannot write KDM configuration file"
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands <code>{command!s}</code> and "
-"<code>{suffix!s}</code> for unit {name!s}."
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
 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."
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr "Bootloader installation error"
-
-#: src/modules/bootloader/main.py:783
+#: src/modules/displaymanager/main.py:993
 msgid ""
-"The bootloader could not be installed. The installation command "
-"<pre>{!s}</pre> 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"
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
+#: 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 <pre>{!s}</pre> to use."
 msgstr ""
 
-#: src/modules/fstab/main.py:429
-msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
 
 #: src/modules/services-openrc/main.py:29
@@ -330,80 +282,128 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-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/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr ""
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Processing packages (%(count)d / %(total)d)"
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "Cannot write KDM configuration file"
+#: 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/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
+#: 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 <pre>{!s}</pre> "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command <pre>{!s}</pre>"
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command <pre>{!s}</pre> returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
+#: 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 "
+"<pre>{!s}</pre> returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:992
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:993
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:1075
-msgid "Display manager configuration was incomplete"
+#: 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/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
 msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> 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 6ea8e7c4b8a620c0fb13de10604e10e087334da4..f7a6c9c4759e7f05e87281f82b74a9f5607745db 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 <kurtphoenix@tuta.io>, 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/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr ""
 
-#: 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/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] "Instalante unu pakaĵo."
-msgstr[1] "Instalante %(num)d pakaĵoj."
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr ""
 
-#: 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/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr ""
 
-#: 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 <pre>{!s}</pre> "
-"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 <pre>{!s}</pre>"
-" returned error code {!s}."
+#: 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/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command <pre>{!s}</pre> returned error code {!s}."
+#: 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 <pre>{!s}</pre> to use."
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
 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/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
-msgid "Configuration Error"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 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 <pre>{!s}</pre> to use."
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
 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
-msgid "No partitions are defined for <pre>{!s}</pre> to use."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit <code>{name!s}</code>."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands <code>{command!s}</code> and "
+"<code>{suffix!s}</code> for unit {name!s}."
 msgstr ""
 
 #: src/modules/unpackfs/main.py:34
@@ -178,112 +170,72 @@ 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"
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands <code>{command!s}</code> and "
-"<code>{suffix!s}</code> for unit {name!s}."
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
 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."
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/bootloader/main.py:783
+#: src/modules/displaymanager/main.py:993
 msgid ""
-"The bootloader could not be installed. The installation command "
-"<pre>{!s}</pre> 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"
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
+#: 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 <pre>{!s}</pre> to use."
 msgstr ""
 
-#: src/modules/fstab/main.py:429
-msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
 
 #: src/modules/services-openrc/main.py:29
@@ -329,80 +281,128 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-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/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: 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/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command <pre>{!s}</pre> "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command <pre>{!s}</pre>"
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command <pre>{!s}</pre> returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"<pre>{!s}</pre> returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:992
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:993
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:1075
-msgid "Display manager configuration was incomplete"
+#: 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/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> 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 0a2ad73e5a9b66b13a9cc6aecf0ba9f3a9f9f13a..c29588f9bb49420455b3a4e46b4d86f0ab13cecc 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/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/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Configurar GRUB."
 
-#: 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/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "Montando las particiones."
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command <pre>{!s}</pre> "
-"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 "
-"<pre>{!s}</pre> 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 <pre>{!s}</pre>"
-" returned error code {!s}."
-msgstr ""
-"El gestor de paquetes no pudo actualizar el sistema; la orden "
-"<pre>{!s}</pre> 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 <pre>{!s}</pre> returned error code {!s}."
-msgstr ""
-"El gestor de paquetes no pudo realizar cambios en el sistema a instalar; la "
-"orden <pre>{!s}</pre> 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 <pre>{!s}</pre> to use."
-msgstr "No hay ningún punto de montaje en <pre>{!s}</pre> 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 <pre>{!s}</pre> to use."
 msgstr "No hay ninguna partición en <pre>{!s}</pre> 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 ""
+"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
+msgstr ""
+"La orden <code>systemctl {arg!s}</code> 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 <code>{name!s}</code>."
+msgstr "No se puede activar el servicio de systemd <code>{name!s}</code>."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target <code>{name!s}</code>."
+msgstr ""
+"No se puede activar el objetivo («target») de systemd <code>{name!s}</code>."
+
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer <code>{name!s}</code>."
+msgstr ""
+"No se puede activar el temporizador («timer») de systemd "
+"<code>{name!s}</code>."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target <code>{name!s}</code>."
+msgstr ""
+"No se puede desactivar el objetivo («target») de systemd "
+"<code>{name!s}</code>."
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit <code>{name!s}</code>."
+msgstr ""
+"No se puede enmascarar («mask») la unidad («unit») de systemd "
+"<code>{name!s}</code>."
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands <code>{command!s}</code> and "
+"<code>{suffix!s}</code> for unit {name!s}."
+msgstr ""
+"systemd no reconoce las órdenes <code>{command!s}</code> ni "
+"<code>{suffix!s}</code> para la unidad {name!s}."
 
 #: src/modules/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -194,132 +191,78 @@ 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 ""
-"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
-msgstr ""
-"La orden <code>systemctl {arg!s}</code> del «chroot» devolvió el código de "
-"error {num!s}."
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "No se puede escribir el archivo de configuración de KDM"
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service <code>{name!s}</code>."
-msgstr "No se puede activar el servicio de systemd <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "El archivo de configuración {!s} de KDM no existe"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target <code>{name!s}</code>."
-msgstr ""
-"No se puede activar el objetivo («target») de systemd <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "No se puede escribir el archivo de configuración LXDM"
 
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer <code>{name!s}</code>."
-msgstr ""
-"No se puede activar el temporizador («timer») de systemd "
-"<code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "El archivo de configuracion {!s} de LXDM no existe"
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target <code>{name!s}</code>."
-msgstr ""
-"No se puede desactivar el objetivo («target») de systemd "
-"<code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "No se puede escribir el archivo de configuración de LightDM"
 
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit <code>{name!s}</code>."
-msgstr ""
-"No se puede enmascarar («mask») la unidad («unit») de systemd "
-"<code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "El archivo de configuración {!s} de LightDM no existe"
 
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands <code>{command!s}</code> and "
-"<code>{suffix!s}</code> for unit {name!s}."
-msgstr ""
-"systemd no reconoce las órdenes <code>{command!s}</code> ni "
-"<code>{suffix!s}</code> para la unidad {name!s}."
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "No se puede configurar LightDM"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Tarea de python ficticia."
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr "No hay ningún menú de bienvenida («greeter») de LightDM instalado."
 
-#: 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/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "No se puede escribir el archivo de configuración de SLIM"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Instalar gestor de arranque."
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "El archivo de configuración {!s} de SLIM no existe"
 
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
 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"
+"No se ha elegido ningún gestor de pantalla para el módulo «displaymanager»."
 
-#: src/modules/bootloader/main.py:783
+#: src/modules/displaymanager/main.py:993
 msgid ""
-"The bootloader could not be installed. The installation command "
-"<pre>{!s}</pre> returned error code {!s}."
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
-"No se pudo instalar el cargador de arranque; la orden de instalación "
-"<pre>{!s}</pre> 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."
+"La lista de gestores de pantalla está vacía o sin definir tanto en "
+"«globalstorage» como en «displaymanager.conf»."
 
-#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
-msgid "Internal error mounting zfs datasets"
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
 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"
+"La configuración del gestor de pantalla («display manager») estaba "
+"incompleta"
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Configurar tema de Plymouth"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Configurando «mkinitcpio»."
 
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr "Escribiendo el «fstab»."
+#: 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 <pre>{!s}</pre> to use."
+msgstr "No hay ningún punto de montaje en <pre>{!s}</pre> que se pueda usar."
 
-#: src/modules/fstab/main.py:429
-msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
-msgstr ""
-"No se proporciona ninguna configuración de <pre>{!s}</pre> que "
-"<pre>{!s}</pre> 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"
@@ -375,85 +318,142 @@ msgid ""
 msgstr ""
 "La ruta para el servicio {name!s} es <code>{path!s}</code>, 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"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Configurar tema de Plymouth"
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "El archivo de configuración {!s} de KDM no existe"
+#: 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/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "No se puede escribir el archivo de configuración LXDM"
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Procesando paquetes (%(count)d / %(total)d)"
 
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "El archivo de configuracion {!s} de LXDM no existe"
+#: 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/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "No se puede escribir el archivo de configuración de LightDM"
+#: 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/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "El archivo de configuración {!s} de LightDM no existe"
+#: 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/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "No se puede configurar LightDM"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command <pre>{!s}</pre> "
+"returned error code {!s}."
+msgstr ""
+"El gestor de paquetes no pudo preparar las actualizaciones; la orden "
+"<pre>{!s}</pre> devolvió el código de error {!s}."
 
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr "No hay ningún menú de bienvenida («greeter») de LightDM instalado."
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command <pre>{!s}</pre>"
+" returned error code {!s}."
+msgstr ""
+"El gestor de paquetes no pudo actualizar el sistema; la orden "
+"<pre>{!s}</pre> devolvió el código de error {!s}."
 
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "No se puede escribir el archivo de configuración de SLIM"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command <pre>{!s}</pre> returned error code {!s}."
+msgstr ""
+"El gestor de paquetes no pudo realizar cambios en el sistema a instalar; la "
+"orden <pre>{!s}</pre> devolvió el código de error {!s}."
 
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "El archivo de configuración {!s} de SLIM no existe"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Instalar gestor de arranque."
 
-#: src/modules/displaymanager/main.py:992
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
 msgstr ""
-"No se ha elegido ningún gestor de pantalla para el módulo «displaymanager»."
+"Hubo un error al instalar «grub»; no hay particiones definidas en el "
+"almacenamiento global"
 
-#: src/modules/displaymanager/main.py:993
+#: 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 displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"The bootloader could not be installed. The installation command "
+"<pre>{!s}</pre> returned error code {!s}."
 msgstr ""
-"La lista de gestores de pantalla está vacía o sin definir tanto en "
-"«globalstorage» como en «displaymanager.conf»."
+"No se pudo instalar el cargador de arranque; la orden de instalación "
+"<pre>{!s}</pre> devolvió el código de error {!s}."
 
-#: src/modules/displaymanager/main.py:1075
-msgid "Display manager configuration was incomplete"
-msgstr ""
-"La configuración del gestor de pantalla («display manager») estaba "
-"incompleta"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Ajustando el reloj interno del equipo."
+
+#: 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/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Ajustando el reloj interno del equipo."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Configurando el servicio de arranque cifrado «dmcrypt» para OpenRC "
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Instalando los datos."
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr "Escribiendo el «fstab»."
+
+#: src/modules/fstab/main.py:429
+msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
+msgstr ""
+"No se proporciona ninguna configuración de <pre>{!s}</pre> que "
+"<pre>{!s}</pre> 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 97912062d92ecb04f27eb842229dc0ede5524009..f67f07e39fbfb6229e4c9c0b5e4a4a7651fec437 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 <guillopacheco@gmail.com>, 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/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/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Configura GRUB."
 
-#: 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/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "Montando particiones."
 
-#: 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 <pre>{!s}</pre> "
-"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 <pre>{!s}</pre>"
-" 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 <pre>{!s}</pre> 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 <pre>{!s}</pre> to use."
+#: 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 <pre>{!s}</pre> to use."
+msgstr "No hay particiones definidas para que <pre>{!s}</pre> use."
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Configurando mkinitcpio"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Configura los servicios de systemd"
 
-#: 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
-msgid "No partitions are defined for <pre>{!s}</pre> to use."
-msgstr "No hay particiones definidas para que <pre>{!s}</pre> use."
+#: 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/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Creando initramfs con mkinitfs."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
+msgstr ""
+"La llamada de: <code>systemctl {arg!s}</code> en chroot retorna código de "
+"error {num!s}."
 
-#: 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:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service <code>{name!s}</code>."
+msgstr "No se puede habilitar el servicio <code>{name!s}</code> 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:65
+msgid "Cannot enable systemd target <code>{name!s}</code>."
+msgstr "No se puede habilitar el objetivo <code>{name!s}</code> de systemd."
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Configurando el servicio OpenRc dmcrypt."
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer <code>{name!s}</code>."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target <code>{name!s}</code>."
+msgstr ""
+"No se puede deshabilitar el objetivo <code>{name!s}</code> de systemd."
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit <code>{name!s}</code>."
+msgstr "No se puede enmascarar la unidad <code>{name!s}</code> de systemd."
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands <code>{command!s}</code> and "
+"<code>{suffix!s}</code> for unit {name!s}."
+msgstr ""
+"systemd no reconoce los comandos <code>{command!s}</code> y "
+"<code>{suffix!s}</code>para la unidad {name!s}."
 
 #: src/modules/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -184,118 +179,75 @@ 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 ""
-"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
-msgstr ""
-"La llamada de: <code>systemctl {arg!s}</code> 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 <code>{name!s}</code>."
-msgstr "No se puede habilitar el servicio <code>{name!s}</code> de systemd."
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "No se puede escribir el archivo de configuración de KDM"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target <code>{name!s}</code>."
-msgstr "No se puede habilitar el objetivo <code>{name!s}</code> de systemd."
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "El archivo de configuración de KDM {!s} no existe"
 
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer <code>{name!s}</code>."
-msgstr ""
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "No se puede escribir el archivo de configuración de LXDM"
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target <code>{name!s}</code>."
-msgstr ""
-"No se puede deshabilitar el objetivo <code>{name!s}</code> de systemd."
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "El archivo de configuración de LXDM {!s} no existe"
 
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit <code>{name!s}</code>."
-msgstr "No se puede enmascarar la unidad <code>{name!s}</code> de systemd."
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "No se puede escribir el archivo de configuración de LightDM"
 
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands <code>{command!s}</code> and "
-"<code>{suffix!s}</code> for unit {name!s}."
-msgstr ""
-"systemd no reconoce los comandos <code>{command!s}</code> y "
-"<code>{suffix!s}</code>para la unidad {name!s}."
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "El archivo de configuración de LightDM {!s} no existe"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Trabajo python ficticio."
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "No se puede configurar LightDM"
 
-#: 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/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr "LightDM greeter no está instalado."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Instalar el cargador de arranque."
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "No se puede escribir el archivo de configuración de SLIM"
 
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr "No se seleccionaron gestores para el módulo de gestor de pantalla."
 
-#: src/modules/bootloader/main.py:783
+#: src/modules/displaymanager/main.py:993
 msgid ""
-"The bootloader could not be installed. The installation command "
-"<pre>{!s}</pre> 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"
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
+"La lista de gestores de pantalla está vacía o indefinida tanto en el "
+"globalstorage como en el displaymanager.conf."
 
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr ""
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr "La configuración del gestor de pantalla estaba incompleta"
 
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr ""
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Configurando mkinitcpio"
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
+#: 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 <pre>{!s}</pre> to use."
 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 <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> 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"
@@ -340,82 +292,130 @@ msgid ""
 "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/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Configurando el tema de Plymouth"
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "No se puede escribir el archivo de configuración de KDM"
+#: 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/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "El archivo de configuración de KDM {!s} no existe"
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Procesando paquetes (%(count)d/%(total)d)"
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "No se puede escribir el archivo de configuración de LXDM"
+#: 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/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "El archivo de configuración de LXDM {!s} no existe"
+#: 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/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "No se puede escribir el archivo de configuración de LightDM"
+#: 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/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "El archivo de configuración de LightDM {!s} no existe"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command <pre>{!s}</pre> "
+"returned error code {!s}."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "No se puede configurar LightDM"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command <pre>{!s}</pre>"
+" returned error code {!s}."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr "LightDM greeter no está instalado."
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command <pre>{!s}</pre> returned error code {!s}."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "No se puede escribir el archivo de configuración de SLIM"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Instalar el cargador de arranque."
 
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:992
-msgid "No display managers selected for the displaymanager module."
-msgstr "No se seleccionaron gestores para el módulo de gestor de pantalla."
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
 
-#: src/modules/displaymanager/main.py:993
+#: src/modules/bootloader/main.py:783
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"The bootloader could not be installed. The installation command "
+"<pre>{!s}</pre> returned error code {!s}."
 msgstr ""
-"La lista de gestores de pantalla está vacía o indefinida tanto en el "
-"globalstorage como en el displaymanager.conf."
 
-#: src/modules/displaymanager/main.py:1075
-msgid "Display manager configuration was incomplete"
-msgstr "La configuración del gestor de pantalla estaba incompleta"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Configurando el reloj del hardware."
+
+#: 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/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Configurando el reloj del hardware."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Configurando el servicio OpenRc dmcrypt."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Instalando data."
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr "Escribiento fstab."
+
+#: src/modules/fstab/main.py:429
+msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> 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 25e3cceb5e44589b8d01b58fd76aebdc0befb80d..a1b120382664b8b518e12ea649d3b34ae70d5115 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/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr ""
 
-#: 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/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr ""
 
-#: 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 <pre>{!s}</pre> "
-"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 <pre>{!s}</pre>"
-" returned error code {!s}."
+#: 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/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command <pre>{!s}</pre> returned error code {!s}."
+#: 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 <pre>{!s}</pre> to use."
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
 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/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
-msgid "Configuration Error"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 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 <pre>{!s}</pre> to use."
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
 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
-msgid "No partitions are defined for <pre>{!s}</pre> to use."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit <code>{name!s}</code>."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands <code>{command!s}</code> and "
+"<code>{suffix!s}</code> for unit {name!s}."
 msgstr ""
 
 #: src/modules/unpackfs/main.py:34
@@ -176,112 +166,72 @@ 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 ""
-"<code>systemctl {arg!s}</code> 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 <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands <code>{command!s}</code> and "
-"<code>{suffix!s}</code> for unit {name!s}."
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/bootloader/main.py:783
+#: src/modules/displaymanager/main.py:993
 msgid ""
-"The bootloader could not be installed. The installation command "
-"<pre>{!s}</pre> 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"
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
+#: 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 <pre>{!s}</pre> to use."
 msgstr ""
 
-#: src/modules/fstab/main.py:429
-msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
 
 #: src/modules/services-openrc/main.py:29
@@ -327,80 +277,130 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: 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."
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
+#: 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/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command <pre>{!s}</pre> "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command <pre>{!s}</pre>"
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command <pre>{!s}</pre> returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"<pre>{!s}</pre> returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:992
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:993
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:1075
-msgid "Display manager configuration was incomplete"
+#: 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/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> 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 4dfabe52a74a24f0bcd1869e4d38124255d6eb75..634cf4230673d280f3fa9231adf0887141edaa6b 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/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr ""
 
-#: 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/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] "Paigaldan ühe paketi."
-msgstr[1] "Paigaldan %(num)d paketti."
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr ""
 
-#: 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/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr ""
 
-#: 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 <pre>{!s}</pre> "
-"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 <pre>{!s}</pre>"
-" returned error code {!s}."
+#: 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/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command <pre>{!s}</pre> returned error code {!s}."
+#: 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 <pre>{!s}</pre> to use."
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
 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/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
-msgid "Configuration Error"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 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 <pre>{!s}</pre> to use."
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
 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
-msgid "No partitions are defined for <pre>{!s}</pre> to use."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit <code>{name!s}</code>."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands <code>{command!s}</code> and "
+"<code>{suffix!s}</code> for unit {name!s}."
 msgstr ""
 
 #: src/modules/unpackfs/main.py:34
@@ -178,112 +170,72 @@ 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/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "KDM-konfiguratsioonifaili ei saa kirjutada"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
-msgstr ""
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "KDM-konfiguratsioonifail {!s} puudub"
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service <code>{name!s}</code>."
-msgstr ""
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "LXDM-konfiguratsioonifaili ei saa kirjutada"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target <code>{name!s}</code>."
-msgstr ""
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "LXDM-konfiguratsioonifail {!s} puudub"
 
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer <code>{name!s}</code>."
-msgstr ""
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "LightDM-konfiguratsioonifaili ei saa kirjutada"
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target <code>{name!s}</code>."
-msgstr ""
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "LightDM-konfiguratsioonifail {!s} puudub"
 
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit <code>{name!s}</code>."
-msgstr ""
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "LightDM seadistamine ebaõnnestus"
 
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands <code>{command!s}</code> and "
-"<code>{suffix!s}</code> for unit {name!s}."
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
 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/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "SLIM-konfiguratsioonifaili ei saa kirjutada"
 
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "SLIM-konfiguratsioonifail {!s} puudub"
 
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/bootloader/main.py:783
+#: src/modules/displaymanager/main.py:993
 msgid ""
-"The bootloader could not be installed. The installation command "
-"<pre>{!s}</pre> 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"
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
+#: 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 <pre>{!s}</pre> to use."
 msgstr ""
 
-#: src/modules/fstab/main.py:429
-msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
 
 #: src/modules/services-openrc/main.py:29
@@ -329,80 +281,128 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-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/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: 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/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "KDM-konfiguratsioonifaili ei saa kirjutada"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command <pre>{!s}</pre> "
+"returned error code {!s}."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "KDM-konfiguratsioonifail {!s} puudub"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command <pre>{!s}</pre>"
+" returned error code {!s}."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "LXDM-konfiguratsioonifaili ei saa kirjutada"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command <pre>{!s}</pre> returned error code {!s}."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "LXDM-konfiguratsioonifail {!s} puudub"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "LightDM-konfiguratsioonifaili ei saa kirjutada"
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
 
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "LightDM-konfiguratsioonifail {!s} puudub"
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
 
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "LightDM seadistamine ebaõnnestus"
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"<pre>{!s}</pre> returned error code {!s}."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "SLIM-konfiguratsioonifaili ei saa kirjutada"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "SLIM-konfiguratsioonifail {!s} puudub"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr ""
 
-#: src/modules/displaymanager/main.py:992
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:993
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:1075
-msgid "Display manager configuration was incomplete"
+#: 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/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> 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 c9c388fd3c85b24f4237925281553c05cc7d1f96..750b0465fb62676551238053a426e3dd87094d78 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/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr ""
 
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Paketeak prozesatzen (%(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] "Pakete bat instalatzen."
-msgstr[1] "%(num)dpakete instalatzen."
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr ""
 
-#: 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/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr ""
 
-#: 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 <pre>{!s}</pre> "
-"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 <pre>{!s}</pre>"
-" returned error code {!s}."
+#: 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/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command <pre>{!s}</pre> returned error code {!s}."
+#: 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 <pre>{!s}</pre> to use."
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
 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/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
-msgid "Configuration Error"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 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 <pre>{!s}</pre> to use."
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
 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
-msgid "No partitions are defined for <pre>{!s}</pre> to use."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit <code>{name!s}</code>."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands <code>{command!s}</code> and "
+"<code>{suffix!s}</code> for unit {name!s}."
 msgstr ""
 
 #: src/modules/unpackfs/main.py:34
@@ -178,112 +170,73 @@ 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 ""
-"<code>systemctl {arg!s}</code> 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 <code>{name!s}</code>."
-msgstr ""
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "Ezin da KDM konfigurazio fitxategia idatzi"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target <code>{name!s}</code>."
-msgstr ""
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "KDM konfigurazio fitxategia {!s} ez da existitzen"
 
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer <code>{name!s}</code>."
-msgstr ""
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "Ezin da LXDM konfigurazio fitxategia idatzi"
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target <code>{name!s}</code>."
-msgstr ""
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "LXDM konfigurazio fitxategia {!s} ez da existitzen"
 
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit <code>{name!s}</code>."
-msgstr ""
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "Ezin da LightDM konfigurazio fitxategia idatzi"
 
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands <code>{command!s}</code> and "
-"<code>{suffix!s}</code> for unit {name!s}."
-msgstr ""
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "LightDM konfigurazio fitxategia {!s} ez da existitzen"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Dummy python lana."
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "Ezin da LightDM konfiguratu"
 
-#: 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/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr "Ez dago LightDM harrera instalatua."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "Ezin da SLIM konfigurazio fitxategia idatzi"
 
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "SLIM konfigurazio fitxategia {!s} ez da existitzen"
 
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
+"Ez da pantaila kudeatzailerik aukeratu pantaila-kudeatzaile modulurako."
 
-#: src/modules/bootloader/main.py:783
+#: src/modules/displaymanager/main.py:993
 msgid ""
-"The bootloader could not be installed. The installation command "
-"<pre>{!s}</pre> 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"
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr ""
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr "Pantaila kudeatzaile konfigurazioa osotu gabe"
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
+#: 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 <pre>{!s}</pre> to use."
 msgstr ""
 
-#: src/modules/fstab/main.py:429
-msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
 
 #: src/modules/services-openrc/main.py:29
@@ -329,81 +282,128 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-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/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: 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/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "Ezin da KDM konfigurazio fitxategia idatzi"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command <pre>{!s}</pre> "
+"returned error code {!s}."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "KDM konfigurazio fitxategia {!s} ez da existitzen"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command <pre>{!s}</pre>"
+" returned error code {!s}."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "Ezin da LXDM konfigurazio fitxategia idatzi"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command <pre>{!s}</pre> returned error code {!s}."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "LXDM konfigurazio fitxategia {!s} ez da existitzen"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "Ezin da LightDM konfigurazio fitxategia idatzi"
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
 
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "LightDM konfigurazio fitxategia {!s} ez da existitzen"
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
 
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "Ezin da LightDM konfiguratu"
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"<pre>{!s}</pre> returned error code {!s}."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr "Ez dago LightDM harrera instalatua."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "Ezin da SLIM konfigurazio fitxategia idatzi"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "SLIM konfigurazio fitxategia {!s} ez da existitzen"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr ""
 
-#: src/modules/displaymanager/main.py:992
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
-"Ez da pantaila kudeatzailerik aukeratu pantaila-kudeatzaile modulurako."
 
-#: src/modules/displaymanager/main.py:993
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:1075
-msgid "Display manager configuration was incomplete"
-msgstr "Pantaila kudeatzaile konfigurazioa osotu gabe"
+#: 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/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> 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 88111cffaa3c28a15a3d6e79188a53ee81b7aeb8..a76d6d1aba51ebfb4681f238b68d5503a76d4af2 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 <me@mahdym.ir>, 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/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/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "در حال پیکربندی گراب."
 
-#: 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:42
+msgid "Mounting partitions."
+msgstr "در حال سوار کردن افرازها."
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command <pre>{!s}</pre> "
-"returned error code {!s}."
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
 msgstr ""
-"مدیر بسته نتوانست برای بروزرسانی ها آماده شود، دستور <pre>{!s}</pre> با خطای"
-" {!s} مواجه شد."
 
-#: src/modules/packages/main.py:738
-msgid ""
-"The package manager could not update the system. The command <pre>{!s}</pre>"
-" returned error code {!s}."
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
 msgstr ""
-"مدیر بسته نتوانست سامانه را بروز کند. دستور <pre>{!s}</pre> با خطای {!s} "
-"مواجه شد."
 
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command <pre>{!s}</pre> returned error code {!s}."
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
 msgstr ""
-"مدیر بسته نتوانست تغییرات را برای نصب سامانه انجام دهد. دستور "
-"<pre>{!s}</pre> با خطای {!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 <pre>{!s}</pre> to use."
-msgstr "هیچ نقطهٔ اتّصال ریشه‌ای برای استفادهٔ <pre>{!s}</pre> داده نشده."
-
-#: 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 <pre>{!s}</pre> to use."
 msgstr "هیچ افرازی برای استفادهٔ <pre>{!s}</pre> تعریف نشده."
 
-#: 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 ""
+"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
+msgstr ""
+"فراخوانی <code>systemctl {arg!s}</code> در chroot رمز خطای {num!s} را "
+"برگرداند."
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service <code>{name!s}</code>."
+msgstr "نمی‌توان خدمت سیستم‌دی <code>{name!s}</code> را به کار انداخت."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target <code>{name!s}</code>."
+msgstr "نمی‌توان هدف سیستم‌دی <code>{name!s}</code> را به کار انداخت."
+
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer <code>{name!s}</code>."
+msgstr "نمی‌توان تایمر سیستم‌دی <code>{name!s}</code> را به کار انداخت."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target <code>{name!s}</code>."
+msgstr "نمی‌توان خدمت سیستم‌دی <code>{name!s}</code> را از کار انداخت."
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit <code>{name!s}</code>."
+msgstr "نمی‌توان واحد سیستم‌دی <code>{name!s}</code> را پوشاند."
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands <code>{command!s}</code> and "
+"<code>{suffix!s}</code> for unit {name!s}."
+msgstr ""
+"دستورات ناشناختهٔ سیستم‌دی <code>{command!s}</code> و "
+"<code>{suffix!s}</code> برای واحد {name!s}."
 
 #: src/modules/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -186,120 +176,75 @@ 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 ""
-"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
-msgstr ""
-"فراخوانی <code>systemctl {arg!s}</code> در chroot رمز خطای {num!s} را "
-"برگرداند."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service <code>{name!s}</code>."
-msgstr "نمی‌توان خدمت سیستم‌دی <code>{name!s}</code> را به کار انداخت."
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "نمی‌توان پروندهٔ پیکربندی KDM را نوشت"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target <code>{name!s}</code>."
-msgstr "نمی‌توان هدف سیستم‌دی <code>{name!s}</code> را به کار انداخت."
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "پروندهٔ پیکربندی {!s} وجود ندارد"
 
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer <code>{name!s}</code>."
-msgstr "نمی‌توان تایمر سیستم‌دی <code>{name!s}</code> را به کار انداخت."
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "نمی‌توان پروندهٔ پیکربندی LXDM را نوشت"
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target <code>{name!s}</code>."
-msgstr "نمی‌توان خدمت سیستم‌دی <code>{name!s}</code> را از کار انداخت."
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "پروندهٔ پیکربندی {!s} وجود ندارد"
 
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit <code>{name!s}</code>."
-msgstr "نمی‌توان واحد سیستم‌دی <code>{name!s}</code> را پوشاند."
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "نمی‌توان پروندهٔ پیکربندی LightDM را نوشت"
 
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands <code>{command!s}</code> and "
-"<code>{suffix!s}</code> for unit {name!s}."
-msgstr ""
-"دستورات ناشناختهٔ سیستم‌دی <code>{command!s}</code> و "
-"<code>{suffix!s}</code> برای واحد {name!s}."
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "پروندهٔ پیکربندی {!s} وجود ندارد"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "کار پایتونی الکی."
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "نمی‌توان LightDM را پیکربندی کرد"
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "گام پایتونی الکی {}"
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr "هیچ خوش‌آمدگوی LightDMای نصب نشده."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "نصب بارکنندهٔ راه‌اندازی."
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "نمی‌توان پروندهٔ پیکربندی LightDM را نوشت"
 
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "پروندهٔ پیکربندی {!s} وجود ندارد"
 
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr "خطای نصب بوت لودر"
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr "هیچ مدیر نمایشی برای پیمانهٔ displaymanager گزیده نشده."
 
-#: src/modules/bootloader/main.py:783
+#: src/modules/displaymanager/main.py:993
 msgid ""
-"The bootloader could not be installed. The installation command "
-"<pre>{!s}</pre> returned error code {!s}."
-msgstr ""
-"بوت لودر نتوانست نصب شود. دستور <pre>{!s}</pre> برای نصب با خطای {!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"
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
+"فهرست مدیریت صفحه نمایش ها خالی بوده یا در محل ذخیره داده و "
+"displaymanager.conf تعریف نشده است."
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr ""
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr "پیکربندی مدیر نمایش کامل نبود"
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "در حال پیکربندی زمینهٔ پلی‌موث"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "پیکربندی mkinitcpio."
 
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr "در حال نوشتن fstab."
+#: 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 <pre>{!s}</pre> to use."
+msgstr "هیچ نقطهٔ اتّصال ریشه‌ای برای استفادهٔ <pre>{!s}</pre> داده نشده."
 
-#: src/modules/fstab/main.py:429
-msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
-msgstr ""
-"هیچ تنظیمات <pre>{!s}</pre> برای استفاده برای <pre>{!s}</pre> داده نشده است."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "داده‌های نصب"
 
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
@@ -351,82 +296,137 @@ msgid ""
 msgstr ""
 "مسیر برای سرویس {name!s} برابر <code>{path!s}</code> است، که وجود ندارد."
 
-#: 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/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "در حال پیکربندی زمینهٔ پلی‌موث"
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "نمی‌توان پروندهٔ پیکربندی KDM را نوشت"
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "نصب بسته‌ها."
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "پروندهٔ پیکربندی {!s} وجود ندارد"
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "در حال پردازش بسته‌ها (%(count)d/%(total)d)"
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "نمی‌توان پروندهٔ پیکربندی LXDM را نوشت"
+#: 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/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "پروندهٔ پیکربندی {!s} وجود ندارد"
+#: 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/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "نمی‌توان پروندهٔ پیکربندی LightDM را نوشت"
+#: 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/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "پروندهٔ پیکربندی {!s} وجود ندارد"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command <pre>{!s}</pre> "
+"returned error code {!s}."
+msgstr ""
+"مدیر بسته نتوانست برای بروزرسانی ها آماده شود، دستور <pre>{!s}</pre> با خطای"
+" {!s} مواجه شد."
 
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "نمی‌توان LightDM را پیکربندی کرد"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command <pre>{!s}</pre>"
+" returned error code {!s}."
+msgstr ""
+"مدیر بسته نتوانست سامانه را بروز کند. دستور <pre>{!s}</pre> با خطای {!s} "
+"مواجه شد."
 
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr "هیچ خوش‌آمدگوی LightDMای نصب نشده."
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command <pre>{!s}</pre> returned error code {!s}."
+msgstr ""
+"مدیر بسته نتوانست تغییرات را برای نصب سامانه انجام دهد. دستور "
+"<pre>{!s}</pre> با خطای {!s} مواجه شد."
 
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "نمی‌توان پروندهٔ پیکربندی LightDM را نوشت"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "نصب بارکنندهٔ راه‌اندازی."
 
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "پروندهٔ پیکربندی {!s} وجود ندارد"
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
 
-#: src/modules/displaymanager/main.py:992
-msgid "No display managers selected for the displaymanager module."
-msgstr "هیچ مدیر نمایشی برای پیمانهٔ displaymanager گزیده نشده."
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr "خطای نصب بوت لودر"
 
-#: src/modules/displaymanager/main.py:993
+#: src/modules/bootloader/main.py:783
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"The bootloader could not be installed. The installation command "
+"<pre>{!s}</pre> returned error code {!s}."
 msgstr ""
-"فهرست مدیریت صفحه نمایش ها خالی بوده یا در محل ذخیره داده و "
-"displaymanager.conf تعریف نشده است."
+"بوت لودر نتوانست نصب شود. دستور <pre>{!s}</pre> برای نصب با خطای {!s} مواجه "
+"شد."
 
-#: src/modules/displaymanager/main.py:1075
-msgid "Display manager configuration was incomplete"
-msgstr "پیکربندی مدیر نمایش کامل نبود"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+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/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "در حال تنظیم ساعت سخت‌افزاری."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "در حال پیکربندی خدمت dmcrypt OpenRC."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "داده‌های نصب"
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr "در حال نوشتن fstab."
+
+#: src/modules/fstab/main.py:429
+msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
+msgstr ""
+"هیچ تنظیمات <pre>{!s}</pre> برای استفاده برای <pre>{!s}</pre> داده نشده است."
+
+#: 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 4c4e26489ea9692ffa204484dfb434928503c17b..8cf356fdaa1c9b86632acaea458e71c33c09665e 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 <jiri.gronroos@iki.fi>, 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/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/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Määritä GRUB."
 
-#: 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:42
+msgid "Mounting partitions."
+msgstr "Liitetään osioita."
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command <pre>{!s}</pre> "
-"returned error code {!s}."
-msgstr ""
-"Paketinhallinta ei voinut valmistella päivityksiä. Komento <pre>{!s}</pre> "
-"palautti virhekoodin {!s}."
+#: 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:738
-msgid ""
-"The package manager could not update the system. The command <pre>{!s}</pre>"
-" returned error code {!s}."
-msgstr ""
-"Paketinhallinta ei voinut päivittää järjestelmää. Komento <pre>{!s}</pre> "
-"palautti virhekoodin {!s}."
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr "Zpoolin tuonti epäonnistui"
 
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command <pre>{!s}</pre> returned error code {!s}."
-msgstr ""
-"Paketinhallinta ei voinut tehdä muutoksia asennettuun järjestelmään. Komento"
-" <pre>{!s}</pre> palautti virhekoodin {!s}."
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr "Zpoolin lukituksen avaaminen epäonnistui"
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Tallennetaan verkon määrityksiä."
+#: 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/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 <pre>{!s}</pre> to use."
-msgstr "Kohteelle <pre>{!s}</pre> 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 <pre>{!s}</pre> to use."
 msgstr "Osioita ei ole määritetty käytettäväksi kohteelle <pre>{!s}</pre> ."
 
-#: 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 ""
+"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
+msgstr "<code>systemctl {arg!s}</code> 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 <code>{name!s}</code>."
+msgstr "Systemd-palvelua <code>{name!s}</code> ei voi ottaa käyttöön."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target <code>{name!s}</code>."
+msgstr "Systemd-kohdetta <code>{name!s}</code> ei voi ottaa käyttöön."
+
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer <code>{name!s}</code>."
+msgstr "Systemd-ajastinta <code>{name!s}</code> ei voi ottaa käyttöön."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target <code>{name!s}</code>."
+msgstr "Systemd-kohdetta <code>{name!s}</code> ei voi poistaa käytöstä."
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit <code>{name!s}</code>."
+msgstr "Ei voi peittää systemd-yksikköä <code>{name!s}</code>."
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands <code>{command!s}</code> and "
+"<code>{suffix!s}</code> for unit {name!s}."
+msgstr ""
+"Tuntemattomia systemd-komentoja <code>{command!s}</code> ja "
+"<code>{suffix!s}</code> yksikölle {name!s}."
 
 #: src/modules/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -187,120 +175,75 @@ 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 ""
-"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
-msgstr "<code>systemctl {arg!s}</code> 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 <code>{name!s}</code>."
-msgstr "Systemd-palvelua <code>{name!s}</code> ei voi ottaa käyttöön."
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "KDM-määritystiedostoa ei voi kirjoittaa"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target <code>{name!s}</code>."
-msgstr "Systemd-kohdetta <code>{name!s}</code> ei voi ottaa käyttöön."
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "KDM-määritystiedostoa {!s} ei ole olemassa"
 
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer <code>{name!s}</code>."
-msgstr "Systemd-ajastinta <code>{name!s}</code> ei voi ottaa käyttöön."
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "LXDM-määritystiedostoa ei voi kirjoittaa"
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target <code>{name!s}</code>."
-msgstr "Systemd-kohdetta <code>{name!s}</code> ei voi poistaa käytöstä."
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "LXDM-määritystiedostoa {!s} ei ole olemassa"
 
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit <code>{name!s}</code>."
-msgstr "Ei voi peittää systemd-yksikköä <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "LightDM-määritystiedostoa ei voi kirjoittaa"
 
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands <code>{command!s}</code> and "
-"<code>{suffix!s}</code> for unit {name!s}."
-msgstr ""
-"Tuntemattomia systemd-komentoja <code>{command!s}</code> ja "
-"<code>{suffix!s}</code> yksikölle {name!s}."
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "LightDM-määritystiedostoa {!s} ei ole olemassa"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Dummy-mallinen python-työ."
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "LightDM-määritysvirhe"
 
-#: 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/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr "LightDM:ää ei ole asennettu."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Asenna käynnistyslatain."
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "SLIM-määritystiedostoa ei voi kirjoittaa"
 
-#: 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/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "SLIM-määritystiedostoa {!s} ei ole olemassa"
 
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr "Käynnistyslataimen asennusvirhe"
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr "Displaymanager-moduulia varten ei ole valittu näytönhallintaa."
 
-#: src/modules/bootloader/main.py:783
+#: src/modules/displaymanager/main.py:993
 msgid ""
-"The bootloader could not be installed. The installation command "
-"<pre>{!s}</pre> returned error code {!s}."
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
-"Käynnistyslatainta ei voitu asentaa. Asennuskomento <pre>{!s}</pre> 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"
+"Luettelo on tyhjä tai määrittelemätön, sekä globalstorage, että "
+"displaymanager.conf tiedostossa."
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr "zfs-liitosvirhe"
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr "Näytönhallinnan kokoonpano oli puutteellinen"
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Määritä Plymouthin teema"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Määritetään mkinitcpio."
 
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr "Kirjoitetaan fstabiin."
+#: 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 <pre>{!s}</pre> to use."
+msgstr "Kohteelle <pre>{!s}</pre> ei ole annettu juuriliitospistettä."
 
-#: src/modules/fstab/main.py:429
-msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
-msgstr ""
-"\"<pre>{!s}</pre>\"-määritystä ei ole annettu käytettäväksi kohteelle "
-"<pre>{!s}</pre>."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Asennetaan tietoja."
 
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
@@ -349,82 +292,139 @@ msgid ""
 msgstr ""
 "Palvelun polku {name!s} on <code>{path!s}</code>,  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/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Määritä Plymouthin teema"
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "KDM-määritystiedostoa ei voi kirjoittaa"
+#: 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/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "KDM-määritystiedostoa {!s} ei ole olemassa"
+#: 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/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "LXDM-määritystiedostoa ei voi kirjoittaa"
+#: 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/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "LXDM-määritystiedostoa {!s} ei ole olemassa"
+#: 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/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "LightDM-määritystiedostoa ei voi kirjoittaa"
+#: 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/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "LightDM-määritystiedostoa {!s} ei ole olemassa"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command <pre>{!s}</pre> "
+"returned error code {!s}."
+msgstr ""
+"Paketinhallinta ei voinut valmistella päivityksiä. Komento <pre>{!s}</pre> "
+"palautti virhekoodin {!s}."
 
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "LightDM-määritysvirhe"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command <pre>{!s}</pre>"
+" returned error code {!s}."
+msgstr ""
+"Paketinhallinta ei voinut päivittää järjestelmää. Komento <pre>{!s}</pre> "
+"palautti virhekoodin {!s}."
 
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr "LightDM:ää ei ole asennettu."
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command <pre>{!s}</pre> returned error code {!s}."
+msgstr ""
+"Paketinhallinta ei voinut tehdä muutoksia asennettuun järjestelmään. Komento"
+" <pre>{!s}</pre> palautti virhekoodin {!s}."
 
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "SLIM-määritystiedostoa ei voi kirjoittaa"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Asenna käynnistyslatain."
 
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "SLIM-määritystiedostoa {!s} ei ole olemassa"
+#: 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/displaymanager/main.py:992
-msgid "No display managers selected for the displaymanager module."
-msgstr "Displaymanager-moduulia varten ei ole valittu näytönhallintaa."
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr "Käynnistyslataimen asennusvirhe"
 
-#: src/modules/displaymanager/main.py:993
+#: src/modules/bootloader/main.py:783
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"The bootloader could not be installed. The installation command "
+"<pre>{!s}</pre> returned error code {!s}."
 msgstr ""
-"Luettelo on tyhjä tai määrittelemätön, sekä globalstorage, että "
-"displaymanager.conf tiedostossa."
+"Käynnistyslatainta ei voitu asentaa. Asennuskomento <pre>{!s}</pre> palautti"
+" virhekoodin {!s}."
 
-#: src/modules/displaymanager/main.py:1075
-msgid "Display manager configuration was incomplete"
-msgstr "Näytönhallinnan kokoonpano oli puutteellinen"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Asetetaan laitteiston kelloa."
+
+#: 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/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Asetetaan laitteiston kelloa."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Määritetään OpenRC:n dmcrypt-palvelua."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Asennetaan tietoja."
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr "Kirjoitetaan fstabiin."
+
+#: src/modules/fstab/main.py:429
+msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
+msgstr ""
+"\"<pre>{!s}</pre>\"-määritystä ei ole annettu käytettäväksi kohteelle "
+"<pre>{!s}</pre>."
+
+#: 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 e51a050e3ee9821c3f9c7bfb814c7f86a68fe7eb..0bc8c1e1bb22c49de11737113615a2f1a864c46c 100644
--- a/lang/python/fr/LC_MESSAGES/python.po
+++ b/lang/python/fr/LC_MESSAGES/python.po
@@ -11,17 +11,17 @@
 # Seboss666 <sebastien_verdet@seboss666.info>, 2019
 # Florian B <florianb3522@gmail.com>, 2019
 # Arnaud Ferraris <arnaud.ferraris@gmail.com>, 2019
-# roxfr <roxfr@outlook.fr>, 2021
 # Aestan <anthony.margerand@protonmail.com>, 2022
+# roxfr <roxfr@outlook.fr>, 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 <anthony.margerand@protonmail.com>, 2022\n"
+"Last-Translator: roxfr <roxfr@outlook.fr>, 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,103 +29,95 @@ 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/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/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Configuration du GRUB."
 
-#: 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:42
+msgid "Mounting partitions."
+msgstr "Montage des partitions."
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command <pre>{!s}</pre> "
-"returned error code {!s}."
-msgstr ""
+#: 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:738
-msgid ""
-"The package manager could not update the system. The command <pre>{!s}</pre>"
-" returned error code {!s}."
-msgstr ""
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr "Échec de l'importation de zpool"
 
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command <pre>{!s}</pre> returned error code {!s}."
-msgstr ""
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr "Impossible de déverrouiller zpool"
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Sauvegarde de la configuration du réseau en cours."
+#: 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/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 <pre>{!s}</pre> to use."
+#: 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 <pre>{!s}</pre> to use."
 msgstr ""
-"Aucun point de montage racine n'a été donné pour être utilisé par "
-"<pre>{!s}</pre>."
+"Aucune partition n'est définie pour être utilisée par <pre>{!s}</pre>."
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Configuration de mkinitcpio."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr "erreur de montage zfs"
 
-#: 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
-msgid "No partitions are defined for <pre>{!s}</pre> to use."
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Configurer les services systemd"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Impossible de modifier le service"
+
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
 msgstr ""
-"Aucune partition n'est définie pour être utilisée par <pre>{!s}</pre>."
+"L'appel <code>systemctl {arg!s}</code> en chroot a renvoyé le code d'erreur "
+"{num!s}"
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Création d'initramfs avec mkinitfs."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service <code>{name!s}</code>."
+msgstr "Impossible d'activer le service systemd <code>{name!s}</code>."
 
-#: 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/services-systemd/main.py:65
+msgid "Cannot enable systemd target <code>{name!s}</code>."
+msgstr "Impossible d'activer la cible systemd <code>{name!s}</code>."
 
-#: 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/services-systemd/main.py:67
+msgid "Cannot enable systemd timer <code>{name!s}</code>."
+msgstr "Impossible d'activer le minuteur systemd <code>{name!s}</code>."
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Configuration du service OpenRC dmcrypt."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target <code>{name!s}</code>."
+msgstr "Impossible de désactiver la cible systemd <code>{name!s}</code>."
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit <code>{name!s}</code>."
+msgstr "Impossible de masquer l'unit systemd <code>{name!s}</code>."
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands <code>{command!s}</code> and "
+"<code>{suffix!s}</code> for unit {name!s}."
+msgstr ""
+"Commandes systemd <code>{command!s}</code> et <code>{suffix!s}</code> "
+"inconnues pour l'unit {name!s}."
 
 #: src/modules/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -153,7 +145,7 @@ 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 ""
+msgstr "globalstorage ne contient pas de clé \"rootMountPoint\"."
 
 #: src/modules/unpackfs/main.py:434
 msgid "Bad mount point for root partition"
@@ -161,17 +153,17 @@ msgstr "Mauvais point de montage pour la partition racine"
 
 #: src/modules/unpackfs/main.py:435
 msgid "rootMountPoint is \"{}\", which does not exist."
-msgstr ""
+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 ""
+msgstr "Mauvaise configuration unpackfs"
 
 #: src/modules/unpackfs/main.py:440
 msgid "There is no configuration information."
-msgstr ""
+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"
@@ -188,122 +180,86 @@ msgid ""
 "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/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/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Configurer les services systemd"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Impossible de modifier le service"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
-msgstr ""
-"L'appel <code>systemctl {arg!s}</code> en chroot a renvoyé le code d'erreur "
-"{num!s}"
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service <code>{name!s}</code>."
-msgstr "Impossible d'activer le service systemd <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "Impossible d'écrire le fichier de configuration KDM"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target <code>{name!s}</code>."
-msgstr "Impossible d'activer la cible systemd <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "Le fichier de configuration KDM n'existe pas"
 
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer <code>{name!s}</code>."
-msgstr ""
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "Impossible d'écrire le fichier de configuration LXDM"
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target <code>{name!s}</code>."
-msgstr "Impossible de désactiver la cible systemd <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "Le fichier de configuration LXDM n'existe pas"
 
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit <code>{name!s}</code>."
-msgstr "Impossible de masquer l'unit systemd <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "Impossible d'écrire le fichier de configuration LightDM"
 
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands <code>{command!s}</code> and "
-"<code>{suffix!s}</code> for unit {name!s}."
-msgstr ""
-"Commandes systemd <code>{command!s}</code> et <code>{suffix!s}</code> "
-"inconnues pour l'unit {name!s}."
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "Le fichier de configuration LightDM {!S} n'existe pas"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Tâche factice de python"
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "Impossible de configurer LightDM"
 
-#: 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/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr "Aucun hôte LightDM est installé"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Installation du bootloader."
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "Impossible d'écrire le fichier de configuration SLIM"
 
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "Le fichier de configuration SLIM {!S} n'existe pas"
 
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
+"Aucun gestionnaire d'affichage n'a été sélectionné pour le module de "
+"gestionnaire d'affichage"
 
-#: src/modules/bootloader/main.py:783
+#: src/modules/displaymanager/main.py:993
 msgid ""
-"The bootloader could not be installed. The installation command "
-"<pre>{!s}</pre> returned error code {!s}."
-msgstr ""
-
-#: 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"
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
+"La liste des gestionnaires d'affichage est vide ou indéfinie à la fois dans "
+"globalstorage et displaymanager.conf."
 
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr ""
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr "La configuration du gestionnaire d'affichage était incomplète"
 
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr ""
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Configuration de mkinitcpio."
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
+#: 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 <pre>{!s}</pre> to use."
 msgstr ""
+"Aucun point de montage racine n'a été donné pour être utilisé par "
+"<pre>{!s}</pre>."
 
-#: 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 <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
-msgstr ""
+#: 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"
@@ -356,84 +312,142 @@ msgstr ""
 "Le chemin pour le service {name!s} est <code>{path!s}</code>, 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/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "Impossible d'écrire le fichier de configuration KDM"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Configurer le thème Plymouth"
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "Le fichier de configuration KDM n'existe pas"
+#: 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/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "Impossible d'écrire le fichier de configuration LXDM"
+#: 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/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "Le fichier de configuration LXDM n'existe pas"
+#: 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/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "Impossible d'écrire le fichier de configuration LightDM"
+#: 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/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "Le fichier de configuration LightDM {!S} n'existe pas"
+#: 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/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "Impossible de configurer LightDM"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command <pre>{!s}</pre> "
+"returned error code {!s}."
+msgstr ""
+"Le gestionnaire de paquets n'a pas pu préparer les mises à jour. La commande"
+" <pre>{!s}</pre> a renvoyé le code d'erreur {!s}."
 
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr "Aucun hôte LightDM est installé"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command <pre>{!s}</pre>"
+" returned error code {!s}."
+msgstr ""
+"Le gestionnaire de paquets n'a pas pu mettre à jour le système. La commande "
+"<pre>{!s}</pre> a renvoyé le code d'erreur {!s}."
 
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "Impossible d'écrire le fichier de configuration SLIM"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command <pre>{!s}</pre> returned error code {!s}."
+msgstr ""
+"Le gestionnaire de paquets n'a pas pu apporter de modifications au système "
+"installé. La commande <pre>{!s}</pre> a renvoyé le code d'erreur {!s}."
 
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "Le fichier de configuration SLIM {!S} n'existe pas"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Installation du bootloader."
 
-#: src/modules/displaymanager/main.py:992
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
 msgstr ""
-"Aucun gestionnaire d'affichage n'a été sélectionné pour le module de "
-"gestionnaire d'affichage"
+"Échec de l'installation de grub, aucune partition définie dans le stockage "
+"global"
 
-#: src/modules/displaymanager/main.py:993
+#: 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 displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"The bootloader could not be installed. The installation command "
+"<pre>{!s}</pre> returned error code {!s}."
 msgstr ""
-"La liste des gestionnaires d'affichage est vide ou indéfinie à la fois dans "
-"globalstorage et displaymanager.conf."
+"Le chargeur de démarrage n'a pas pu être installé. La commande "
+"d'installation <pre>{!s}</pre> a renvoyé le code d'erreur {!s}."
 
-#: src/modules/displaymanager/main.py:1075
-msgid "Display manager configuration was incomplete"
-msgstr "La configuration du gestionnaire d'affichage était incomplète"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Configuration de l'horloge matériel."
+
+#: 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/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Configuration de l'horloge matériel."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Configuration du service OpenRC dmcrypt."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Installation de données."
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr "Écriture du fstab."
+
+#: src/modules/fstab/main.py:429
+msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
+msgstr ""
+"Aucune configuration <pre>{!s}</pre>n'est donnée pour <pre>{!s}</pre> à "
+"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 fe1c9b56d5d4badf04e3980bac53c0d59dde7e0a..efd03caf960cf33d7aa103cef22ded3a447d2799 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 <f.t.public@gmail.com>, 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/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/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Configure GRUB."
 
-#: 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/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "Montaç des partizions."
 
-#: 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 <pre>{!s}</pre> "
-"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 <pre>{!s}</pre>"
-" 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 <pre>{!s}</pre> 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 <pre>{!s}</pre> to use."
+#: 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 <pre>{!s}</pre> to use."
+msgstr "No je stade definide nissune partizion di doprâ par <pre>{!s}</pre>."
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
 msgstr ""
-"Nol è stât indicât nissun pont di montaç di doprâ par <pre>{!s}</pre>."
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Daûr a configurâ di mkinitcpio."
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Configure i servizis di systemd"
 
-#: 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
-msgid "No partitions are defined for <pre>{!s}</pre> to use."
-msgstr "No je stade definide nissune partizion di doprâ par <pre>{!s}</pre>."
+#: 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/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Daûr a creâ il initramfs cun mkinitfs."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
+msgstr ""
+"La clamade <code>systemctl {arg!s}</code> in chroot e à tornât il codiç di "
+"erôr {num!s}."
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "No si è rivâts a eseguî mkinitfs su la destinazion"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service <code>{name!s}</code>."
+msgstr "Impussibil abilitâ il servizi di systemd <code>{name!s}</code>."
 
-#: 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:65
+msgid "Cannot enable systemd target <code>{name!s}</code>."
+msgstr "Impussibil abilitâ la destinazion di systemd <code>{name!s}</code>."
 
-#: 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:67
+msgid "Cannot enable systemd timer <code>{name!s}</code>."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target <code>{name!s}</code>."
+msgstr ""
+"Impussibil disabilitâ la destinazion di systemd <code>{name!s}</code>."
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit <code>{name!s}</code>."
+msgstr "Impussibil mascarâ la unitât di systemd <code>{name!s}</code>."
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands <code>{command!s}</code> and "
+"<code>{suffix!s}</code> for unit {name!s}."
+msgstr ""
+"Comants di systemd <code>{command!s}</code> e <code>{suffix!s}</code> no "
+"cognossûts pe unitât {name!s}."
 
 #: src/modules/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -179,118 +175,76 @@ 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 ""
-"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
-msgstr ""
-"La clamade <code>systemctl {arg!s}</code> 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 <code>{name!s}</code>."
-msgstr "Impussibil abilitâ il servizi di systemd <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "Impussibil scrivi il file di configurazion di KDM"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target <code>{name!s}</code>."
-msgstr "Impussibil abilitâ la destinazion di systemd <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "Il file di configurazion di KDM {!s} nol esist"
 
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer <code>{name!s}</code>."
-msgstr ""
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "Impussibil scrivi il file di configurazion di LXDM"
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target <code>{name!s}</code>."
-msgstr ""
-"Impussibil disabilitâ la destinazion di systemd <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "Il file di configurazion di LXDM {!s} nol esist"
 
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit <code>{name!s}</code>."
-msgstr "Impussibil mascarâ la unitât di systemd <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "Impussibil scrivi il file di configurazion di LightDM"
 
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands <code>{command!s}</code> and "
-"<code>{suffix!s}</code> for unit {name!s}."
-msgstr ""
-"Comants di systemd <code>{command!s}</code> e <code>{suffix!s}</code> no "
-"cognossûts pe unitât {name!s}."
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "Il file di configurazion di LightDM {!s} nol esist"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Lavôr di python pustiç."
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "Impussibil configurâ LightDM"
 
-#: 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/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr "Nissun menù di benvignût par LightDM instalât."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Instale il bootloader."
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "Impussibil scrivi il file di configurazion SLIM"
 
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "Il file di configurazion di SLIM {!s} nol esist"
 
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr "Nissun gjestôr di visôrs selezionât pal modul displaymanager."
 
-#: src/modules/bootloader/main.py:783
+#: src/modules/displaymanager/main.py:993
 msgid ""
-"The bootloader could not be installed. The installation command "
-"<pre>{!s}</pre> 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"
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
+"La liste dai gjestôrs di visôrs e je vueide o no je definide sedi in "
+"globalstorage che in displaymanager.conf."
 
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr ""
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr "La configurazion dal gjestôr dai visôrs no jere complete"
 
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr ""
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Daûr a configurâ di mkinitcpio."
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
+#: 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 <pre>{!s}</pre> to use."
 msgstr ""
+"Nol è stât indicât nissun pont di montaç di doprâ par <pre>{!s}</pre>."
 
-#: 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 <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
-msgstr ""
+#: 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"
@@ -341,82 +295,128 @@ msgid ""
 msgstr ""
 "Il percors pal servizi {name!s} al è <code>{path!s}</code>, 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/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Configure il teme di Plymouth"
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "Impussibil scrivi il file di configurazion di KDM"
+#: 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/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "Il file di configurazion di KDM {!s} nol esist"
+#: 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/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "Impussibil scrivi il file di configurazion di LXDM"
+#: 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/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "Il file di configurazion di LXDM {!s} nol esist"
+#: 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/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "Impussibil scrivi il file di configurazion di LightDM"
+#: 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/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "Il file di configurazion di LightDM {!s} nol esist"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command <pre>{!s}</pre> "
+"returned error code {!s}."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "Impussibil configurâ LightDM"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command <pre>{!s}</pre>"
+" returned error code {!s}."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr "Nissun menù di benvignût par LightDM instalât."
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command <pre>{!s}</pre> returned error code {!s}."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "Impussibil scrivi il file di configurazion SLIM"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Instale il bootloader."
 
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "Il file di configurazion di SLIM {!s} nol esist"
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
 
-#: src/modules/displaymanager/main.py:992
-msgid "No display managers selected for the displaymanager module."
-msgstr "Nissun gjestôr di visôrs selezionât pal modul displaymanager."
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
 
-#: src/modules/displaymanager/main.py:993
+#: src/modules/bootloader/main.py:783
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"The bootloader could not be installed. The installation command "
+"<pre>{!s}</pre> returned error code {!s}."
 msgstr ""
-"La liste dai gjestôrs di visôrs e je vueide o no je definide sedi in "
-"globalstorage che in displaymanager.conf."
 
-#: src/modules/displaymanager/main.py:1075
-msgid "Display manager configuration was incomplete"
-msgstr "La configurazion dal gjestôr dai visôrs no jere complete"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Daûr a configurâ l'orloi hardware."
+
+#: 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/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Daûr a configurâ l'orloi hardware."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Daûr a configurâ il servizi dmcrypt di OpenRC."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Daûr a instalâ i dâts."
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr "Daûr a scrivi fstab."
+
+#: src/modules/fstab/main.py:429
+msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> 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 90d46d05382f6fd8346d2be62312afcb28942568..3d5404e9d4db334d967e3c7e45b45be50e524e56 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/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr ""
 
-#: 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/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] "A instalar un paquete."
-msgstr[1] "A instalar %(num)d paquetes."
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr ""
 
-#: 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/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr ""
 
-#: 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 <pre>{!s}</pre> "
-"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 <pre>{!s}</pre>"
-" returned error code {!s}."
+#: 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/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command <pre>{!s}</pre> returned error code {!s}."
+#: 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 <pre>{!s}</pre> to use."
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
 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/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
-msgid "Configuration Error"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 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 <pre>{!s}</pre> to use."
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
 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
-msgid "No partitions are defined for <pre>{!s}</pre> to use."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit <code>{name!s}</code>."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands <code>{command!s}</code> and "
+"<code>{suffix!s}</code> for unit {name!s}."
 msgstr ""
 
 #: src/modules/unpackfs/main.py:34
@@ -178,112 +170,73 @@ 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 ""
-"<code>systemctl {arg!s}</code> 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 <code>{name!s}</code>."
-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"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target <code>{name!s}</code>."
-msgstr ""
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "O ficheiro de configuración de KDM {!s} non existe"
 
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer <code>{name!s}</code>."
-msgstr ""
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "Non é posíbel escribir o ficheiro de configuración de LXDM"
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target <code>{name!s}</code>."
-msgstr ""
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "O ficheiro de configuración de LXDM {!s} non existe"
 
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit <code>{name!s}</code>."
-msgstr ""
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "Non é posíbel escribir o ficheiro de configuración de LightDM"
 
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands <code>{command!s}</code> and "
-"<code>{suffix!s}</code> for unit {name!s}."
-msgstr ""
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "O ficheiro de configuración de LightDM {!s} non existe"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Tarefa parva de python."
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "Non é posíbel configurar LightDM"
 
-#: 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/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr "Non se instalou o saudador de LightDM."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "Non é posíbel escribir o ficheiro de configuración de SLIM"
 
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "O ficheiro de configuración de SLIM {!s} non existe"
 
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
+"Non hai xestores de pantalla seleccionados para o módulo displaymanager."
 
-#: src/modules/bootloader/main.py:783
+#: src/modules/displaymanager/main.py:993
 msgid ""
-"The bootloader could not be installed. The installation command "
-"<pre>{!s}</pre> 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"
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr ""
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr "A configuración do xestor de pantalla foi incompleta"
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
+#: 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 <pre>{!s}</pre> to use."
 msgstr ""
 
-#: src/modules/fstab/main.py:429
-msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
 
 #: src/modules/services-openrc/main.py:29
@@ -329,81 +282,128 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-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/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: 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/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "Non é posíbel escribir o ficheiro de configuración de KDM"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command <pre>{!s}</pre> "
+"returned error code {!s}."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "O ficheiro de configuración de KDM {!s} non existe"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command <pre>{!s}</pre>"
+" returned error code {!s}."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "Non é posíbel escribir o ficheiro de configuración de LXDM"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command <pre>{!s}</pre> returned error code {!s}."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "O ficheiro de configuración de LXDM {!s} non existe"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "Non é posíbel escribir o ficheiro de configuración de LightDM"
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
 
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "O ficheiro de configuración de LightDM {!s} non existe"
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
 
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "Non é posíbel configurar LightDM"
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"<pre>{!s}</pre> returned error code {!s}."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr "Non se instalou o saudador de LightDM."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "Non é posíbel escribir o ficheiro de configuración de SLIM"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "O ficheiro de configuración de SLIM {!s} non existe"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr ""
 
-#: src/modules/displaymanager/main.py:992
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
-"Non hai xestores de pantalla seleccionados para o módulo displaymanager."
 
-#: src/modules/displaymanager/main.py:993
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:1075
-msgid "Display manager configuration was incomplete"
-msgstr "A configuración do xestor de pantalla foi incompleta"
+#: 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/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> 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 873b44cc5aac9ad25b3a4bb7baf05dd4b297f4d9..37573ac561c4d2c9ade91a5226f3514ddb739624 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/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr ""
 
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr ""
 
-#: 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 <pre>{!s}</pre> "
-"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 <pre>{!s}</pre>"
-" returned error code {!s}."
+#: 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/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command <pre>{!s}</pre> returned error code {!s}."
+#: 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 <pre>{!s}</pre> to use."
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
 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/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
-msgid "Configuration Error"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 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 <pre>{!s}</pre> to use."
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
 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
-msgid "No partitions are defined for <pre>{!s}</pre> to use."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit <code>{name!s}</code>."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands <code>{command!s}</code> and "
+"<code>{suffix!s}</code> for unit {name!s}."
 msgstr ""
 
 #: src/modules/unpackfs/main.py:34
@@ -174,112 +166,72 @@ 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 ""
-"<code>systemctl {arg!s}</code> 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 <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands <code>{command!s}</code> and "
-"<code>{suffix!s}</code> for unit {name!s}."
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/bootloader/main.py:783
+#: src/modules/displaymanager/main.py:993
 msgid ""
-"The bootloader could not be installed. The installation command "
-"<pre>{!s}</pre> 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"
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
+#: 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 <pre>{!s}</pre> to use."
 msgstr ""
 
-#: src/modules/fstab/main.py:429
-msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
 
 #: src/modules/services-openrc/main.py:29
@@ -325,80 +277,128 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: 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."
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
+#: 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/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command <pre>{!s}</pre> "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command <pre>{!s}</pre>"
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command <pre>{!s}</pre> returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"<pre>{!s}</pre> returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:992
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:993
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:1075
-msgid "Display manager configuration was incomplete"
+#: 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/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> 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 9b74ec2286100b0bc915f25e53142a03b1be2adf..eb896294907e077aedb8bc93e7179278ff700793 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 <sh.yaron@gmail.com>, 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/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/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "הגדרת GRUB."
 
-#: 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:42
+msgid "Mounting partitions."
+msgstr "מחיצות מעוגנות."
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command <pre>{!s}</pre> "
-"returned error code {!s}."
-msgstr ""
-"מנהל החבילות לא הצליח להכין את העדכונים. הפקודה <pre>{!s}</pre> החזירה את "
-"קוד השגיאה {!s}."
+#: 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:738
-msgid ""
-"The package manager could not update the system. The command <pre>{!s}</pre>"
-" returned error code {!s}."
-msgstr ""
-"מנהל החבילות לא הצליח לעדכן את המערכת. הפקודה <pre>{!s}</pre> החזירה את קוד "
-"השגיאה {!s}."
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr "ייבוא zpool נכשל"
 
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command <pre>{!s}</pre> returned error code {!s}."
-msgstr ""
-"מנהל החבילות לא הצליח לערוך שינויים במערכת המותקנת. הפקודה <pre>{!s}</pre> "
-"החזירה את קוד השגיאה {!s}."
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr "שחרור zpool נכשל"
 
-#: 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 "הגדרת נקודת עיגון של 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 "שגיאת הגדרות"
 
-#: 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 <pre>{!s}</pre> to use."
-msgstr "לא סופקה נקודת עגינת שורש לשימוש של <pre>{!s}</pre>."
-
-#: 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 <pre>{!s}</pre> to use."
 msgstr "לא הוגדרו מחיצות לשימוש של <pre>{!s}</pre>."
 
-#: 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 ""
+"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
+msgstr ""
+"<code>systemctl {arg!s}</code> הקריאה ב־chroot החזירה את קוד השגיאה {num!s}."
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service <code>{name!s}</code>."
+msgstr "לא ניתן להפעיל את השירות הבא של systemd:‏ <code>{name!s}</code>."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target <code>{name!s}</code>."
+msgstr "לא ניתן להפעיל את היעד של systemd בשם <code>{name!s}</code>."
+
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer <code>{name!s}</code>."
+msgstr ""
+"לא ניתן להפעיל את המתזמן ב־systemd בשם "
+"<code>{name!s}</code>."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target <code>{name!s}</code>."
+msgstr "לא ניתן להשבית את היעד של systemd בשם  <code>{name!s}</code>."
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit <code>{name!s}</code>."
+msgstr "לא ניתן למסך את היחידה של systemd בשם  <code>{name!s}</code>."
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands <code>{command!s}</code> and "
+"<code>{suffix!s}</code> for unit {name!s}."
+msgstr ""
+"פקודות לא ידועות של systemd‏ <code>{command!s}</code> "
+"ו־<code>{suffix!s}</code> עבור היחידה {name!s}."
 
 #: src/modules/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -192,120 +179,75 @@ 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 ""
-"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
-msgstr ""
-"<code>systemctl {arg!s}</code> הקריאה ב־chroot החזירה את קוד השגיאה {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service <code>{name!s}</code>."
-msgstr "לא ניתן להפעיל את השירות הבא של systemd:‏ <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "לא ניתן לכתוב את קובץ התצורה של KDM"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target <code>{name!s}</code>."
-msgstr "לא ניתן להפעיל את היעד של systemd בשם <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "קובץ התצורה של KDM ‏{!s} אינו קיים"
 
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer <code>{name!s}</code>."
-msgstr ""
-"לא ניתן להפעיל את המתזמן ב־systemd בשם "
-"<code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "לא ניתן לכתוב את קובץ התצורה של LXDM"
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target <code>{name!s}</code>."
-msgstr "לא ניתן להשבית את היעד של systemd בשם  <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "קובץ התצורה של LXDM ‏{!s} אינו קיים"
 
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit <code>{name!s}</code>."
-msgstr "לא ניתן למסך את היחידה של systemd בשם  <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "לא ניתן לכתוב את קובץ התצורה של LightDM"
 
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands <code>{command!s}</code> and "
-"<code>{suffix!s}</code> for unit {name!s}."
-msgstr ""
-"פקודות לא ידועות של systemd‏ <code>{command!s}</code> "
-"ו־<code>{suffix!s}</code> עבור היחידה {name!s}."
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "קובץ התצורה של LightDM ‏{!s} אינו קיים"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "משימת דמה של Python."
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "לא ניתן להגדיר את LightDM"
 
-#: 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/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr "לא מותקן מקבל פנים מסוג LightDM."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "התקנת מנהל אתחול."
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "לא ניתן לכתוב קובץ תצורה של SLIM."
 
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr "ההתקנה של grub נכשלה, לא הוגדרו מחיצות באחסון הכללי"
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "קובץ התצורה {!s} של SLIM אינו קיים"
 
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr "שגיאת התקנת מנהל אתחול"
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr "לא נבחרו מנהלי תצוגה למודול displaymanager."
 
-#: src/modules/bootloader/main.py:783
+#: src/modules/displaymanager/main.py:993
 msgid ""
-"The bootloader could not be installed. The installation command "
-"<pre>{!s}</pre> returned error code {!s}."
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
-"לא ניתן להתקין את מנהל האתחול. פקודת ההתקנה <pre>{!s}</pre> החזירה את קוד "
-"השגיאה {!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 נכשלה"
+"רשימת מנהלי התצוגה ריקה או שאינה מוגדרת גם באחסון הכללי (globalstorage) וגם "
+"ב־displaymanager.conf."
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr "שגיאת עיגון zfs"
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr "תצורת מנהל התצוגה אינה שלמה"
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "הגדרת ערכת עיצוב של Plymouth"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "mkinitcpio מותקן."
 
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr "fstab נכתב."
+#: 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 <pre>{!s}</pre> to use."
+msgstr "לא סופקה נקודת עגינת שורש לשימוש של <pre>{!s}</pre>."
 
-#: src/modules/fstab/main.py:429
-msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
-msgstr "לא סופקה תצורת <pre>{!s}</pre> לשימוש <pre>{!s}</pre>."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "הנתונים מותקנים."
 
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
@@ -355,82 +297,140 @@ msgid ""
 "exist."
 msgstr "הנתיב לשירות {name!s} הוא <code>{path!s}</code>, שאינו קיים."
 
-#: 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/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "הגדרת ערכת עיצוב של Plymouth"
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "לא ניתן לכתוב את קובץ התצורה של KDM"
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "התקנת חבילות."
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "קובץ התצורה של KDM ‏{!s} אינו קיים"
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "החבילות מעובדות (%(count)d/%(total)d)"
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "לא ניתן לכתוב את קובץ התצורה של LXDM"
+#: 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/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "קובץ התצורה של LXDM ‏{!s} אינו קיים"
+#: 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/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "לא ניתן לכתוב את קובץ התצורה של LightDM"
+#: 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/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "קובץ התצורה של LightDM ‏{!s} אינו קיים"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command <pre>{!s}</pre> "
+"returned error code {!s}."
+msgstr ""
+"מנהל החבילות לא הצליח להכין את העדכונים. הפקודה <pre>{!s}</pre> החזירה את "
+"קוד השגיאה {!s}."
 
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "לא ניתן להגדיר את LightDM"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command <pre>{!s}</pre>"
+" returned error code {!s}."
+msgstr ""
+"מנהל החבילות לא הצליח לעדכן את המערכת. הפקודה <pre>{!s}</pre> החזירה את קוד "
+"השגיאה {!s}."
 
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr "לא מותקן מקבל פנים מסוג LightDM."
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command <pre>{!s}</pre> returned error code {!s}."
+msgstr ""
+"מנהל החבילות לא הצליח לערוך שינויים במערכת המותקנת. הפקודה <pre>{!s}</pre> "
+"החזירה את קוד השגיאה {!s}."
 
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "לא ניתן לכתוב קובץ תצורה של SLIM."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "התקנת מנהל אתחול."
 
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "קובץ התצורה {!s} של SLIM אינו קיים"
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr "ההתקנה של grub נכשלה, לא הוגדרו מחיצות באחסון הכללי"
 
-#: src/modules/displaymanager/main.py:992
-msgid "No display managers selected for the displaymanager module."
-msgstr "לא נבחרו מנהלי תצוגה למודול displaymanager."
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr "שגיאת התקנת מנהל אתחול"
 
-#: src/modules/displaymanager/main.py:993
+#: src/modules/bootloader/main.py:783
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"The bootloader could not be installed. The installation command "
+"<pre>{!s}</pre> returned error code {!s}."
 msgstr ""
-"רשימת מנהלי התצוגה ריקה או שאינה מוגדרת גם באחסון הכללי (globalstorage) וגם "
-"ב־displaymanager.conf."
+"לא ניתן להתקין את מנהל האתחול. פקודת ההתקנה <pre>{!s}</pre> החזירה את קוד "
+"השגיאה {!s}."
 
-#: src/modules/displaymanager/main.py:1075
-msgid "Display manager configuration was incomplete"
-msgstr "תצורת מנהל התצוגה אינה שלמה"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+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/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "שעון החומרה מוגדר."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "שירות dmcrypt ל־OpenRC מוגדר."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "הנתונים מותקנים."
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr "fstab נכתב."
+
+#: src/modules/fstab/main.py:429
+msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
+msgstr "לא סופקה תצורת <pre>{!s}</pre> לשימוש <pre>{!s}</pre>."
+
+#: 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 1de7c2b87a1c2009df8d7861921b57435088d640..7f14e243e9d84d4c8bfdd740ac69e2570b94500c 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 <caspian7pena@gmail.com>, 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/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/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "GRUB विन्यस्त करना।"
 
-#: 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:42
+msgid "Mounting partitions."
+msgstr "विभाजन माउंट करना।"
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command <pre>{!s}</pre> "
-"returned error code {!s}."
-msgstr ""
-"पैकेज प्रबंधक द्वारा अपडेट तैयार करना विफल। कमांड <pre>{!s}</pre> हेतु "
-"त्रुटि कोड {!s} प्राप्त।"
+#: 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:738
-msgid ""
-"The package manager could not update the system. The command <pre>{!s}</pre>"
-" returned error code {!s}."
-msgstr ""
-"पैकेज प्रबंधक द्वारा सिस्टम अपडेट करना विफल। कमांड <pre>{!s}</pre> हेतु "
-"त्रुटि कोड {!s} प्राप्त।"
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr "zpool आयात विफल"
 
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command <pre>{!s}</pre> returned error code {!s}."
-msgstr ""
-"पैकेज प्रबंधक द्वारा इंस्टॉल हो रखें सिस्टम पर परिवर्तन करना विफल। कमांड "
-"<pre>{!s}</pre> हेतु त्रुटि कोड {!s} प्राप्त।"
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr "zpool अनलॉक करना विफल"
 
-#: 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 "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 "विन्यास त्रुटि"
 
-#: 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 <pre>{!s}</pre> to use."
-msgstr ""
-"<pre>{!s}</pre> के उपयोग हेतु कोई रुट माउंट पॉइंट प्रदान नहीं किया गया।"
-
-#: 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 <pre>{!s}</pre> to use."
 msgstr "<pre>{!s}</pre> के उपयोग हेतु कोई विभाजन परिभाषित नहीं हैं।"
 
-#: 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 ""
+"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
+msgstr "chroot में <code>systemctl {arg!s}</code> कॉल त्रुटि कोड {num!s}।"
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service <code>{name!s}</code>."
+msgstr "systemd सेवा <code>{name!s}</code> को सक्रिय नहीं किया जा सकता।"
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target <code>{name!s}</code>."
+msgstr "systemd लक्ष्य <code>{name!s}</code>सक्रिय करना विफल।"
+
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer <code>{name!s}</code>."
+msgstr "systemd टाइमर <code>{name!s}</code>सक्रिय करना विफल।"
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target <code>{name!s}</code>."
+msgstr "systemd लक्ष्य <code>{name!s}</code> निष्क्रिय करना विफल।"
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit <code>{name!s}</code>."
+msgstr "systemd यूनिट <code>{name!s}</code> को मास्क नहीं किया जा सकता।"
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands <code>{command!s}</code> and "
+"<code>{suffix!s}</code> for unit {name!s}."
+msgstr ""
+"यूनिट {name!s} हेतु अज्ञात systemd कमांड <code>{command!s}</code> व "
+"<code>{suffix!s}</code>।"
 
 #: src/modules/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -187,119 +174,76 @@ 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 ""
-"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
-msgstr "chroot में <code>systemctl {arg!s}</code> कॉल त्रुटि कोड {num!s}।"
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service <code>{name!s}</code>."
-msgstr "systemd सेवा <code>{name!s}</code> को सक्रिय नहीं किया जा सकता।"
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "KDM विन्यास फ़ाइल राइट नहीं की जा सकती"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target <code>{name!s}</code>."
-msgstr "systemd लक्ष्य <code>{name!s}</code>सक्रिय करना विफल।"
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "KDM विन्यास फ़ाइल {!s} मौजूद नहीं है"
 
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer <code>{name!s}</code>."
-msgstr "systemd टाइमर <code>{name!s}</code>सक्रिय करना विफल।"
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "LXDM विन्यास फ़ाइल राइट नहीं की जा सकती"
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target <code>{name!s}</code>."
-msgstr "systemd लक्ष्य <code>{name!s}</code> निष्क्रिय करना विफल।"
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "LXDM विन्यास फ़ाइल {!s} मौजूद नहीं है"
 
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit <code>{name!s}</code>."
-msgstr "systemd यूनिट <code>{name!s}</code> को मास्क नहीं किया जा सकता।"
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "LightDM विन्यास फ़ाइल राइट नहीं की जा सकती"
 
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands <code>{command!s}</code> and "
-"<code>{suffix!s}</code> for unit {name!s}."
-msgstr ""
-"यूनिट {name!s} हेतु अज्ञात systemd कमांड <code>{command!s}</code> व "
-"<code>{suffix!s}</code>।"
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "LightDM विन्यास फ़ाइल {!s} मौजूद नहीं है"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "डमी पाइथन प्रक्रिया ।"
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "LightDM को विन्यस्त नहीं किया जा सकता"
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "डमी पाइथन प्रक्रिया की चरण संख्या {}"
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr "कोई LightDM लॉगिन स्क्रीन इंस्टॉल नहीं है।"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "बूट लोडर इंस्टॉल करना।"
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "SLIM विन्यास फ़ाइल राइट नहीं की जा सकती"
 
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr "grub इंस्टॉल करना विफल, सर्वत्र संचयन में कोई विभाजन परिभाषित नहीं है"
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "SLIM विन्यास फ़ाइल {!s} मौजूद नहीं है"
 
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr "बूट लोडर इंस्टॉल त्रुटि"
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr "चयनित डिस्प्ले प्रबंधक मॉड्यूल हेतु कोई डिस्प्ले प्रबंधक नहीं मिला।"
 
-#: src/modules/bootloader/main.py:783
+#: src/modules/displaymanager/main.py:993
 msgid ""
-"The bootloader could not be installed. The installation command "
-"<pre>{!s}</pre> returned error code {!s}."
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
-"बूट लोडर इंस्टॉल करना विफल। इंस्टॉल कमांड <pre>{!s}</pre> हेतु त्रुटि कोड "
-"{!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 माउंट संबंधी त्रुटि"
+"globalstorage व displaymanager.conf में डिस्प्ले प्रबंधक सूची रिक्त या "
+"अपरिभाषित है।"
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Plymouth थीम विन्यस्त करना "
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr "डिस्प्ले प्रबंधक विन्यास अधूरा था"
 
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr "fstab पर राइट करना।"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "mkinitcpio को विन्यस्त करना।"
 
-#: src/modules/fstab/main.py:429
-msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
+#: 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 <pre>{!s}</pre> to use."
 msgstr ""
-"कोई <pre>{!s}</pre> विन्यास प्रदान नहीं किया गया <pre>{!s}</pre> के उपयोग "
-"हेतु।"
+"<pre>{!s}</pre> के उपयोग हेतु कोई रुट माउंट पॉइंट प्रदान नहीं किया गया।"
+
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "डाटा इंस्टॉल करना।"
 
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
@@ -347,82 +291,138 @@ msgid ""
 "exist."
 msgstr "सेवा {name!s} हेतु पथ <code>{path!s}</code> है, जो कि मौजूद नहीं है।"
 
-#: 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/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Plymouth थीम विन्यस्त करना "
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "KDM विन्यास फ़ाइल राइट नहीं की जा सकती"
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "पैकेज इंस्टॉल करना।"
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "KDM विन्यास फ़ाइल {!s} मौजूद नहीं है"
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "पैकेज (%(count)d / %(total)d) संसाधित किए जा रहे हैं"
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "LXDM विन्यास फ़ाइल राइट नहीं की जा सकती"
+#: 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/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "LXDM विन्यास फ़ाइल {!s} मौजूद नहीं है"
+#: 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/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "LightDM विन्यास फ़ाइल राइट नहीं की जा सकती"
+#: 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/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "LightDM विन्यास फ़ाइल {!s} मौजूद नहीं है"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command <pre>{!s}</pre> "
+"returned error code {!s}."
+msgstr ""
+"पैकेज प्रबंधक द्वारा अपडेट तैयार करना विफल। कमांड <pre>{!s}</pre> हेतु "
+"त्रुटि कोड {!s} प्राप्त।"
 
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "LightDM को विन्यस्त नहीं किया जा सकता"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command <pre>{!s}</pre>"
+" returned error code {!s}."
+msgstr ""
+"पैकेज प्रबंधक द्वारा सिस्टम अपडेट करना विफल। कमांड <pre>{!s}</pre> हेतु "
+"त्रुटि कोड {!s} प्राप्त।"
 
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr "कोई LightDM लॉगिन स्क्रीन इंस्टॉल नहीं है।"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command <pre>{!s}</pre> returned error code {!s}."
+msgstr ""
+"पैकेज प्रबंधक द्वारा इंस्टॉल हो रखें सिस्टम पर परिवर्तन करना विफल। कमांड "
+"<pre>{!s}</pre> हेतु त्रुटि कोड {!s} प्राप्त।"
 
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "SLIM विन्यास फ़ाइल राइट नहीं की जा सकती"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "बूट लोडर इंस्टॉल करना।"
 
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "SLIM विन्यास फ़ाइल {!s} मौजूद नहीं है"
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr "grub इंस्टॉल करना विफल, सर्वत्र संचयन में कोई विभाजन परिभाषित नहीं है"
 
-#: src/modules/displaymanager/main.py:992
-msgid "No display managers selected for the displaymanager module."
-msgstr "चयनित डिस्प्ले प्रबंधक मॉड्यूल हेतु कोई डिस्प्ले प्रबंधक नहीं मिला।"
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr "बूट लोडर इंस्टॉल त्रुटि"
 
-#: src/modules/displaymanager/main.py:993
+#: src/modules/bootloader/main.py:783
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"The bootloader could not be installed. The installation command "
+"<pre>{!s}</pre> returned error code {!s}."
 msgstr ""
-"globalstorage व displaymanager.conf में डिस्प्ले प्रबंधक सूची रिक्त या "
-"अपरिभाषित है।"
+"बूट लोडर इंस्टॉल करना विफल। इंस्टॉल कमांड <pre>{!s}</pre> हेतु त्रुटि कोड "
+"{!s} प्राप्त।"
 
-#: src/modules/displaymanager/main.py:1075
-msgid "Display manager configuration was incomplete"
-msgstr "डिस्प्ले प्रबंधक विन्यास अधूरा था"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+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/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "हार्डवेयर घड़ी सेट करना।"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "OpenRC dmcrypt सेवा विन्यस्त करना।"
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "डाटा इंस्टॉल करना।"
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr "fstab पर राइट करना।"
+
+#: src/modules/fstab/main.py:429
+msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
+msgstr ""
+"कोई <pre>{!s}</pre> विन्यास प्रदान नहीं किया गया <pre>{!s}</pre> के उपयोग "
+"हेतु।"
+
+#: 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 4aefea56dc96947914d2e822cec252c8446b0a43..3e5309798109be9b156fdfc7c3f95a381d02ffc5 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ć <lovro.kudelic@outlook.com>, 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/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/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Konfigurirajte GRUB."
 
-#: 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:42
+msgid "Mounting partitions."
+msgstr "Montiranje particija."
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command <pre>{!s}</pre> "
-"returned error code {!s}."
-msgstr ""
-"Upravitelj paketa nije mogao pripremiti ažuriranja. Naredba <pre>{!s}</pre> "
-"je vratila kôd pogreške {!s}."
+#: 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:738
-msgid ""
-"The package manager could not update the system. The command <pre>{!s}</pre>"
-" returned error code {!s}."
-msgstr ""
-"Upravitelj paketa nije mogao ažurirati sustav. Naredba <pre>{!s}</pre> je "
-"vratila kod pogreške {!s}."
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr "Nije uspio uvoz zpool-a"
 
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command <pre>{!s}</pre> returned error code {!s}."
-msgstr ""
-"Upravitelj paketa nije mogao izvršiti promjene na instaliranom sustavu. "
-"Naredba <pre>{!s}</pre> je vratila kôd pogreške {!s}."
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr "Otključavanje zpool-a nije uspjelo"
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Spremanje mrežne konfiguracije."
+#: 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/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 <pre>{!s}</pre> to use."
+#: 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 <pre>{!s}</pre> to use."
+msgstr "Nema definiranih particija za <pre>{!s}</pre> korištenje."
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr "ZFS greška montiranja"
+
+#: 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 ""
+"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
 msgstr ""
-"Nijedna root točka montiranja nije definirana za <pre>{!s}</pre> korištenje."
+"<code>systemctl {arg!s}</code> poziv u chroot-u vratio je kod pogreške "
+"{num!s}."
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Konfiguriranje mkinitcpio."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service <code>{name!s}</code>."
+msgstr "Ne mogu omogućiti systemd servis <code>{name!s}</code>."
 
-#: 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
-msgid "No partitions are defined for <pre>{!s}</pre> to use."
-msgstr "Nema definiranih particija za <pre>{!s}</pre> korištenje."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target <code>{name!s}</code>."
+msgstr "Ne mogu omogućiti systemd cilj <code>{name!s}</code>."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Stvaranje initramfs s mkinitfs."
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer <code>{name!s}</code>."
+msgstr "Nije moguće omogućiti systemd timer <code>{name!s}</code>."
 
-#: 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:71
+msgid "Cannot disable systemd target <code>{name!s}</code>."
+msgstr "Ne mogu onemogućiti systemd cilj <code>{name!s}</code>."
 
-#: 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:73
+msgid "Cannot mask systemd unit <code>{name!s}</code>."
+msgstr "Ne mogu maskirati systemd jedinicu <code>{name!s}</code>."
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Konfiguriranje servisa OpenRC dmcrypt."
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands <code>{command!s}</code> and "
+"<code>{suffix!s}</code> for unit {name!s}."
+msgstr ""
+"Nepoznata systemd naredba <code>{command!s}</code> i <code>{suffix!s}</code>"
+" za jedinicu {name!s}."
 
 #: src/modules/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -189,121 +176,76 @@ 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 ""
-"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
-msgstr ""
-"<code>systemctl {arg!s}</code> 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 <code>{name!s}</code>."
-msgstr "Ne mogu omogućiti systemd servis <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "Ne mogu zapisati KDM konfiguracijsku datoteku"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target <code>{name!s}</code>."
-msgstr "Ne mogu omogućiti systemd cilj <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "KDM konfiguracijska datoteka {!s} ne postoji"
 
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer <code>{name!s}</code>."
-msgstr "Nije moguće omogućiti systemd timer <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "Ne mogu zapisati LXDM konfiguracijsku datoteku"
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target <code>{name!s}</code>."
-msgstr "Ne mogu onemogućiti systemd cilj <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "LXDM konfiguracijska datoteka {!s} ne postoji"
 
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit <code>{name!s}</code>."
-msgstr "Ne mogu maskirati systemd jedinicu <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "Ne moku zapisati LightDM konfiguracijsku datoteku"
 
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands <code>{command!s}</code> and "
-"<code>{suffix!s}</code> for unit {name!s}."
-msgstr ""
-"Nepoznata systemd naredba <code>{command!s}</code> i <code>{suffix!s}</code>"
-" za jedinicu {name!s}."
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "LightDM konfiguracijska datoteka {!s} ne postoji"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Testni python posao."
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "Ne mogu konfigurirati LightDM"
 
-#: 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/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr "Nije instaliran LightDM pozdravnik."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Instaliram bootloader."
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "Ne mogu zapisati SLIM konfiguracijsku datoteku"
 
-#: 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/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "SLIM konfiguracijska datoteka {!s} ne postoji"
 
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr "Greška prilikom instalacije bootloadera"
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr "Nisu odabrani upravitelji zaslona za modul displaymanager."
 
-#: src/modules/bootloader/main.py:783
+#: src/modules/displaymanager/main.py:993
 msgid ""
-"The bootloader could not be installed. The installation command "
-"<pre>{!s}</pre> returned error code {!s}."
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
-"Bootloader nije mogao biti instaliran. Instalacijska naredba <pre>{!s}</pre>"
-" 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"
+"Popis upravitelja zaslona je prazan ili nedefiniran u oba globalstorage i "
+"displaymanager.conf."
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr "ZFS greška montiranja"
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr "Konfiguracija upravitelja zaslona nije bila potpuna"
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Konfigurirajte Plymouth temu"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Konfiguriranje mkinitcpio."
 
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr "Zapisujem fstab."
+#: 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 <pre>{!s}</pre> to use."
+msgstr ""
+"Nijedna root točka montiranja nije definirana za <pre>{!s}</pre> korištenje."
 
-#: src/modules/fstab/main.py:429
-msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
-msgstr "Nije dana konfiguracija <pre>{!s}</pre> za <pre>{!s}</pre> upotrebu."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Instaliranje podataka."
 
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
@@ -355,82 +297,140 @@ msgid ""
 msgstr ""
 "Putanja servisa  {name!s} je <code>{path!s}</code>, 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/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Konfigurirajte Plymouth temu"
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "Ne mogu zapisati KDM konfiguracijsku datoteku"
+#: 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/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "KDM konfiguracijska datoteka {!s} ne postoji"
+#: 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/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "Ne mogu zapisati LXDM konfiguracijsku datoteku"
+#: 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/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "LXDM konfiguracijska datoteka {!s} ne postoji"
+#: 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/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "Ne moku zapisati LightDM konfiguracijsku datoteku"
+#: 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/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "LightDM konfiguracijska datoteka {!s} ne postoji"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command <pre>{!s}</pre> "
+"returned error code {!s}."
+msgstr ""
+"Upravitelj paketa nije mogao pripremiti ažuriranja. Naredba <pre>{!s}</pre> "
+"je vratila kôd pogreške {!s}."
 
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "Ne mogu konfigurirati LightDM"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command <pre>{!s}</pre>"
+" returned error code {!s}."
+msgstr ""
+"Upravitelj paketa nije mogao ažurirati sustav. Naredba <pre>{!s}</pre> je "
+"vratila kod pogreške {!s}."
 
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr "Nije instaliran LightDM pozdravnik."
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command <pre>{!s}</pre> returned error code {!s}."
+msgstr ""
+"Upravitelj paketa nije mogao izvršiti promjene na instaliranom sustavu. "
+"Naredba <pre>{!s}</pre> je vratila kôd pogreške {!s}."
 
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "Ne mogu zapisati SLIM konfiguracijsku datoteku"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Instaliram bootloader."
 
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "SLIM konfiguracijska datoteka {!s} ne postoji"
+#: 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/displaymanager/main.py:992
-msgid "No display managers selected for the displaymanager module."
-msgstr "Nisu odabrani upravitelji zaslona za modul displaymanager."
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr "Greška prilikom instalacije bootloadera"
 
-#: src/modules/displaymanager/main.py:993
+#: src/modules/bootloader/main.py:783
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"The bootloader could not be installed. The installation command "
+"<pre>{!s}</pre> returned error code {!s}."
 msgstr ""
-"Popis upravitelja zaslona je prazan ili nedefiniran u oba globalstorage i "
-"displaymanager.conf."
+"Bootloader nije mogao biti instaliran. Instalacijska naredba <pre>{!s}</pre>"
+" je vratila kod pogreške {!s}."
 
-#: src/modules/displaymanager/main.py:1075
-msgid "Display manager configuration was incomplete"
-msgstr "Konfiguracija upravitelja zaslona nije bila potpuna"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Postavljanje hardverskog sata."
+
+#: 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/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Postavljanje hardverskog sata."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Konfiguriranje servisa OpenRC dmcrypt."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Instaliranje podataka."
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr "Zapisujem fstab."
+
+#: src/modules/fstab/main.py:429
+msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
+msgstr "Nije dana konfiguracija <pre>{!s}</pre> za <pre>{!s}</pre> 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 cfb4143829e6dafe4e26f54055a1b7b3cb9f29be..f6cfa4b29438f0132b287c8b320ef3357868e019 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 <mrlajos@gmail.com>, 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/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/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "GRUB konfigurálása."
 
-#: 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/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "Partíciók csatolá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 <pre>{!s}</pre> "
-"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 <pre>{!s}</pre>"
-" 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 <pre>{!s}</pre> 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 <pre>{!s}</pre> to use."
-msgstr "Nincs root csatolási pont megadva a <pre>{!s}</pre> 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 <pre>{!s}</pre> to use."
 msgstr "Nincsenek partíciók meghatározva a <pre>{!s}</pre> 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 ""
+"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
 msgstr ""
+"<code>systemctl {arg!s}</code> hívás a chroot-ban hibakódot okozott {num!s}."
 
-#: 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:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service <code>{name!s}</code>."
+msgstr ""
+"Nem sikerült a systemd szolgáltatást engedélyezni: <code>{name!s}</code>."
 
-#: 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:65
+msgid "Cannot enable systemd target <code>{name!s}</code>."
+msgstr "Nem sikerült a systemd célt engedélyezni: <code>{name!s}</code>."
+
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer <code>{name!s}</code>."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target <code>{name!s}</code>."
+msgstr "Nem sikerült a systemd cél <code>{name!s}</code> letiltása."
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit <code>{name!s}</code>."
+msgstr "Nem maszkolható systemd egység: <code>{name!s}</code>."
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands <code>{command!s}</code> and "
+"<code>{suffix!s}</code> for unit {name!s}."
+msgstr ""
+"Ismeretlen systemd parancsok <code>{command!s}</code> és "
+"<code>{suffix!s}</code> a {name!s} egységhez. "
 
 #: src/modules/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -181,117 +177,73 @@ 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 ""
-"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
-msgstr ""
-"<code>systemctl {arg!s}</code> 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 <code>{name!s}</code>."
-msgstr ""
-"Nem sikerült a systemd szolgáltatást engedélyezni: <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "A KDM konfigurációs fájl nem írható"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target <code>{name!s}</code>."
-msgstr "Nem sikerült a systemd célt engedélyezni: <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "A(z) {!s} KDM konfigurációs fájl nem létezik"
 
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer <code>{name!s}</code>."
-msgstr ""
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "Az LXDM konfigurációs fájl nem írható"
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target <code>{name!s}</code>."
-msgstr "Nem sikerült a systemd cél <code>{name!s}</code> letiltása."
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "A(z) {!s} LXDM konfigurációs fájl nem létezik"
 
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit <code>{name!s}</code>."
-msgstr "Nem maszkolható systemd egység: <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "A LightDM konfigurációs fájl nem írható"
 
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands <code>{command!s}</code> and "
-"<code>{suffix!s}</code> for unit {name!s}."
-msgstr ""
-"Ismeretlen systemd parancsok <code>{command!s}</code> és "
-"<code>{suffix!s}</code> a {name!s} egységhez. "
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "A(z) {!s} LightDM konfigurációs fájl nem létezik"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Hamis Python feladat."
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "A LightDM nem állítható be"
 
-#: 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/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr "Nincs LightDM üdvözlő telepítve."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Rendszerbetöltő telepítése."
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "A SLIM konfigurációs fájl nem írható"
 
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "A(z) {!s} SLIM konfigurációs fájl nem létezik"
 
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr "Nincs kijelzőkezelő kiválasztva a kijelzőkezelő modulhoz."
 
-#: src/modules/bootloader/main.py:783
+#: src/modules/displaymanager/main.py:993
 msgid ""
-"The bootloader could not be installed. The installation command "
-"<pre>{!s}</pre> 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"
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr ""
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr "A kijelzőkezelő konfigurációja hiányos volt"
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Plymouth téma beállítása"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "mkinitcpio konfigurálása."
 
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr "fstab írá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 <pre>{!s}</pre> to use."
+msgstr "Nincs root csatolási pont megadva a <pre>{!s}</pre> használatához."
 
-#: src/modules/fstab/main.py:429
-msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
-msgstr ""
+#: 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"
@@ -342,80 +294,128 @@ msgid ""
 msgstr ""
 "A szolgáltatás {name!s} elérési útja <code>{path!s}</code>, nem létezik."
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "initramfs létrehozása ezzel: dracut."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Plymouth téma beállítása"
 
-#: 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/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/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "A KDM konfigurációs fájl nem írható"
+#: 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/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "A(z) {!s} KDM konfigurációs fájl nem létezik"
+#: 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/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "Az LXDM konfigurációs fájl nem írható"
+#: 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/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "A(z) {!s} LXDM konfigurációs fájl nem létezik"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command <pre>{!s}</pre> "
+"returned error code {!s}."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "A LightDM konfigurációs fájl nem írható"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command <pre>{!s}</pre>"
+" returned error code {!s}."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "A(z) {!s} LightDM konfigurációs fájl nem létezik"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command <pre>{!s}</pre> returned error code {!s}."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "A LightDM nem állítható be"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Rendszerbetöltő telepítése."
 
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr "Nincs LightDM üdvözlő telepítve."
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
 
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "A SLIM konfigurációs fájl nem írható"
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
 
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "A(z) {!s} SLIM konfigurációs fájl nem létezik"
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"<pre>{!s}</pre> returned error code {!s}."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:992
-msgid "No display managers selected for the displaymanager module."
-msgstr "Nincs kijelzőkezelő kiválasztva a kijelzőkezelő modulhoz."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Rendszeridő beállítása."
 
-#: src/modules/displaymanager/main.py:993
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:1075
-msgid "Display manager configuration was incomplete"
-msgstr "A kijelzőkezelő konfigurációja hiányos volt"
+#: 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/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Rendszeridő beállítása."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "OpenRC dmcrypt szolgáltatás konfigurálása."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Adatok telepítése."
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr "fstab írása."
+
+#: src/modules/fstab/main.py:429
+msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> 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 c431120baefa92f6942d555ac9f62f578428e8de..7e96cff3a4db67a7d5fd5519ee68644f4838cc70 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 <drajathasan20@gmail.com>, 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/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr ""
 
-#: 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 <pre>{!s}</pre> "
-"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 <pre>{!s}</pre>"
-" 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 <pre>{!s}</pre> 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 "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 <pre>{!s}</pre> to use."
+#: 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 <pre>{!s}</pre> to use."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
 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
-msgid "No partitions are defined for <pre>{!s}</pre> to use."
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"<code>systemctl {arg!s}</code> 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 <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target <code>{name!s}</code>."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer <code>{name!s}</code>."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target <code>{name!s}</code>."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit <code>{name!s}</code>."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands <code>{command!s}</code> and "
+"<code>{suffix!s}</code> for unit {name!s}."
 msgstr ""
 
 #: src/modules/unpackfs/main.py:34
@@ -178,112 +172,72 @@ 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 ""
-"<code>systemctl {arg!s}</code> 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 <code>{name!s}</code>."
-msgstr ""
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "Gak bisa menulis file konfigurasi KDM"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target <code>{name!s}</code>."
-msgstr ""
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "File {!s} config KDM belum ada"
 
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer <code>{name!s}</code>."
-msgstr ""
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "Gak bisa menulis file konfigurasi LXDM"
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target <code>{name!s}</code>."
-msgstr ""
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "File {!s} config LXDM enggak ada"
 
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit <code>{name!s}</code>."
-msgstr ""
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "Gak bisa menulis file konfigurasi LightDM"
 
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands <code>{command!s}</code> and "
-"<code>{suffix!s}</code> for unit {name!s}."
-msgstr ""
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "File {!s} config LightDM belum ada"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Tugas dumi python."
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "Gak bisa mengkonfigurasi LightDM"
 
-#: 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/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr "Tiada LightDM greeter yang terinstal."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "Gak bisa menulis file konfigurasi SLIM"
 
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "File {!s} config SLIM belum ada"
 
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr "Tiada display manager yang dipilih untuk modul displaymanager."
 
-#: src/modules/bootloader/main.py:783
+#: src/modules/displaymanager/main.py:993
 msgid ""
-"The bootloader could not be installed. The installation command "
-"<pre>{!s}</pre> 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"
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr ""
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr "Konfigurasi display manager belum rampung"
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
+#: 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 <pre>{!s}</pre> to use."
 msgstr ""
 
-#: src/modules/fstab/main.py:429
-msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
 
 #: src/modules/services-openrc/main.py:29
@@ -329,80 +283,126 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-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/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: 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/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "Gak bisa menulis file konfigurasi KDM"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command <pre>{!s}</pre> "
+"returned error code {!s}."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "File {!s} config KDM belum ada"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command <pre>{!s}</pre>"
+" returned error code {!s}."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "Gak bisa menulis file konfigurasi LXDM"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command <pre>{!s}</pre> returned error code {!s}."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "File {!s} config LXDM enggak ada"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "Gak bisa menulis file konfigurasi LightDM"
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
 
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "File {!s} config LightDM belum ada"
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
 
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "Gak bisa mengkonfigurasi LightDM"
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"<pre>{!s}</pre> returned error code {!s}."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr "Tiada LightDM greeter yang terinstal."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "Gak bisa menulis file konfigurasi SLIM"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "File {!s} config SLIM belum ada"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr ""
 
-#: src/modules/displaymanager/main.py:992
-msgid "No display managers selected for the displaymanager module."
-msgstr "Tiada display manager yang dipilih untuk modul displaymanager."
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr ""
 
-#: src/modules/displaymanager/main.py:993
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:1075
-msgid "Display manager configuration was incomplete"
-msgstr "Konfigurasi display manager belum rampung"
+#: 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/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> 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 49eb3b9254438552ec61ae80ac444e9af704e083..542aa39f2741f30e5501591b7331fe7d8b80d3aa 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/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/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Configurante GRUB."
 
-#: 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:42
+msgid "Mounting partitions."
+msgstr "Montente partitiones."
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command <pre>{!s}</pre> "
-"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 <pre>{!s}</pre>"
-" 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 <pre>{!s}</pre> 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 "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 <pre>{!s}</pre> to use."
+#: 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 <pre>{!s}</pre> to use."
+msgstr "Null partition es definit por usa de <pre>{!s}</pre>."
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Configurante mkinitcpio."
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Configurante servicios de systemd"
 
-#: 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
-msgid "No partitions are defined for <pre>{!s}</pre> to use."
-msgstr "Null partition es definit por usa de <pre>{!s}</pre>."
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
 msgstr ""
+"Invocation de <code>systemctl {arg!s}</code> in chroot retrodat li code "
+"{num!s}."
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service <code>{name!s}</code>."
+msgstr "Ne successat activar li servicio de systemd <code>{name!s}</code>."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Li code de termination esset {}"
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer <code>{name!s}</code>."
+msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target <code>{name!s}</code>."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit <code>{name!s}</code>."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands <code>{command!s}</code> and "
+"<code>{suffix!s}</code> for unit {name!s}."
 msgstr ""
 
 #: src/modules/unpackfs/main.py:34
@@ -178,115 +172,73 @@ 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 ""
-"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
-msgstr ""
-"Invocation de <code>systemctl {arg!s}</code> in chroot retrodat li code "
-"{num!s}."
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "Ne successat scrir li file de configuration de KDM"
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service <code>{name!s}</code>."
-msgstr "Ne successat activar li servicio de systemd <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "File del configuration de KDM {!s} ne existe"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target <code>{name!s}</code>."
-msgstr ""
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "Ne successat scrir li file de configuration de LXDM"
 
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer <code>{name!s}</code>."
-msgstr ""
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "File del configuration de LXDM {!s} ne existe"
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target <code>{name!s}</code>."
-msgstr ""
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "Ne successat scrir li file de configuration de LightDM"
 
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit <code>{name!s}</code>."
-msgstr ""
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "File del configuration de LightDM {!s} ne existe"
 
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands <code>{command!s}</code> and "
-"<code>{suffix!s}</code> for unit {name!s}."
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
 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/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "File del configuration de SLIM {!s} ne existe"
 
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/bootloader/main.py:783
+#: src/modules/displaymanager/main.py:993
 msgid ""
-"The bootloader could not be installed. The installation command "
-"<pre>{!s}</pre> 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"
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr ""
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Configurante mkinitcpio."
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
+#: 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 <pre>{!s}</pre> to use."
 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 <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> 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"
@@ -333,80 +285,128 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr ""
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Configurante li tema de Plymouth"
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: 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/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Configurante GRUB."
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "Ne successat scrir li file de configuration de KDM"
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "File del configuration de KDM {!s} ne existe"
+#: 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/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "Ne successat scrir li file de configuration de LXDM"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command <pre>{!s}</pre> "
+"returned error code {!s}."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "File del configuration de LXDM {!s} ne existe"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command <pre>{!s}</pre>"
+" returned error code {!s}."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "Ne successat scrir li file de configuration de LightDM"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command <pre>{!s}</pre> returned error code {!s}."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "File del configuration de LightDM {!s} ne existe"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Installante li bootloader."
 
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"<pre>{!s}</pre> returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "File del configuration de SLIM {!s} ne existe"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:992
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:993
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:1075
-msgid "Display manager configuration was incomplete"
+#: 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/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Installante li data."
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr "Scrition de fstab."
+
+#: src/modules/fstab/main.py:429
+msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> 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 77254f6f7c844c9f6ae13befb124aac4b4eb0a34..159832f795af4bcde88d8bc76d9969e8e1cafee3 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/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr ""
 
-#: src/modules/packages/main.py:63
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Vinnslupakkar (%(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] "Setja upp einn pakka."
-msgstr[1] "Setur upp %(num)d pakka."
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr ""
 
-#: 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/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr ""
 
-#: 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 <pre>{!s}</pre> "
-"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 <pre>{!s}</pre>"
-" returned error code {!s}."
+#: 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/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command <pre>{!s}</pre> returned error code {!s}."
+#: 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 <pre>{!s}</pre> to use."
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
 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/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
-msgid "Configuration Error"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 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 <pre>{!s}</pre> to use."
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
 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
-msgid "No partitions are defined for <pre>{!s}</pre> to use."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit <code>{name!s}</code>."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands <code>{command!s}</code> and "
+"<code>{suffix!s}</code> for unit {name!s}."
 msgstr ""
 
 #: src/modules/unpackfs/main.py:34
@@ -178,112 +170,72 @@ 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 ""
-"<code>systemctl {arg!s}</code> 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 <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands <code>{command!s}</code> and "
-"<code>{suffix!s}</code> for unit {name!s}."
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/bootloader/main.py:783
+#: src/modules/displaymanager/main.py:993
 msgid ""
-"The bootloader could not be installed. The installation command "
-"<pre>{!s}</pre> 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"
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
+#: 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 <pre>{!s}</pre> to use."
 msgstr ""
 
-#: src/modules/fstab/main.py:429
-msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
 
 #: src/modules/services-openrc/main.py:29
@@ -329,80 +281,128 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-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/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: 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/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command <pre>{!s}</pre> "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command <pre>{!s}</pre>"
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command <pre>{!s}</pre> returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"<pre>{!s}</pre> returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:992
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:993
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:1075
-msgid "Display manager configuration was incomplete"
+#: 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/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> 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 7f113f9ab0312eb3c78dd1333b54071bf1c642ea..b5187ea77c1169764a57c79fd83f248eaf0a16b9 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 <saverio.brancaccio@gmail.com>, 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/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/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Configura GRUB."
 
-#: 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/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "Montaggio partizioni."
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command <pre>{!s}</pre> "
-"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 <pre>{!s}</pre>"
-" returned error code {!s}."
-msgstr ""
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr "Importazione zpool non riuscita"
 
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command <pre>{!s}</pre> returned error code {!s}."
-msgstr ""
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr "Sblocco zpool non riuscito"
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Salvataggio della configurazione di rete."
+#: 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 "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 <pre>{!s}</pre> to use."
-msgstr "Nessun punto di mount root è dato in l'uso per <pre>{!s}</pre>"
-
-#: 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 <pre>{!s}</pre> to use."
 msgstr "Nessuna partizione definita per l'uso con <pre>{!s}</pre>."
 
-#: 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 ""
+"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
+msgstr ""
+"La chiamata <code>systemctl {arg!s}</code> 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 <code>{name!s}</code>."
+msgstr "Impossibile abilitare il servizio systemd <code>{name!s}</code>."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target <code>{name!s}</code>."
+msgstr "Impossibile abilitare la destinazione systemd <code>{name!s}</code>."
+
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer <code>{name!s}</code>."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target <code>{name!s}</code>."
+msgstr ""
+"Impossibile disabilitare la destinazione systemd <code>{name!s}</code>."
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit <code>{name!s}</code>."
+msgstr "Impossibile mascherare l'unità systemd <code>{name!s}</code>."
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands <code>{command!s}</code> and "
+"<code>{suffix!s}</code> for unit {name!s}."
+msgstr ""
+"Comandi systemd sconosciuti <code>{command!s}</code> "
+"e<code>{suffix!s}</code> per l'unità {name!s}."
 
 #: src/modules/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -184,120 +179,76 @@ 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 ""
-"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
-msgstr ""
-"La chiamata <code>systemctl {arg!s}</code> in chroot ha restituito il codice"
-" di errore {num!s}."
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "Impossibile scrivere il file di configurazione di KDM"
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service <code>{name!s}</code>."
-msgstr "Impossibile abilitare il servizio systemd <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "Il file di configurazione di KDM {!s} non esiste"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target <code>{name!s}</code>."
-msgstr "Impossibile abilitare la destinazione systemd <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "Impossibile scrivere il file di configurazione di LXDM"
 
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer <code>{name!s}</code>."
-msgstr ""
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "Il file di configurazione di LXDM {!s} non esiste"
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target <code>{name!s}</code>."
-msgstr ""
-"Impossibile disabilitare la destinazione systemd <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "Impossibile scrivere il file di configurazione di LightDM"
 
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit <code>{name!s}</code>."
-msgstr "Impossibile mascherare l'unità systemd <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "Il file di configurazione di LightDM {!s} non esiste"
 
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands <code>{command!s}</code> and "
-"<code>{suffix!s}</code> for unit {name!s}."
-msgstr ""
-"Comandi systemd sconosciuti <code>{command!s}</code> "
-"e<code>{suffix!s}</code> per l'unità {name!s}."
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "Impossibile configurare LightDM"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Job python fittizio."
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr "Nessun LightDM greeter installato."
 
-#: 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/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "Impossibile scrivere il file di configurazione di SLIM"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Installa il bootloader."
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "Il file di configurazione di SLIM {!s} non esiste"
 
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
 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"
+"Non è stato selezionato alcun display manager per il modulo displaymanager"
 
-#: src/modules/bootloader/main.py:783
+#: src/modules/displaymanager/main.py:993
 msgid ""
-"The bootloader could not be installed. The installation command "
-"<pre>{!s}</pre> 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"
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
+"L'elenco dei display manager è vuota o non definita sia in globalstorage che"
+" in displaymanager.conf."
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr "errore di mount zfs"
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr "La configurazione del display manager è incompleta"
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Configura il tema Plymouth"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Configurazione di mkinitcpio."
 
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr "Scrittura di fstab."
+#: 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 <pre>{!s}</pre> to use."
+msgstr "Nessun punto di mount root è dato in l'uso per <pre>{!s}</pre>"
 
-#: src/modules/fstab/main.py:429
-msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
-msgstr ""
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Installazione dei dati."
 
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
@@ -348,83 +299,132 @@ msgid ""
 msgstr ""
 "Il percorso del servizio {name!s} è <code>{path!s}</code>, 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"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Configura il tema Plymouth"
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "Il file di configurazione di KDM {!s} non esiste"
+#: 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/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "Impossibile scrivere il file di configurazione di LXDM"
+#: 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/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "Il file di configurazione di LXDM {!s} non esiste"
+#: 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/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "Impossibile scrivere il file di configurazione di LightDM"
+#: 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/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "Il file di configurazione di LightDM {!s} non esiste"
+#: 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/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "Impossibile configurare LightDM"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command <pre>{!s}</pre> "
+"returned error code {!s}."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr "Nessun LightDM greeter installato."
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command <pre>{!s}</pre>"
+" returned error code {!s}."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "Impossibile scrivere il file di configurazione di SLIM"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command <pre>{!s}</pre> returned error code {!s}."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "Il file di configurazione di SLIM {!s} non esiste"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Installa il bootloader."
 
-#: src/modules/displaymanager/main.py:992
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
 msgstr ""
-"Non è stato selezionato alcun display manager per il modulo displaymanager"
+"Installazione di grub non riuscita, nessuna partizione definita "
+"nell'archiviazione globale"
 
-#: src/modules/displaymanager/main.py:993
+#: 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 displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"The bootloader could not be installed. The installation command "
+"<pre>{!s}</pre> returned error code {!s}."
 msgstr ""
-"L'elenco dei display manager è vuota o non definita sia in globalstorage che"
-" in displaymanager.conf."
 
-#: src/modules/displaymanager/main.py:1075
-msgid "Display manager configuration was incomplete"
-msgstr "La configurazione del display manager è incompleta"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Impostazione del clock hardware."
+
+#: 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/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Impostazione del clock hardware."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Configurazione del servizio OpenRC dmcrypt."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Installazione dei dati."
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr "Scrittura di fstab."
+
+#: src/modules/fstab/main.py:429
+msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> 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 38cbed4f58e9c3809a28166d934eab6fc4b1bdec..5dd940672077a478a4274bba8ffd7d473039e1db 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/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr ""
 
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr ""
 
-#: 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 <pre>{!s}</pre> "
-"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 <pre>{!s}</pre>"
-" returned error code {!s}."
+#: 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/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command <pre>{!s}</pre> returned error code {!s}."
+#: 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 <pre>{!s}</pre> to use."
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
 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/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
-msgid "Configuration Error"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 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 <pre>{!s}</pre> to use."
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
 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
-msgid "No partitions are defined for <pre>{!s}</pre> to use."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit <code>{name!s}</code>."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands <code>{command!s}</code> and "
+"<code>{suffix!s}</code> for unit {name!s}."
 msgstr ""
 
 #: src/modules/unpackfs/main.py:34
@@ -172,112 +166,72 @@ 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 ""
-"<code>systemctl {arg!s}</code> 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 <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands <code>{command!s}</code> and "
-"<code>{suffix!s}</code> for unit {name!s}."
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/bootloader/main.py:783
+#: src/modules/displaymanager/main.py:993
 msgid ""
-"The bootloader could not be installed. The installation command "
-"<pre>{!s}</pre> 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"
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
+#: 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 <pre>{!s}</pre> to use."
 msgstr ""
 
-#: src/modules/fstab/main.py:429
-msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
 
 #: src/modules/services-openrc/main.py:29
@@ -323,80 +277,126 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: 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."
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
+#: 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/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command <pre>{!s}</pre> "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command <pre>{!s}</pre>"
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command <pre>{!s}</pre> returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"<pre>{!s}</pre> returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:992
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:993
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:1075
-msgid "Display manager configuration was incomplete"
+#: 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/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> 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 0f2aef6763a514e7fa34e4bacb6de4ed3fe2ecf3..10f7f4310da3fb056c6ab3de021656116b935faa 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 <utuhiro78@yahoo.co.jp>, 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/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/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "GRUBを設定にします。"
 
-#: 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:42
+msgid "Mounting partitions."
+msgstr "パーティションのマウント。"
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command <pre>{!s}</pre> "
-"returned error code {!s}."
-msgstr ""
-"パッケージマネージャーはアップデートを準備できませんでした。コマンド <pre>{!s}</pre> はエラーコード {!s} を返しました。"
+#: 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:738
-msgid ""
-"The package manager could not update the system. The command <pre>{!s}</pre>"
-" returned error code {!s}."
-msgstr ""
-"パッケージマネージャーはシステムをアップデートできませんでした。 コマンド <pre>{!s}</pre> はエラーコード {!s} を返しました。"
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr "zpool のインポートに失敗しました"
 
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command <pre>{!s}</pre> returned error code {!s}."
-msgstr ""
-"パッケージマネージャーはインストールされているシステムに変更を加えられませんでした。コマンド <pre>{!s}</pre> はエラーコード {!s} "
-"を返しました。"
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr "zpool のロック解除に失敗しました。"
 
-#: 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 "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 "コンフィグレーションエラー"
 
-#: 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 <pre>{!s}</pre> to use."
-msgstr " <pre>{!s}</pre> を使用するのにルートマウントポイントが与えられていません。"
-
-#: 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 <pre>{!s}</pre> to use."
 msgstr "<pre>{!s}</pre> に使用するパーティションが定義されていません。"
 
-#: 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 ""
+"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
+msgstr ""
+"chroot で <code>systemctl {arg!s}</code> を呼び出すと、エラーコード {num!s} が返されました。"
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service <code>{name!s}</code>."
+msgstr "<code>{name!s}</code>というsystemdサービスが可能にすることができません"
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target <code>{name!s}</code>."
+msgstr "systemd でターゲット <code>{name!s}</code>が開始できません。"
+
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer <code>{name!s}</code>."
+msgstr "systemd タイマー <code>{name!s}</code> を有効にできません。"
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target <code>{name!s}</code>."
+msgstr "systemd でターゲット <code>{name!s}</code>が停止できません。"
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit <code>{name!s}</code>."
+msgstr "systemd ユニット <code>{name!s}</code> をマスクできません。"
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands <code>{command!s}</code> and "
+"<code>{suffix!s}</code> for unit {name!s}."
+msgstr ""
+"ユニット {name!s} に対する未知の systemd コマンド <code>{command!s}</code> と "
+"<code>{suffix!s}</code>。"
 
 #: src/modules/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -182,117 +175,73 @@ 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 ""
-"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
-msgstr ""
-"chroot で <code>systemctl {arg!s}</code> を呼び出すと、エラーコード {num!s} が返されました。"
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service <code>{name!s}</code>."
-msgstr "<code>{name!s}</code>というsystemdサービスが可能にすることができません"
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "KDMの設定ファイルに書き込みができません"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target <code>{name!s}</code>."
-msgstr "systemd でターゲット <code>{name!s}</code>が開始できません。"
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "KDM 設定ファイル {!s} が存在しません"
 
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer <code>{name!s}</code>."
-msgstr "systemd タイマー <code>{name!s}</code> を有効にできません。"
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "LXDMの設定ファイルに書き込みができません"
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target <code>{name!s}</code>."
-msgstr "systemd でターゲット <code>{name!s}</code>が停止できません。"
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "LXDM 設定ファイル {!s} が存在しません"
 
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit <code>{name!s}</code>."
-msgstr "systemd ユニット <code>{name!s}</code> をマスクできません。"
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "LightDMの設定ファイルに書き込みができません"
 
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands <code>{command!s}</code> and "
-"<code>{suffix!s}</code> for unit {name!s}."
-msgstr ""
-"ユニット {name!s} に対する未知の systemd コマンド <code>{command!s}</code> と "
-"<code>{suffix!s}</code>。"
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "LightDM 設定ファイル {!s} が存在しません"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Dummy python job."
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "LightDMの設定ができません"
 
-#: 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/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr "LightDM greeter がインストールされていません。"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "ブートローダーをインストール"
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "SLIMの設定ファイルに書き込みができません"
 
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr "grub のインストールに失敗しました。グローバルストレージにパーティションが定義されていません"
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "SLIM 設定ファイル {!s} が存在しません"
 
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr "ブートローダーのインストールエラー"
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr "ディスプレイマネージャが選択されていません。"
 
-#: src/modules/bootloader/main.py:783
+#: src/modules/displaymanager/main.py:993
 msgid ""
-"The bootloader could not be installed. The installation command "
-"<pre>{!s}</pre> returned error code {!s}."
-msgstr ""
-"ブートローダーをインストールできませんでした。インストールコマンド <pre>{!s}</pre> がエラーコード {!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 マウントポイントの設定に失敗しました"
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
+msgstr "globalstorage と displaymanager.conf の両方で、displaymanagers リストが空か未定義です。"
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr "zfs のマウントでエラー"
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr "ディスプレイマネージャの設定が不完全です"
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Plymouthテーマを設定"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "mkinitcpioを設定しています。"
 
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr "fstabを書き込んでいます。"
+#: 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 <pre>{!s}</pre> to use."
+msgstr " <pre>{!s}</pre> を使用するのにルートマウントポイントが与えられていません。"
 
-#: src/modules/fstab/main.py:429
-msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
-msgstr "<pre>{!s}</pre> が使用する <pre>{!s}</pre> 設定が指定されていません。"
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "データのインストール。"
 
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
@@ -338,80 +287,131 @@ msgid ""
 "exist."
 msgstr "サービス {name!s} のパスが <code>{path!s}</code> です。これは存在しません。"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "dracutとinitramfsを作成しています。"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Plymouthテーマを設定"
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "ターゲット上で dracut の実行に失敗"
+#: 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/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "KDMの設定ファイルに書き込みができません"
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] " %(num)d パッケージをインストールしています。"
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "KDM 設定ファイル {!s} が存在しません"
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] " %(num)d パッケージを削除しています。"
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "LXDMの設定ファイルに書き込みができません"
+#: 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/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "LXDM 設定ファイル {!s} が存在しません"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command <pre>{!s}</pre> "
+"returned error code {!s}."
+msgstr ""
+"パッケージマネージャーはアップデートを準備できませんでした。コマンド <pre>{!s}</pre> はエラーコード {!s} を返しました。"
 
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "LightDMの設定ファイルに書き込みができません"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command <pre>{!s}</pre>"
+" returned error code {!s}."
+msgstr ""
+"パッケージマネージャーはシステムをアップデートできませんでした。 コマンド <pre>{!s}</pre> はエラーコード {!s} を返しました。"
 
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "LightDM 設定ファイル {!s} が存在しません"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command <pre>{!s}</pre> returned error code {!s}."
+msgstr ""
+"パッケージマネージャーはインストールされているシステムに変更を加えられませんでした。コマンド <pre>{!s}</pre> はエラーコード {!s} "
+"を返しました。"
 
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "LightDMの設定ができません"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "ブートローダーをインストール"
 
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr "LightDM greeter がインストールされていません。"
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr "grub のインストールに失敗しました。グローバルストレージにパーティションが定義されていません"
 
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "SLIMの設定ファイルに書き込みができません"
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr "ブートローダーのインストールエラー"
 
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "SLIM 設定ファイル {!s} が存在しません"
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"<pre>{!s}</pre> returned error code {!s}."
+msgstr ""
+"ブートローダーをインストールできませんでした。インストールコマンド <pre>{!s}</pre> がエラーコード {!s} を返しました。"
 
-#: src/modules/displaymanager/main.py:992
-msgid "No display managers selected for the displaymanager module."
-msgstr "ディスプレイマネージャが選択されていません。"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "ハードウェアクロックの設定"
 
-#: src/modules/displaymanager/main.py:993
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
-msgstr "globalstorage と displaymanager.conf の両方で、displaymanagers リストが空か未定義です。"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "mkinitfsを使用してinitramfsを作成します。"
 
-#: src/modules/displaymanager/main.py:1075
-msgid "Display manager configuration was incomplete"
-msgstr "ディスプレイマネージャの設定が不完全です"
+#: 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/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "ハードウェアクロックの設定"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "OpenRC dmcryptサービスを設定しています。"
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "データのインストール。"
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr "fstabを書き込んでいます。"
+
+#: src/modules/fstab/main.py:429
+msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
+msgstr "<pre>{!s}</pre> が使用する <pre>{!s}</pre> 設定が指定されていません。"
+
+#: 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 a7435ec5066c4bfdb029f65b8ee67d90a380ecf2..e6f2bb036aa199ee5f24d819f07589488205d299 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/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr ""
 
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr ""
 
-#: 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 <pre>{!s}</pre> "
-"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 <pre>{!s}</pre>"
-" returned error code {!s}."
+#: 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/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command <pre>{!s}</pre> returned error code {!s}."
+#: 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 <pre>{!s}</pre> to use."
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
 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/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
-msgid "Configuration Error"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 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 <pre>{!s}</pre> to use."
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
 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
-msgid "No partitions are defined for <pre>{!s}</pre> to use."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit <code>{name!s}</code>."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands <code>{command!s}</code> and "
+"<code>{suffix!s}</code> for unit {name!s}."
 msgstr ""
 
 #: src/modules/unpackfs/main.py:34
@@ -174,112 +166,72 @@ 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 ""
-"<code>systemctl {arg!s}</code> 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 <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands <code>{command!s}</code> and "
-"<code>{suffix!s}</code> for unit {name!s}."
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/bootloader/main.py:783
+#: src/modules/displaymanager/main.py:993
 msgid ""
-"The bootloader could not be installed. The installation command "
-"<pre>{!s}</pre> 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"
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
+#: 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 <pre>{!s}</pre> to use."
 msgstr ""
 
-#: src/modules/fstab/main.py:429
-msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
 
 #: src/modules/services-openrc/main.py:29
@@ -325,80 +277,128 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: 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."
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
+#: 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/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command <pre>{!s}</pre> "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command <pre>{!s}</pre>"
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command <pre>{!s}</pre> returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"<pre>{!s}</pre> returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:992
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:993
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:1075
-msgid "Display manager configuration was incomplete"
+#: 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/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> 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 89c35467617703ceeefddb6afd082e9266b940a7..3c1265d64c1387197368abf574d175d76737d372 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/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr ""
 
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr ""
 
-#: 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 <pre>{!s}</pre> "
-"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 <pre>{!s}</pre>"
-" returned error code {!s}."
+#: 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/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command <pre>{!s}</pre> returned error code {!s}."
+#: 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 <pre>{!s}</pre> to use."
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
 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/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
-msgid "Configuration Error"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 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 <pre>{!s}</pre> to use."
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
 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
-msgid "No partitions are defined for <pre>{!s}</pre> to use."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit <code>{name!s}</code>."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands <code>{command!s}</code> and "
+"<code>{suffix!s}</code> for unit {name!s}."
 msgstr ""
 
 #: src/modules/unpackfs/main.py:34
@@ -174,112 +166,72 @@ 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 ""
-"<code>systemctl {arg!s}</code> 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 <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands <code>{command!s}</code> and "
-"<code>{suffix!s}</code> for unit {name!s}."
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/bootloader/main.py:783
+#: src/modules/displaymanager/main.py:993
 msgid ""
-"The bootloader could not be installed. The installation command "
-"<pre>{!s}</pre> 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"
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
+#: 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 <pre>{!s}</pre> to use."
 msgstr ""
 
-#: src/modules/fstab/main.py:429
-msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
 
 #: src/modules/services-openrc/main.py:29
@@ -325,80 +277,128 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: 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."
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
+#: 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/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command <pre>{!s}</pre> "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command <pre>{!s}</pre>"
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command <pre>{!s}</pre> returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"<pre>{!s}</pre> returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:992
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:993
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:1075
-msgid "Display manager configuration was incomplete"
+#: 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/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> 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 d752526c5befb880cdc40a3c7948f81fcc92409d..dc2f27b8cf1b1a77b24e6a5c6e225468e3621657 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 <daemul72@gmail.com>, 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/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/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "GRUB 구성"
 
-#: 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:42
+msgid "Mounting partitions."
+msgstr "파티션 마운트 중."
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command <pre>{!s}</pre> "
-"returned error code {!s}."
-msgstr "패키지 관리자가 업데이트를 준비할 수 없습니다. <pre>{!s}</pre> 명령에서  {!s} 오류 코드를 반환했습니다."
+#: 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:738
-msgid ""
-"The package manager could not update the system. The command <pre>{!s}</pre>"
-" returned error code {!s}."
-msgstr "패키지 관리자가 시스템을 업데이트할 수 없습니다. <pre>{!s}</pre> 명령에서  {!s} 오류 코드를 반환했습니다."
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr "zpool을 가져오지 못했습니다"
 
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command <pre>{!s}</pre> returned error code {!s}."
-msgstr ""
-"패키지 관리자가 설치된 시스템을 변경할 수 없습니다. <pre>{!s}</pre> 명령에서  {!s} 오류 코드를 반환했습니다."
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr "zpool의 잠금을 해제하지 못했습니다"
 
-#: 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 "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 "구성 오류"
 
-#: 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 <pre>{!s}</pre> to use."
-msgstr "<pre>{!s}</pre>에서 사용할 루트 마운트 지점이 제공되지 않음."
-
-#: 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 <pre>{!s}</pre> to use."
 msgstr "사용할 <pre>{!s}</pre>에 대해 정의된 파티션이 없음."
 
-#: 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 ""
+"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
+msgstr "chroot에서 <code>systemctl {arg!s}</code> 호출에서오류 코드 {num}를 반환 했습니다."
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service <code>{name!s}</code>."
+msgstr "<code>{name! s}</code> 시스템 서비스를 활성화 할 수 없습니다."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target <code>{name!s}</code>."
+msgstr "systemd 대상 <code>{name! s}</code>를 활성화 할 수 없습니다."
+
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer <code>{name!s}</code>."
+msgstr "시스템 타이머 <code>{name!s}</code>를 활성화할 수 없습니다."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target <code>{name!s}</code>."
+msgstr "systemd 대상 <code>{name! s}</code>를 비활성화 할 수 없습니다."
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit <code>{name!s}</code>."
+msgstr "시스템 유닛 <code>{name! s}</code>를 마스크할 수 없습니다."
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands <code>{command!s}</code> and "
+"<code>{suffix!s}</code> for unit {name!s}."
+msgstr ""
+"유닛 {name! s}에 대해 알 수 없는 시스템 명령 <code>{command! s}</code> 및 <code>{suffix! "
+"s}</code>."
 
 #: src/modules/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -178,115 +173,75 @@ 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 ""
-"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
-msgstr "chroot에서 <code>systemctl {arg!s}</code> 호출에서오류 코드 {num}를 반환 했습니다."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service <code>{name!s}</code>."
-msgstr "<code>{name! s}</code> 시스템 서비스를 활성화 할 수 없습니다."
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "KDM 구성 파일을 쓸 수 없습니다."
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target <code>{name!s}</code>."
-msgstr "systemd 대상 <code>{name! s}</code>를 활성화 할 수 없습니다."
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "KDM 구성 파일 {! s}가 없습니다"
 
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer <code>{name!s}</code>."
-msgstr "시스템 타이머 <code>{name!s}</code>를 활성화할 수 없습니다."
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "LMLDM 구성 파일을 쓸 수 없습니다."
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target <code>{name!s}</code>."
-msgstr "systemd 대상 <code>{name! s}</code>를 비활성화 할 수 없습니다."
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "LXDM 구성 파일 {!s}이 없습니다."
 
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit <code>{name!s}</code>."
-msgstr "시스템 유닛 <code>{name! s}</code>를 마스크할 수 없습니다."
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "LightDM 구성 파일을 쓸 수 없습니다."
 
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands <code>{command!s}</code> and "
-"<code>{suffix!s}</code> for unit {name!s}."
-msgstr ""
-"유닛 {name! s}에 대해 알 수 없는 시스템 명령 <code>{command! s}</code> 및 <code>{suffix! "
-"s}</code>."
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "LightDM 구성 파일 {!s}가 없습니다."
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "더미 파이썬 작업."
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "LightDM을 구성할 수 없습니다."
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "더미 파이썬 단계 {}"
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr "LightDM greeter가 설치되지 않았습니다."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "부트로더 설치."
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "SLIM 구성 파일을 쓸 수 없음"
 
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr "grub을 설치하지 못했습니다. 파티션 없음이 전역 저장소에 정의되었습니다"
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "SLIM 구성 파일 {!s}가 없음"
 
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr "부트로더 설치 오류"
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr "displaymanager 모듈에 대해 선택된 디스플레이 관리자가 없습니다."
 
-#: src/modules/bootloader/main.py:783
+#: src/modules/displaymanager/main.py:993
 msgid ""
-"The bootloader could not be installed. The installation command "
-"<pre>{!s}</pre> returned error code {!s}."
-msgstr "부트로더를 설치할 수 없습니다. <pre>{!s}</pre> 설치 명령에서  {!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 마운트위치를 지정하지 못했습니다"
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
+msgstr ""
+"displaymanagers 목록이 비어 있거나 globalstorage 및 displaymanager.conf 모두에서 정의되지 "
+"않았습니다."
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr "zfs 마운트하는 중 오류"
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr "디스플레이 관리자 구성이 완료되지 않았습니다."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "플리머스 테마 구성"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "mkinitcpio 구성 중."
 
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr "fstab 쓰기."
+#: 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 <pre>{!s}</pre> to use."
+msgstr "<pre>{!s}</pre>에서 사용할 루트 마운트 지점이 제공되지 않음."
 
-#: src/modules/fstab/main.py:429
-msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
-msgstr "<pre>{!s}</pre> 구성 없음은 <pre>{!s}</pre>을(를) 사용할 수 있도록 제공됩니다."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "데이터 설치중."
 
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
@@ -333,82 +288,127 @@ msgid ""
 "exist."
 msgstr "{name!s} 서비스에 대한 경로는 <code>{path!s}</code>이고, 존재하지 않습니다."
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "dracut을 사용하여 initramfs 만들기."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "플리머스 테마 구성"
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "대상에서 dracut을 실행하지 못함"
+#: 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/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "KDM 구성 파일을 쓸 수 없습니다."
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "%(num)d개의 패키지들을 설치하는 중입니다."
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "KDM 구성 파일 {! s}가 없습니다"
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "%(num)d개의 패키지들을 제거하는 중입니다."
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "LMLDM 구성 파일을 쓸 수 없습니다."
+#: 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/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "LXDM 구성 파일 {!s}이 없습니다."
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command <pre>{!s}</pre> "
+"returned error code {!s}."
+msgstr "패키지 관리자가 업데이트를 준비할 수 없습니다. <pre>{!s}</pre> 명령에서  {!s} 오류 코드를 반환했습니다."
 
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "LightDM 구성 파일을 쓸 수 없습니다."
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command <pre>{!s}</pre>"
+" returned error code {!s}."
+msgstr "패키지 관리자가 시스템을 업데이트할 수 없습니다. <pre>{!s}</pre> 명령에서  {!s} 오류 코드를 반환했습니다."
 
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "LightDM 구성 파일 {!s}가 없습니다."
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command <pre>{!s}</pre> returned error code {!s}."
+msgstr ""
+"패키지 관리자가 설치된 시스템을 변경할 수 없습니다. <pre>{!s}</pre> 명령에서  {!s} 오류 코드를 반환했습니다."
 
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "LightDM을 구성할 수 없습니다."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "부트로더 설치."
 
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr "LightDM greeter가 설치되지 않았습니다."
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr "grub을 설치하지 못했습니다. 파티션 없음이 전역 저장소에 정의되었습니다"
 
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "SLIM 구성 파일을 쓸 수 없음"
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr "부트로더 설치 오류"
 
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "SLIM 구성 파일 {!s}가 없음"
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"<pre>{!s}</pre> returned error code {!s}."
+msgstr "부트로더를 설치할 수 없습니다. <pre>{!s}</pre> 설치 명령에서  {!s} 오류 코드를 반환했습니다."
 
-#: src/modules/displaymanager/main.py:992
-msgid "No display managers selected for the displaymanager module."
-msgstr "displaymanager 모듈에 대해 선택된 디스플레이 관리자가 없습니다."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "하드웨어 클럭 설정 중."
 
-#: src/modules/displaymanager/main.py:993
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
-msgstr ""
-"displaymanagers 목록이 비어 있거나 globalstorage 및 displaymanager.conf 모두에서 정의되지 "
-"않았습니다."
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "mkinitfs로 initramfs 생성 중."
 
-#: src/modules/displaymanager/main.py:1075
-msgid "Display manager configuration was incomplete"
-msgstr "디스플레이 관리자 구성이 완료되지 않았습니다."
+#: 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/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "하드웨어 클럭 설정 중."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "OpenRC dmcrypt 서비스 구성 중."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "데이터 설치중."
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr "fstab 쓰기."
+
+#: src/modules/fstab/main.py:429
+msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
+msgstr "<pre>{!s}</pre> 구성 없음은 <pre>{!s}</pre>을(를) 사용할 수 있도록 제공됩니다."
+
+#: 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 faf2073eb98ed20f3555559802e189b8e0c3b75d..d039427662b0fc948fa31157581cc5dc1b125d09 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/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr ""
 
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr ""
 
-#: 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 <pre>{!s}</pre> "
-"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 <pre>{!s}</pre>"
-" returned error code {!s}."
+#: 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/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command <pre>{!s}</pre> returned error code {!s}."
+#: 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 <pre>{!s}</pre> to use."
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
 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/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
-msgid "Configuration Error"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 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 <pre>{!s}</pre> to use."
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
 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
-msgid "No partitions are defined for <pre>{!s}</pre> to use."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit <code>{name!s}</code>."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands <code>{command!s}</code> and "
+"<code>{suffix!s}</code> for unit {name!s}."
 msgstr ""
 
 #: src/modules/unpackfs/main.py:34
@@ -172,112 +166,72 @@ 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 ""
-"<code>systemctl {arg!s}</code> 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 <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands <code>{command!s}</code> and "
-"<code>{suffix!s}</code> for unit {name!s}."
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/bootloader/main.py:783
+#: src/modules/displaymanager/main.py:993
 msgid ""
-"The bootloader could not be installed. The installation command "
-"<pre>{!s}</pre> 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"
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
+#: 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 <pre>{!s}</pre> to use."
 msgstr ""
 
-#: src/modules/fstab/main.py:429
-msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
 
 #: src/modules/services-openrc/main.py:29
@@ -323,80 +277,126 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: 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."
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
+#: 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/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command <pre>{!s}</pre> "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command <pre>{!s}</pre>"
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command <pre>{!s}</pre> returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"<pre>{!s}</pre> returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:992
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:993
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:1075
-msgid "Display manager configuration was incomplete"
+#: 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/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> 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 22976c79c0e725b69546d05503b3c50ba258a3a4..86ab5a5042d685e196343d7b45814c1a80a48359 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/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/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Konfigūruoti GRUB."
 
-#: 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:42
+msgid "Mounting partitions."
+msgstr "Prijungiami skaidiniai."
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command <pre>{!s}</pre> "
-"returned error code {!s}."
-msgstr ""
-"Paketų tvarkytuvei nepavyko paruošti atnaujinimų. Komanda <pre>{!s}</pre> "
-"grąžino klaidos kodą {!s}."
+#: 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:738
-msgid ""
-"The package manager could not update the system. The command <pre>{!s}</pre>"
-" returned error code {!s}."
-msgstr ""
-"Paketų tvarkytuvei nepavyko atnaujinti sistemos. Komanda <pre>{!s}</pre> "
-"grąžino klaidos kodą {!s}."
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr "Nepavyko importuoti zpool"
 
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command <pre>{!s}</pre> returned error code {!s}."
-msgstr ""
-"Paketų tvarkytuvei nepavyko atlikti pakeitimų įdiegtoje sistemoje. Komanda "
-"<pre>{!s}</pre> grąžino klaidos kodą {!s}."
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr "Nepavyko atrakinti zpool"
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Įrašoma tinklo konfigūracija."
+#: 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/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 <pre>{!s}</pre> to use."
+#: 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 <pre>{!s}</pre> to use."
+msgstr "Nėra apibrėžta jokių skaidinių, skirtų <pre>{!s}</pre> naudojimui."
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr "zfs prijungimo klaida"
+
+#: 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 ""
+"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
 msgstr ""
-"Nėra nurodyta jokių šaknies prijungimo taškų, skirtų <pre>{!s}</pre> "
-"naudojimui."
+"<code>systemctl {arg!s}</code> iškvieta, esanti chroot, grąžino klaidos kodą"
+" {num!s}."
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Konfigūruojama mkinitcpio."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service <code>{name!s}</code>."
+msgstr "Nepavyksta įjungti systemd tarnybos <code>{name!s}</code>."
 
-#: 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
-msgid "No partitions are defined for <pre>{!s}</pre> to use."
-msgstr "Nėra apibrėžta jokių skaidinių, skirtų <pre>{!s}</pre> naudojimui."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target <code>{name!s}</code>."
+msgstr "Nepavyksta įjungti systemd paskirties <code>{name!s}</code>."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Kuriama initramfs naudojant mkinitfs."
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer <code>{name!s}</code>."
+msgstr "Nepavyksta įjungti systemd laikmačio <code>{name!s}</code>."
 
-#: 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:71
+msgid "Cannot disable systemd target <code>{name!s}</code>."
+msgstr "Nepavyksta išjungti systemd paskirties <code>{name!s}</code>."
 
-#: 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:73
+msgid "Cannot mask systemd unit <code>{name!s}</code>."
+msgstr "Nepavyksta maskuoti systemd įtaiso <code>{name!s}</code>."
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Konfigūruojama OpenRC dmcrypt tarnyba."
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands <code>{command!s}</code> and "
+"<code>{suffix!s}</code> for unit {name!s}."
+msgstr ""
+"Nežinomos systemd komandos <code>{command!s}</code> ir "
+"<code>{suffix!s}</code> įtaisui {name!s}."
 
 #: src/modules/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -193,123 +177,77 @@ 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 ""
-"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
-msgstr ""
-"<code>systemctl {arg!s}</code> 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 <code>{name!s}</code>."
-msgstr "Nepavyksta įjungti systemd tarnybos <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "Nepavyksta įrašyti KDM konfigūracijos failą"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target <code>{name!s}</code>."
-msgstr "Nepavyksta įjungti systemd paskirties <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "KDM konfigūracijos failo {!s} nėra"
 
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer <code>{name!s}</code>."
-msgstr "Nepavyksta įjungti systemd laikmačio <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "Nepavyksta įrašyti LXDM konfigūracijos failą"
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target <code>{name!s}</code>."
-msgstr "Nepavyksta išjungti systemd paskirties <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "LXDM konfigūracijos failo {!s} nėra"
 
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit <code>{name!s}</code>."
-msgstr "Nepavyksta maskuoti systemd įtaiso <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "Nepavyksta įrašyti LightDM konfigūracijos failą"
 
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands <code>{command!s}</code> and "
-"<code>{suffix!s}</code> for unit {name!s}."
-msgstr ""
-"Nežinomos systemd komandos <code>{command!s}</code> ir "
-"<code>{suffix!s}</code> įtaisui {name!s}."
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "LightDM konfigūracijos failo {!s} nėra"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Fiktyvi python užduotis."
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "Nepavyksta konfigūruoti LightDM"
 
-#: 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/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr "Neįdiegtas joks LightDM pasisveikinimas."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Įdiegti operacinės sistemos paleidyklę."
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "Nepavyksta įrašyti SLIM konfigūracijos failą"
 
-#: 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/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "SLIM konfigūracijos failo {!s} nėra"
 
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr "Operacinės sistemos paleidyklės diegimo klaida"
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr "Displaymanagers moduliui nėra pasirinkta jokių ekranų tvarkytuvių."
 
-#: src/modules/bootloader/main.py:783
+#: src/modules/displaymanager/main.py:993
 msgid ""
-"The bootloader could not be installed. The installation command "
-"<pre>{!s}</pre> returned error code {!s}."
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
-"Nepavyko įdiegti operacinės sistemos paleidyklės. Diegimo komanda "
-"<pre>{!s}</pre> 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"
+"Displaymanagers sąrašas yra tuščias arba neapibrėžtas tiek globalstorage, "
+"tiek ir displaymanager.conf faile."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Konfigūruoti Plymouth temą"
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr "Ekranų tvarkytuvės konfigūracija yra nepilna"
 
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr "Rašoma fstab."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Konfigūruojama mkinitcpio."
 
-#: src/modules/fstab/main.py:429
-msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
+#: 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 <pre>{!s}</pre> to use."
 msgstr ""
-"Nenurodyta jokia <pre>{!s}</pre> konfigūracija, kurią <pre>{!s}</pre> galėtų"
-" naudoti."
+"Nėra nurodyta jokių šaknies prijungimo taškų, skirtų <pre>{!s}</pre> "
+"naudojimui."
+
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Įdiegiami duomenys."
 
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
@@ -361,82 +299,144 @@ msgid ""
 msgstr ""
 "Tarnybos {name!s} kelias yra <code>{path!s}</code>, 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/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Konfigūruoti Plymouth temą"
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "Nepavyksta įrašyti KDM konfigūracijos failą"
+#: 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/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "KDM konfigūracijos failo {!s} nėra"
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Apdorojami paketai (%(count)d / %(total)d)"
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "Nepavyksta įrašyti LXDM konfigūracijos failą"
+#: 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/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "LXDM konfigūracijos failo {!s} nėra"
+#: 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/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "Nepavyksta įrašyti LightDM konfigūracijos failą"
+#: 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/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "LightDM konfigūracijos failo {!s} nėra"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command <pre>{!s}</pre> "
+"returned error code {!s}."
+msgstr ""
+"Paketų tvarkytuvei nepavyko paruošti atnaujinimų. Komanda <pre>{!s}</pre> "
+"grąžino klaidos kodą {!s}."
 
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "Nepavyksta konfigūruoti LightDM"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command <pre>{!s}</pre>"
+" returned error code {!s}."
+msgstr ""
+"Paketų tvarkytuvei nepavyko atnaujinti sistemos. Komanda <pre>{!s}</pre> "
+"grąžino klaidos kodą {!s}."
 
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr "Neįdiegtas joks LightDM pasisveikinimas."
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command <pre>{!s}</pre> returned error code {!s}."
+msgstr ""
+"Paketų tvarkytuvei nepavyko atlikti pakeitimų įdiegtoje sistemoje. Komanda "
+"<pre>{!s}</pre> grąžino klaidos kodą {!s}."
 
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "Nepavyksta įrašyti SLIM konfigūracijos failą"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Įdiegti operacinės sistemos paleidyklę."
 
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "SLIM konfigūracijos failo {!s} nėra"
+#: 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/displaymanager/main.py:992
-msgid "No display managers selected for the displaymanager module."
-msgstr "Displaymanagers moduliui nėra pasirinkta jokių ekranų tvarkytuvių."
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr "Operacinės sistemos paleidyklės diegimo klaida"
 
-#: src/modules/displaymanager/main.py:993
+#: src/modules/bootloader/main.py:783
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"The bootloader could not be installed. The installation command "
+"<pre>{!s}</pre> returned error code {!s}."
 msgstr ""
-"Displaymanagers sąrašas yra tuščias arba neapibrėžtas tiek globalstorage, "
-"tiek ir displaymanager.conf faile."
+"Nepavyko įdiegti operacinės sistemos paleidyklės. Diegimo komanda "
+"<pre>{!s}</pre> grąžino klaidos kodą {!s}."
 
-#: src/modules/displaymanager/main.py:1075
-msgid "Display manager configuration was incomplete"
-msgstr "Ekranų tvarkytuvės konfigūracija yra nepilna"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Nustatomas aparatinės įrangos laikrodis."
+
+#: 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/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Nustatomas aparatinės įrangos laikrodis."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Konfigūruojama OpenRC dmcrypt tarnyba."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Įdiegiami duomenys."
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr "Rašoma fstab."
+
+#: src/modules/fstab/main.py:429
+msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
+msgstr ""
+"Nenurodyta jokia <pre>{!s}</pre> konfigūracija, kurią <pre>{!s}</pre> 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 7f34d28a9bd0039586251090b50b1b5e7cdaed6e..359fc75edd7f27ee251628a890db38c6e7d29093 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/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr ""
 
-#: 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/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr ""
 
-#: 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 <pre>{!s}</pre> "
-"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 <pre>{!s}</pre>"
-" returned error code {!s}."
+#: 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/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command <pre>{!s}</pre> returned error code {!s}."
+#: 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 <pre>{!s}</pre> to use."
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
 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/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
-msgid "Configuration Error"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 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 <pre>{!s}</pre> to use."
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
 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
-msgid "No partitions are defined for <pre>{!s}</pre> to use."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit <code>{name!s}</code>."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands <code>{command!s}</code> and "
+"<code>{suffix!s}</code> for unit {name!s}."
 msgstr ""
 
 #: src/modules/unpackfs/main.py:34
@@ -176,112 +166,72 @@ 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 ""
-"<code>systemctl {arg!s}</code> 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 <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands <code>{command!s}</code> and "
-"<code>{suffix!s}</code> for unit {name!s}."
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/bootloader/main.py:783
+#: src/modules/displaymanager/main.py:993
 msgid ""
-"The bootloader could not be installed. The installation command "
-"<pre>{!s}</pre> 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"
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
+#: 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 <pre>{!s}</pre> to use."
 msgstr ""
 
-#: src/modules/fstab/main.py:429
-msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
 
 #: src/modules/services-openrc/main.py:29
@@ -327,80 +277,130 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: 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."
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
+#: 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/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command <pre>{!s}</pre> "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command <pre>{!s}</pre>"
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command <pre>{!s}</pre> returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"<pre>{!s}</pre> returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:992
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:993
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:1075
-msgid "Display manager configuration was incomplete"
+#: 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/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> 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 428d17b55d586f778c442e990ef796c1d38e0593..b60863411b00534e3720137453926fd9a910d062 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 <martinristovski@protonmail.com>, 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/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr ""
 
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr ""
 
-#: 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 <pre>{!s}</pre> "
-"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 <pre>{!s}</pre>"
-" returned error code {!s}."
+#: 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/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command <pre>{!s}</pre> returned error code {!s}."
+#: 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 <pre>{!s}</pre> to use."
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
 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/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
-msgid "Configuration Error"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 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 <pre>{!s}</pre> to use."
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
 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
-msgid "No partitions are defined for <pre>{!s}</pre> to use."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit <code>{name!s}</code>."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands <code>{command!s}</code> and "
+"<code>{suffix!s}</code> for unit {name!s}."
 msgstr ""
 
 #: src/modules/unpackfs/main.py:34
@@ -178,112 +170,72 @@ 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 ""
-"<code>systemctl {arg!s}</code> 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 <code>{name!s}</code>."
-msgstr ""
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "KDM конфигурациониот фајл не може да се создаде"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target <code>{name!s}</code>."
-msgstr ""
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "KDM конфигурациониот фајл {!s} не постои"
 
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer <code>{name!s}</code>."
-msgstr ""
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "LXDM конфигурациониот фајл не може да се создаде"
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target <code>{name!s}</code>."
-msgstr ""
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "LXDM конфигурациониот фајл {!s} не постои"
 
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit <code>{name!s}</code>."
-msgstr ""
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "LightDM конфигурациониот фајл не може да се создаде"
 
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands <code>{command!s}</code> and "
-"<code>{suffix!s}</code> for unit {name!s}."
-msgstr ""
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "LightDM конфигурациониот фајл {!s} не постои"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr ""
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "Не може да се подеси LightDM"
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr ""
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr "Нема инсталирано LightDM поздравувач"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "SLIM конфигурациониот фајл не може да се создаде"
 
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "SLIM конфигурациониот фајл {!s} не постои"
 
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr "Немате избрано дисплеј менаџер за displaymanager модулот."
 
-#: src/modules/bootloader/main.py:783
+#: src/modules/displaymanager/main.py:993
 msgid ""
-"The bootloader could not be installed. The installation command "
-"<pre>{!s}</pre> 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"
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
+#: 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 <pre>{!s}</pre> to use."
 msgstr ""
 
-#: src/modules/fstab/main.py:429
-msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
 
 #: src/modules/services-openrc/main.py:29
@@ -329,80 +281,128 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: 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."
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "KDM конфигурациониот фајл не може да се создаде"
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "KDM конфигурациониот фајл {!s} не постои"
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "LXDM конфигурациониот фајл не може да се создаде"
+#: 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/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "LXDM конфигурациониот фајл {!s} не постои"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command <pre>{!s}</pre> "
+"returned error code {!s}."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "LightDM конфигурациониот фајл не може да се создаде"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command <pre>{!s}</pre>"
+" returned error code {!s}."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "LightDM конфигурациониот фајл {!s} не постои"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command <pre>{!s}</pre> returned error code {!s}."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "Не може да се подеси LightDM"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr "Нема инсталирано LightDM поздравувач"
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
 
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "SLIM конфигурациониот фајл не може да се создаде"
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
 
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "SLIM конфигурациониот фајл {!s} не постои"
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"<pre>{!s}</pre> returned error code {!s}."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:992
-msgid "No display managers selected for the displaymanager module."
-msgstr "Немате избрано дисплеј менаџер за displaymanager модулот."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:993
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:1075
-msgid "Display manager configuration was incomplete"
+#: 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/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> 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 0044044f7de14fa9f6c44184e0d099422ed6edda..8c8538c79e787c70e04d1b20ebf28b06dde47027 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 <balasankarc@autistici.org>, 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/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr ""
 
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr ""
 
-#: 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 <pre>{!s}</pre> "
-"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 <pre>{!s}</pre>"
-" returned error code {!s}."
+#: 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 <pre>{!s}</pre> to use."
 msgstr ""
 
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command <pre>{!s}</pre> returned error code {!s}."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 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/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "ക്രമീകരണത്തിൽ പിഴവ്"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+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 <pre>{!s}</pre> to use."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service <code>{name!s}</code>."
 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
-msgid "No partitions are defined for <pre>{!s}</pre> to use."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands <code>{command!s}</code> and "
+"<code>{suffix!s}</code> for unit {name!s}."
 msgstr ""
 
 #: src/modules/unpackfs/main.py:34
@@ -179,112 +171,72 @@ 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 ""
-"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands <code>{command!s}</code> and "
-"<code>{suffix!s}</code> for unit {name!s}."
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
 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"
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/bootloader/main.py:783
+#: src/modules/displaymanager/main.py:993
 msgid ""
-"The bootloader could not be installed. The installation command "
-"<pre>{!s}</pre> 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"
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
+#: 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 <pre>{!s}</pre> to use."
 msgstr ""
 
-#: src/modules/fstab/main.py:429
-msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
 
 #: src/modules/services-openrc/main.py:29
@@ -330,80 +282,128 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: 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."
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
+#: 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/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command <pre>{!s}</pre> "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command <pre>{!s}</pre>"
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command <pre>{!s}</pre> returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
+#: 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/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"<pre>{!s}</pre> returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:992
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:993
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:1075
-msgid "Display manager configuration was incomplete"
+#: 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/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> 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 e87b45c06af71da76d3854320b4fc9f6d01be05d..c58ce5feb744028da2f8234b940f6990228113e3 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/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr ""
 
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr ""
 
-#: 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 <pre>{!s}</pre> "
-"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 <pre>{!s}</pre>"
-" returned error code {!s}."
+#: 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/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command <pre>{!s}</pre> returned error code {!s}."
+#: 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 <pre>{!s}</pre> to use."
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
 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/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
-msgid "Configuration Error"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 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 <pre>{!s}</pre> to use."
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
 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
-msgid "No partitions are defined for <pre>{!s}</pre> to use."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit <code>{name!s}</code>."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands <code>{command!s}</code> and "
+"<code>{suffix!s}</code> for unit {name!s}."
 msgstr ""
 
 #: src/modules/unpackfs/main.py:34
@@ -174,112 +166,72 @@ 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 ""
-"<code>systemctl {arg!s}</code> 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 <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands <code>{command!s}</code> and "
-"<code>{suffix!s}</code> for unit {name!s}."
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/bootloader/main.py:783
+#: src/modules/displaymanager/main.py:993
 msgid ""
-"The bootloader could not be installed. The installation command "
-"<pre>{!s}</pre> 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"
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
+#: 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 <pre>{!s}</pre> to use."
 msgstr ""
 
-#: src/modules/fstab/main.py:429
-msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
 
 #: src/modules/services-openrc/main.py:29
@@ -325,80 +277,128 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: 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."
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
+#: 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/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command <pre>{!s}</pre> "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command <pre>{!s}</pre>"
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command <pre>{!s}</pre> returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"<pre>{!s}</pre> returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:992
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:993
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:1075
-msgid "Display manager configuration was incomplete"
+#: 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/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> 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 d9c72f36fa4ea6ecd88bd247d5ea0e1e6b0044da..432ee6a288a17c971802583952d6297e70e4d70f 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/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/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr ""
 
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr ""
 
-#: 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 <pre>{!s}</pre> "
-"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 <pre>{!s}</pre>"
-" returned error code {!s}."
+#: 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/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command <pre>{!s}</pre> returned error code {!s}."
+#: 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 <pre>{!s}</pre> to use."
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
 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/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
-msgid "Configuration Error"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 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 <pre>{!s}</pre> to use."
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
 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
-msgid "No partitions are defined for <pre>{!s}</pre> to use."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit <code>{name!s}</code>."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands <code>{command!s}</code> and "
+"<code>{suffix!s}</code> for unit {name!s}."
 msgstr ""
 
 #: src/modules/unpackfs/main.py:34
@@ -178,112 +170,72 @@ 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 ""
-"<code>systemctl {arg!s}</code> 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 <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands <code>{command!s}</code> and "
-"<code>{suffix!s}</code> for unit {name!s}."
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/bootloader/main.py:783
+#: src/modules/displaymanager/main.py:993
 msgid ""
-"The bootloader could not be installed. The installation command "
-"<pre>{!s}</pre> 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"
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
+#: 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 <pre>{!s}</pre> to use."
 msgstr ""
 
-#: src/modules/fstab/main.py:429
-msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
 
 #: src/modules/services-openrc/main.py:29
@@ -329,80 +281,128 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: 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/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: 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/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command <pre>{!s}</pre> "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command <pre>{!s}</pre>"
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command <pre>{!s}</pre> returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"<pre>{!s}</pre> returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:992
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:993
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:1075
-msgid "Display manager configuration was incomplete"
+#: 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/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> 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 4889f1aaad4835e7ceda3f43233414866c3f0852..0352f312892ac83d6112f0a46454514e10aa1fc5 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/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr ""
 
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr ""
 
-#: 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 <pre>{!s}</pre> "
-"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 <pre>{!s}</pre>"
-" returned error code {!s}."
+#: 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/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command <pre>{!s}</pre> returned error code {!s}."
+#: 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 <pre>{!s}</pre> to use."
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
 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/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
-msgid "Configuration Error"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 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 <pre>{!s}</pre> to use."
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
 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
-msgid "No partitions are defined for <pre>{!s}</pre> to use."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit <code>{name!s}</code>."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands <code>{command!s}</code> and "
+"<code>{suffix!s}</code> for unit {name!s}."
 msgstr ""
 
 #: src/modules/unpackfs/main.py:34
@@ -174,112 +166,72 @@ 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 ""
-"<code>systemctl {arg!s}</code> 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 <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands <code>{command!s}</code> and "
-"<code>{suffix!s}</code> for unit {name!s}."
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/bootloader/main.py:783
+#: src/modules/displaymanager/main.py:993
 msgid ""
-"The bootloader could not be installed. The installation command "
-"<pre>{!s}</pre> 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"
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
+#: 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 <pre>{!s}</pre> to use."
 msgstr ""
 
-#: src/modules/fstab/main.py:429
-msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
 
 #: src/modules/services-openrc/main.py:29
@@ -325,80 +277,128 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: 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."
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
+#: 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/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command <pre>{!s}</pre> "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command <pre>{!s}</pre>"
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command <pre>{!s}</pre> returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"<pre>{!s}</pre> returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:992
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:993
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:1075
-msgid "Display manager configuration was incomplete"
+#: 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/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> 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 1c2df21db6d4fd9ae178b7af3aa1c8ea14396313..cb4f2301a357461d9beaef625d79bd454e50a27a 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 <groot@kde.org>, 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/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/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "GRUB instellen."
 
-#: 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/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "Partities mounten."
 
-#: 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 <pre>{!s}</pre> "
-"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 <pre>{!s}</pre>"
-" 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 <pre>{!s}</pre> 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 <pre>{!s}</pre> to use."
+#: 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 <pre>{!s}</pre> to use."
+msgstr "Geen partities gedefinieerd voor <pre>{!s}</pre> om te gebruiken."
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
 msgstr ""
-"Geen hoofd mount punt is gegeven voor <pre>{!s}</pre> om te gebruiken. "
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Instellen van mkinitcpio"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Configureer systemd services "
 
-#: 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
-msgid "No partitions are defined for <pre>{!s}</pre> to use."
-msgstr "Geen partities gedefinieerd voor <pre>{!s}</pre> om te gebruiken."
+#: 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/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Een initramfs wordt aangemaakt met mkinitfs."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
+msgstr ""
+"<code>systemctl {arg!s}</code> aanroeping in chroot resulteerde in foutcode "
+"{num!s}."
 
-#: 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:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service <code>{name!s}</code>."
+msgstr ""
+"De systemd service <code>{name!s}</code> kon niet worden ingeschakeld."
 
-#: 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:65
+msgid "Cannot enable systemd target <code>{name!s}</code>."
+msgstr "Het systemd doel <code>{name!s}</code> kon niet worden ingeschakeld."
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Configureren van OpenRC dmcrypt service."
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer <code>{name!s}</code>."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target <code>{name!s}</code>."
+msgstr "De systemd service <code>{name!s} kon niet worden uitgeschakeld."
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit <code>{name!s}</code>."
+msgstr "De systemd unit <code>{name!s}</code> kon niet worden gemaskerd."
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands <code>{command!s}</code> and "
+"<code>{suffix!s}</code> for unit {name!s}."
+msgstr ""
+"Onbekende systemd opdrachten <code>{command!s}</code> en "
+"<code>{suffix!s}</code> voor unit {name!s}. "
 
 #: src/modules/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -182,118 +178,76 @@ 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 ""
-"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
-msgstr ""
-"<code>systemctl {arg!s}</code> 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 <code>{name!s}</code>."
-msgstr ""
-"De systemd service <code>{name!s}</code> kon niet worden ingeschakeld."
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "Schrijven naar het KDM-configuratiebestand is mislukt "
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target <code>{name!s}</code>."
-msgstr "Het systemd doel <code>{name!s}</code> kon niet worden ingeschakeld."
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "KDM-configuratiebestand {!s} bestaat niet."
 
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer <code>{name!s}</code>."
-msgstr ""
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "Schrijven naar het LXDM-configuratiebestand is mislukt"
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target <code>{name!s}</code>."
-msgstr "De systemd service <code>{name!s} kon niet worden uitgeschakeld."
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "Het KDM-configuratiebestand {!s} bestaat niet"
 
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit <code>{name!s}</code>."
-msgstr "De systemd unit <code>{name!s}</code> kon niet worden gemaskerd."
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "Schrijven naar het LightDM-configuratiebestand is mislukt"
 
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands <code>{command!s}</code> and "
-"<code>{suffix!s}</code> for unit {name!s}."
-msgstr ""
-"Onbekende systemd opdrachten <code>{command!s}</code> en "
-"<code>{suffix!s}</code> voor unit {name!s}. "
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "Het LightDM-configuratiebestand {!s} bestaat niet"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Voorbeeld Python-taak"
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "Kon LightDM niet configureren"
 
-#: 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/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr "Geen LightDM begroeter geïnstalleerd"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Installeer bootloader"
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "Schrijven naar het SLIM-configuratiebestand is mislukt"
 
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "Het SLIM-configuratiebestand {!s} bestaat niet"
 
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr "Geen display managers geselecteerd voor de displaymanager module."
 
-#: src/modules/bootloader/main.py:783
+#: src/modules/displaymanager/main.py:993
 msgid ""
-"The bootloader could not be installed. The installation command "
-"<pre>{!s}</pre> 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"
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
+"De lijst van display-managers is leeg, zowel in de configuratie "
+"displaymanager.conf als de globale opslag."
 
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr ""
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr "Display manager configuratie was incompleet"
 
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr ""
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Instellen van mkinitcpio"
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
+#: 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 <pre>{!s}</pre> to use."
 msgstr ""
+"Geen hoofd mount punt is gegeven voor <pre>{!s}</pre> om te gebruiken. "
 
-#: 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 <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
-msgstr ""
+#: 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"
@@ -344,82 +298,128 @@ msgid ""
 msgstr ""
 "Het pad voor service {level!s} is <code>{path!s}</code>, 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/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Plymouth thema instellen"
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "Schrijven naar het KDM-configuratiebestand is mislukt "
+#: 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/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "KDM-configuratiebestand {!s} bestaat niet."
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Pakketten verwerken (%(count)d/ %(total)d)"
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "Schrijven naar het LXDM-configuratiebestand is mislukt"
+#: 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/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "Het KDM-configuratiebestand {!s} bestaat niet"
+#: 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/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "Schrijven naar het LightDM-configuratiebestand is mislukt"
+#: 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/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "Het LightDM-configuratiebestand {!s} bestaat niet"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command <pre>{!s}</pre> "
+"returned error code {!s}."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "Kon LightDM niet configureren"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command <pre>{!s}</pre>"
+" returned error code {!s}."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr "Geen LightDM begroeter geïnstalleerd"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command <pre>{!s}</pre> returned error code {!s}."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "Schrijven naar het SLIM-configuratiebestand is mislukt"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Installeer bootloader"
 
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "Het SLIM-configuratiebestand {!s} bestaat niet"
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
 
-#: src/modules/displaymanager/main.py:992
-msgid "No display managers selected for the displaymanager module."
-msgstr "Geen display managers geselecteerd voor de displaymanager module."
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
 
-#: src/modules/displaymanager/main.py:993
+#: src/modules/bootloader/main.py:783
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"The bootloader could not be installed. The installation command "
+"<pre>{!s}</pre> returned error code {!s}."
 msgstr ""
-"De lijst van display-managers is leeg, zowel in de configuratie "
-"displaymanager.conf als de globale opslag."
 
-#: src/modules/displaymanager/main.py:1075
-msgid "Display manager configuration was incomplete"
-msgstr "Display manager configuratie was incompleet"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Instellen van hardwareklok"
+
+#: 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/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Instellen van hardwareklok"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Configureren van OpenRC dmcrypt service."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Data aan het installeren."
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr "fstab schrijven."
+
+#: src/modules/fstab/main.py:429
+msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> 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 54cdd1cd60825a2d3388e6b58b4cde198f4f6ae0..7082f30999ccebe12ee29817fd69df2af8b88b9d 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/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr ""
 
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr ""
 
-#: 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 <pre>{!s}</pre> "
-"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 <pre>{!s}</pre>"
-" returned error code {!s}."
+#: 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 "Error de configuracion"
+
+#: 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 <pre>{!s}</pre> to use."
 msgstr ""
 
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command <pre>{!s}</pre> returned error code {!s}."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 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/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "Error de configuracion"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+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 <pre>{!s}</pre> to use."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service <code>{name!s}</code>."
 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
-msgid "No partitions are defined for <pre>{!s}</pre> to use."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands <code>{command!s}</code> and "
+"<code>{suffix!s}</code> for unit {name!s}."
 msgstr ""
 
 #: src/modules/unpackfs/main.py:34
@@ -178,112 +170,72 @@ 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 ""
-"<code>systemctl {arg!s}</code> 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 <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands <code>{command!s}</code> and "
-"<code>{suffix!s}</code> for unit {name!s}."
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/bootloader/main.py:783
+#: src/modules/displaymanager/main.py:993
 msgid ""
-"The bootloader could not be installed. The installation command "
-"<pre>{!s}</pre> 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"
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
+#: 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 <pre>{!s}</pre> to use."
 msgstr ""
 
-#: src/modules/fstab/main.py:429
-msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
 
 #: src/modules/services-openrc/main.py:29
@@ -329,80 +281,128 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: 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."
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
+#: 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/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command <pre>{!s}</pre> "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command <pre>{!s}</pre>"
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command <pre>{!s}</pre> returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"<pre>{!s}</pre> returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:992
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:993
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:1075
-msgid "Display manager configuration was incomplete"
+#: 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/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> 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 32e616f4ff2113a1e0f21a7d72d055ef06ffee9c..aab2d9603ba0d9c71b3aa9bc8b6011ff6af1c9cc 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. <brickminerplyt@gmail.com>, 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/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/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Konfiguracja GRUB."
 
-#: 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/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "Montowanie partycji."
 
-#: 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 <pre>{!s}</pre> "
-"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 <pre>{!s}</pre>"
-" 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 <pre>{!s}</pre> 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 <pre>{!s}</pre> to use."
+#: 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 <pre>{!s}</pre> to use."
+msgstr "Nie ma zdefiniowanych partycji dla <pre>{!s}</pre> do użytku."
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
 msgstr ""
-"Nie znaleziono głównego punktu montowania dla <pre>{!s}</pre> do użycia."
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Konfigurowanie mkinitcpio."
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Konfiguracja usług systemd"
 
-#: 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
-msgid "No partitions are defined for <pre>{!s}</pre> to use."
-msgstr "Nie ma zdefiniowanych partycji dla <pre>{!s}</pre> do użytku."
+#: 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/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Tworzenie initramfs z mkinitfs."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
+msgstr ""
+"Wezwanie <code>systemctl {arg!s}</code> w chroot zwróciło kod błędu {num!s}."
 
-#: 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:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service <code>{name!s}</code>."
+msgstr "Nie można włączyć usługi systemd <code>{name!s}</code>."
 
-#: 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:65
+msgid "Cannot enable systemd target <code>{name!s}</code>."
+msgstr "Nie można włączyć celu w systemd <code>{name!s}</code>."
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Konfigurowanie usługi OpenRC dmcrypt."
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer <code>{name!s}</code>."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target <code>{name!s}</code>."
+msgstr "Nie można wyłączyć celu w systemd <code>{name!s}</code>."
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit <code>{name!s}</code>."
+msgstr "Nie można zamaskować jednostki systemd <code>{name!s}</code>."
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands <code>{command!s}</code> and "
+"<code>{suffix!s}</code> for unit {name!s}."
+msgstr ""
+"Nieznana komenda systemd <code>{command!s}</code> oraz "
+"<code>{suffix!s}</code> dla jednostki {name!s}."
 
 #: src/modules/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -188,116 +178,76 @@ 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 ""
-"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
-msgstr ""
-"Wezwanie <code>systemctl {arg!s}</code> 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 <code>{name!s}</code>."
-msgstr "Nie można włączyć usługi systemd <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "Nie można zapisać pliku konfiguracji KDM"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target <code>{name!s}</code>."
-msgstr "Nie można włączyć celu w systemd <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "Plik konfiguracyjny KDM {!s} nie istnieje"
 
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer <code>{name!s}</code>."
-msgstr ""
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "Nie można zapisać pliku konfiguracji LXDM"
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target <code>{name!s}</code>."
-msgstr "Nie można wyłączyć celu w systemd <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "Plik konfiguracji LXDM {!s} nie istnieje"
 
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit <code>{name!s}</code>."
-msgstr "Nie można zamaskować jednostki systemd <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "Nie można zapisać pliku konfiguracji LightDM"
 
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands <code>{command!s}</code> and "
-"<code>{suffix!s}</code> for unit {name!s}."
-msgstr ""
-"Nieznana komenda systemd <code>{command!s}</code> oraz "
-"<code>{suffix!s}</code> dla jednostki {name!s}."
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "Plik konfiguracji LightDM {!s} nie istnieje"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Zadanie fikcyjne Python."
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "Nie można skonfigurować LightDM"
 
-#: 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/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr "Nie zainstalowano ekranu powitalnego LightDM."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Instalacja programu rozruchowego."
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "Nie można zapisać pliku konfiguracji SLIM"
 
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "Plik konfiguracji SLIM {!s} nie istnieje"
 
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr "Brak wybranych menedżerów wyświetlania dla modułu displaymanager."
 
-#: src/modules/bootloader/main.py:783
+#: src/modules/displaymanager/main.py:993
 msgid ""
-"The bootloader could not be installed. The installation command "
-"<pre>{!s}</pre> 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"
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
+"Lista displaymanagers jest pusta lub niezdefiniowana w globalstorage oraz "
+"displaymanager.conf."
 
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
-msgstr ""
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr "Konfiguracja menedżera wyświetlania była niekompletna"
 
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
-msgstr ""
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Konfigurowanie mkinitcpio."
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
+#: 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 <pre>{!s}</pre> to use."
 msgstr ""
+"Nie znaleziono głównego punktu montowania dla <pre>{!s}</pre> do użycia."
 
-#: 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 <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
-msgstr ""
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Instalowanie danych."
 
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
@@ -349,82 +299,132 @@ msgid ""
 "exist."
 msgstr "Ścieżka do usługi {name!s} to <code>{path!s}</code>,  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/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Konfiguracja motywu Plymouth"
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "Nie można zapisać pliku konfiguracji KDM"
+#: 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/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "Plik konfiguracyjny KDM {!s} nie istnieje"
+#: 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/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "Nie można zapisać pliku konfiguracji LXDM"
+#: 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/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "Plik konfiguracji LXDM {!s} nie istnieje"
+#: 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/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "Nie można zapisać pliku konfiguracji LightDM"
+#: 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/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "Plik konfiguracji LightDM {!s} nie istnieje"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command <pre>{!s}</pre> "
+"returned error code {!s}."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "Nie można skonfigurować LightDM"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command <pre>{!s}</pre>"
+" returned error code {!s}."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr "Nie zainstalowano ekranu powitalnego LightDM."
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command <pre>{!s}</pre> returned error code {!s}."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "Nie można zapisać pliku konfiguracji SLIM"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Instalacja programu rozruchowego."
 
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "Plik konfiguracji SLIM {!s} nie istnieje"
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
 
-#: src/modules/displaymanager/main.py:992
-msgid "No display managers selected for the displaymanager module."
-msgstr "Brak wybranych menedżerów wyświetlania dla modułu displaymanager."
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
 
-#: src/modules/displaymanager/main.py:993
+#: src/modules/bootloader/main.py:783
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"The bootloader could not be installed. The installation command "
+"<pre>{!s}</pre> returned error code {!s}."
 msgstr ""
-"Lista displaymanagers jest pusta lub niezdefiniowana w globalstorage oraz "
-"displaymanager.conf."
 
-#: src/modules/displaymanager/main.py:1075
-msgid "Display manager configuration was incomplete"
-msgstr "Konfiguracja menedżera wyświetlania była niekompletna"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Ustawianie zegara systemowego."
+
+#: 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/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Ustawianie zegara systemowego."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Konfigurowanie usługi OpenRC dmcrypt."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Instalowanie danych."
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr "Zapisywanie fstab."
+
+#: src/modules/fstab/main.py:429
+msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> 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 fdf84133ac1a1a0e6298cb4d189319fb3d7a0394..122da0e9bd4a0cfb72477923c2cd94e7615d26c2 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 <alvarenga@kde.org>, 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/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/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Configurar GRUB."
 
-#: 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:42
+msgid "Mounting partitions."
+msgstr "Montando partições."
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command <pre>{!s}</pre> "
-"returned error code {!s}."
-msgstr ""
-"O gerenciador de pacotes não pôde preparar as atualizações. O comando "
-"<pre>{!s}</pre> retornou o código de erro {!s}."
+#: 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:738
-msgid ""
-"The package manager could not update the system. The command <pre>{!s}</pre>"
-" returned error code {!s}."
-msgstr ""
-"O gerenciador de pacotes não pôde atualizar o sistema. O comando "
-"<pre>{!s}</pre> retornou o código de erro {!s}."
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr "Falha ao importar zpool"
 
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command <pre>{!s}</pre> returned error code {!s}."
-msgstr ""
-"O gerenciador de pacotes não pôde fazer mudanças no sistema instalado. O "
-"comando <pre>{!s}</pre> retornou o código de erro {!s}."
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr "Falha ao desbloquear zpool"
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Salvando configuração de rede."
+#: 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/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 <pre>{!s}</pre> to use."
+#: 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 <pre>{!s}</pre> to use."
+msgstr "Sem partições definidas para uso por <pre>{!s}</pre>."
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr "erro de montagem zfs"
+
+#: 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 ""
+"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
 msgstr ""
-"Nenhum ponto de montagem para o root fornecido para uso por <pre>{!s}</pre>."
+"A chamada <code>systemctl {arg!s}</code> no chroot retornou o código de erro"
+" {num!s}."
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Configurando mkinitcpio."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service <code>{name!s}</code>."
+msgstr "Não é possível habilitar o serviço <code>{name!s}</code> do systemd."
 
-#: 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
-msgid "No partitions are defined for <pre>{!s}</pre> to use."
-msgstr "Sem partições definidas para uso por <pre>{!s}</pre>."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target <code>{name!s}</code>."
+msgstr "Não é possível habilitar o alvo <code>{name!s}</code> do systemd."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Criando initramfs com mkinitfs."
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer <code>{name!s}</code>."
+msgstr "Não foi possível ativar o cronômetro systemd <code>{name!s}</code>."
 
-#: 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:71
+msgid "Cannot disable systemd target <code>{name!s}</code>."
+msgstr "Não é possível desabilitar o alvo <code>{name!s}</code> 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:73
+msgid "Cannot mask systemd unit <code>{name!s}</code>."
+msgstr "Não é possível mascarar a unidade <code>{name!s}</code> do systemd."
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Configurando serviço dmcrypt do OpenRC."
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands <code>{command!s}</code> and "
+"<code>{suffix!s}</code> for unit {name!s}."
+msgstr ""
+"Comandos desconhecidos do systemd <code>{command!s}</code> e "
+"<code>{suffix!s}</code> para a unidade {name!s}."
 
 #: src/modules/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -190,122 +177,77 @@ 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 ""
-"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
-msgstr ""
-"A chamada <code>systemctl {arg!s}</code> no chroot retornou o código de erro"
-" {num!s}."
+#: 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"
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service <code>{name!s}</code>."
-msgstr "Não é possível habilitar o serviço <code>{name!s}</code> do systemd."
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "O arquivo de configuração {!s} do KDM não existe"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target <code>{name!s}</code>."
-msgstr "Não é possível habilitar o alvo <code>{name!s}</code> do systemd."
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "Não foi possível gravar o arquivo de configuração do LXDM"
 
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer <code>{name!s}</code>."
-msgstr "Não foi possível ativar o cronômetro systemd <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "O arquivo de configuração {!s} do LXDM não existe"
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target <code>{name!s}</code>."
-msgstr "Não é possível desabilitar o alvo <code>{name!s}</code> do systemd."
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "Não foi possível gravar o arquivo de configuração do LightDM"
 
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit <code>{name!s}</code>."
-msgstr "Não é possível mascarar a unidade <code>{name!s}</code> do systemd."
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "O arquivo de configuração {!s} do LightDM não existe"
 
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands <code>{command!s}</code> and "
-"<code>{suffix!s}</code> for unit {name!s}."
-msgstr ""
-"Comandos desconhecidos do systemd <code>{command!s}</code> e "
-"<code>{suffix!s}</code> para a unidade {name!s}."
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "Não é possível configurar o LightDM"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Tarefa modelo python."
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr "Não há nenhuma tela de login do LightDM instalada."
 
-#: 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/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "Não foi possível gravar o arquivo de configuração do SLIM"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Instalar carregador de inicialização."
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "O arquivo de configuração {!s} do SLIM não existe"
 
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
 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"
+"Nenhum gerenciador de exibição selecionado para o módulo do displaymanager."
 
-#: src/modules/bootloader/main.py:783
+#: src/modules/displaymanager/main.py:993
 msgid ""
-"The bootloader could not be installed. The installation command "
-"<pre>{!s}</pre> returned error code {!s}."
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
-"O carregador de inicialização não pôde ser instalado. O comando de "
-"instalação <pre>{!s}</pre> 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"
+"A lista de displaymanagers está vazia ou indefinida em ambos globalstorage e"
+" displaymanager.conf."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Configurar tema do Plymouth"
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr "A configuração do gerenciador de exibição está incompleta"
 
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr "Escrevendo fstab."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Configurando mkinitcpio."
 
-#: src/modules/fstab/main.py:429
-msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
+#: 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 <pre>{!s}</pre> to use."
 msgstr ""
-"Nenhuma configuração <pre>{!s}</pre> é dada para que <pre>{!s}</pre> possa "
-"utilizar."
+"Nenhum ponto de montagem para o root fornecido para uso por <pre>{!s}</pre>."
+
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Instalando os dados."
 
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
@@ -359,83 +301,141 @@ msgid ""
 msgstr ""
 "O caminho para o serviço {name!s} é <code>{path!s}</code>, 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"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Configurar tema do Plymouth"
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "O arquivo de configuração {!s} do KDM não existe"
+#: 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/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "Não foi possível gravar o arquivo de configuração do LXDM"
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Processando pacotes (%(count)d / %(total)d)"
 
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "O arquivo de configuração {!s} do LXDM não existe"
+#: 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/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "Não foi possível gravar o arquivo de configuração do LightDM"
+#: 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/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "O arquivo de configuração {!s} do LightDM não existe"
+#: 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/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "Não é possível configurar o LightDM"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command <pre>{!s}</pre> "
+"returned error code {!s}."
+msgstr ""
+"O gerenciador de pacotes não pôde preparar as atualizações. O comando "
+"<pre>{!s}</pre> retornou o código de erro {!s}."
 
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr "Não há nenhuma tela de login do LightDM instalada."
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command <pre>{!s}</pre>"
+" returned error code {!s}."
+msgstr ""
+"O gerenciador de pacotes não pôde atualizar o sistema. O comando "
+"<pre>{!s}</pre> retornou o código de erro {!s}."
 
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "Não foi possível gravar o arquivo de configuração do SLIM"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command <pre>{!s}</pre> returned error code {!s}."
+msgstr ""
+"O gerenciador de pacotes não pôde fazer mudanças no sistema instalado. O "
+"comando <pre>{!s}</pre> retornou o código de erro {!s}."
 
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "O arquivo de configuração {!s} do SLIM não existe"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Instalar carregador de inicialização."
 
-#: src/modules/displaymanager/main.py:992
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
 msgstr ""
-"Nenhum gerenciador de exibição selecionado para o módulo do displaymanager."
+"Falha ao instalar o grub, não há partições definidas no armazenamento global"
 
-#: src/modules/displaymanager/main.py:993
+#: 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 displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"The bootloader could not be installed. The installation command "
+"<pre>{!s}</pre> returned error code {!s}."
 msgstr ""
-"A lista de displaymanagers está vazia ou indefinida em ambos globalstorage e"
-" displaymanager.conf."
+"O carregador de inicialização não pôde ser instalado. O comando de "
+"instalação <pre>{!s}</pre> retornou o código de erro {!s}."
 
-#: src/modules/displaymanager/main.py:1075
-msgid "Display manager configuration was incomplete"
-msgstr "A configuração do gerenciador de exibição está incompleta"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Configurando relógio de hardware."
+
+#: 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/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Configurando relógio de hardware."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Configurando serviço dmcrypt do OpenRC."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Instalando os dados."
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr "Escrevendo fstab."
+
+#: src/modules/fstab/main.py:429
+msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
+msgstr ""
+"Nenhuma configuração <pre>{!s}</pre> é dada para que <pre>{!s}</pre> 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 92a0037dd5d2b3b96c27c82cdae823530524d397..1a4dd86c851a57d0cf946319f06a2e9293880ac5 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 <xmcorporation@gmail.com>, 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/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/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Configurar o GRUB."
 
-#: 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:42
+msgid "Mounting partitions."
+msgstr "A montar partições."
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command <pre>{!s}</pre> "
-"returned error code {!s}."
-msgstr ""
-"O gestor de pacotes não conseguiu preparar atualizações. O comando "
-"<pre>{!s}</pre> apresentou o código de erro {!s}."
+#: 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:738
-msgid ""
-"The package manager could not update the system. The command <pre>{!s}</pre>"
-" returned error code {!s}."
-msgstr ""
-"O gestor de pacotes não conseguiu atualizar o sistema. O comando "
-"<pre>{!s}</pre> apresentou o código de erro {!s}."
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr "Falha ao importar zpool"
 
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command <pre>{!s}</pre> returned error code {!s}."
-msgstr ""
-"O gestor de pacotes não pôde fazer alterações ao sistema instalado. O "
-"comando <pre>{!s}</pre>devolveu o código de erro {!s}."
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr "Falha ao desbloquear zpool"
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "A guardar a configuração de rede."
+#: 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/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 <pre>{!s}</pre> to use."
-msgstr "Nenhum ponto de montagem root é fornecido para <pre>{!s}</pre> 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 <pre>{!s}</pre> to use."
 msgstr "Nenhuma partição está definida para <pre>{!s}</pre> 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 ""
+"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
+msgstr ""
+"<code>systemctl {arg!s}</code> 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 <code>{name!s}</code>."
+msgstr "Não é possível ativar o serviço systemd <code>{name!s}</code>."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target <code>{name!s}</code>."
+msgstr "Não é possível ativar o destino do systemd <code>{name!s}</code>."
+
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer <code>{name!s}</code>."
+msgstr "Não é possível ativar o temporizador systemd <code>{name!s}</code>."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target <code>{name!s}</code>."
+msgstr "Não é possível desativar o destino do systemd <code>{name!s}</code>."
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit <code>{name!s}</code>."
+msgstr "Não é possível mascarar a unidade do systemd <code>{name!s}</code>."
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands <code>{command!s}</code> and "
+"<code>{suffix!s}</code> for unit {name!s}."
+msgstr ""
+"Comandos do systemd desconhecidos <code>{command!s}</code> e "
+"<code>{suffix!s}</code> por unidade {name!s}."
 
 #: src/modules/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -192,122 +180,76 @@ 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 ""
-"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
-msgstr ""
-"<code>systemctl {arg!s}</code> chamar pelo chroot retornou com código de "
-"erro {num!s}."
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "Não é possível gravar o ficheiro de configuração KDM"
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service <code>{name!s}</code>."
-msgstr "Não é possível ativar o serviço systemd <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "O ficheiro de configuração do KDM {!s} não existe"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target <code>{name!s}</code>."
-msgstr "Não é possível ativar o destino do systemd <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "Não é possível gravar o ficheiro de configuração LXDM"
 
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer <code>{name!s}</code>."
-msgstr "Não é possível ativar o temporizador systemd <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "O ficheiro de configuração do LXDM {!s} não existe"
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target <code>{name!s}</code>."
-msgstr "Não é possível desativar o destino do systemd <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "Não é possível gravar o ficheiro de configuração LightDM"
 
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit <code>{name!s}</code>."
-msgstr "Não é possível mascarar a unidade do systemd <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "O ficheiro de configuração do LightDM {!s} não existe"
 
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands <code>{command!s}</code> and "
-"<code>{suffix!s}</code> for unit {name!s}."
-msgstr ""
-"Comandos do systemd desconhecidos <code>{command!s}</code> e "
-"<code>{suffix!s}</code> por unidade {name!s}."
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "Não é possível configurar o LightDM"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Tarefa Dummy python."
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr "Nenhum ecrã de boas-vindas LightDM instalado."
 
-#: 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/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "Não é possível gravar o ficheiro de configuração SLIM"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Instalar o carregador de arranque."
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "O ficheiro de configuração do SLIM {!s} não existe"
 
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
 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"
+"Nenhum gestor de exibição selecionado para o módulo de gestor de exibição."
 
-#: src/modules/bootloader/main.py:783
+#: src/modules/displaymanager/main.py:993
 msgid ""
-"The bootloader could not be installed. The installation command "
-"<pre>{!s}</pre> returned error code {!s}."
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
-"Não foi possível instalar o carregador de arranque. O comando de instalação "
-"<pre>{!s}</pre> 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"
+"A lista de gestores de visualização está vazia ou indefinida tanto no "
+"globalstorage como no displaymanager.conf."
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr "erro de montagem zfs"
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr "A configuração do gestor de exibição estava incompleta"
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Configurar tema do Plymouth"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "A configurar o mkintcpio."
 
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr "A escrever o fstab."
+#: 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 <pre>{!s}</pre> to use."
+msgstr "Nenhum ponto de montagem root é fornecido para <pre>{!s}</pre> usar."
 
-#: src/modules/fstab/main.py:429
-msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
-msgstr ""
-"Não é dada nenhuma configuração <pre>{!s}</pre> para <pre>{!s}</pre> "
-"utilizar."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "A instalar dados."
 
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
@@ -361,83 +303,141 @@ msgid ""
 msgstr ""
 "O caminho para o serviço {name!s} é <code>{path!s}</code>, 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"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Configurar tema do Plymouth"
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "O ficheiro de configuração do KDM {!s} não existe"
+#: 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/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "Não é possível gravar o ficheiro de configuração LXDM"
+#: 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/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "O ficheiro de configuração do LXDM {!s} não existe"
+#: 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/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "Não é possível gravar o ficheiro de configuração LightDM"
+#: 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/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "O ficheiro de configuração do LightDM {!s} não existe"
+#: 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/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "Não é possível configurar o LightDM"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command <pre>{!s}</pre> "
+"returned error code {!s}."
+msgstr ""
+"O gestor de pacotes não conseguiu preparar atualizações. O comando "
+"<pre>{!s}</pre> apresentou o código de erro {!s}."
 
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr "Nenhum ecrã de boas-vindas LightDM instalado."
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command <pre>{!s}</pre>"
+" returned error code {!s}."
+msgstr ""
+"O gestor de pacotes não conseguiu atualizar o sistema. O comando "
+"<pre>{!s}</pre> apresentou o código de erro {!s}."
 
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "Não é possível gravar o ficheiro de configuração SLIM"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command <pre>{!s}</pre> returned error code {!s}."
+msgstr ""
+"O gestor de pacotes não pôde fazer alterações ao sistema instalado. O "
+"comando <pre>{!s}</pre>devolveu o código de erro {!s}."
 
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "O ficheiro de configuração do SLIM {!s} não existe"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Instalar o carregador de arranque."
 
-#: src/modules/displaymanager/main.py:992
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
 msgstr ""
-"Nenhum gestor de exibição selecionado para o módulo de gestor de exibição."
+"Falha ao instalar o grub, sem partições definidas no armazenamento global"
 
-#: src/modules/displaymanager/main.py:993
+#: 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 displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"The bootloader could not be installed. The installation command "
+"<pre>{!s}</pre> returned error code {!s}."
 msgstr ""
-"A lista de gestores de visualização está vazia ou indefinida tanto no "
-"globalstorage como no displaymanager.conf."
+"Não foi possível instalar o carregador de arranque. O comando de instalação "
+"<pre>{!s}</pre> apresentou o código de erro {!s}."
 
-#: src/modules/displaymanager/main.py:1075
-msgid "Display manager configuration was incomplete"
-msgstr "A configuração do gestor de exibição estava incompleta"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "A definir o relógio do hardware."
+
+#: 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/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "A definir o relógio do hardware."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "A configurar o serviço OpenRC dmcrypt."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "A instalar dados."
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr "A escrever o fstab."
+
+#: src/modules/fstab/main.py:429
+msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
+msgstr ""
+"Não é dada nenhuma configuração <pre>{!s}</pre> para <pre>{!s}</pre> "
+"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 65b77c59571d9c127a095e9624256c44ca70d338..c4d4a8c0eeb7ed3d2b36dcd10acb029b518abcda 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 <krovyoll@gmail.com>, 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/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr ""
 
-#: 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 <pre>{!s}</pre> "
-"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 <pre>{!s}</pre>"
-" 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 <pre>{!s}</pre> 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 "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 <pre>{!s}</pre> to use."
-msgstr "Nu este definită o partiţie rădăcină pentru 1{!s}1 ."
+#: 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 <pre>{!s}</pre> to use."
+msgstr "Nu sunt partiţii  definite ca  1{!s}1 ."
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
 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
-msgid "No partitions are defined for <pre>{!s}</pre> to use."
-msgstr "Nu sunt partiţii  definite ca  1{!s}1 ."
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"<code>systemctl {arg!s}</code> 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 <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target <code>{name!s}</code>."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer <code>{name!s}</code>."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target <code>{name!s}</code>."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit <code>{name!s}</code>."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands <code>{command!s}</code> and "
+"<code>{suffix!s}</code> for unit {name!s}."
 msgstr ""
 
 #: src/modules/unpackfs/main.py:34
@@ -182,112 +172,72 @@ 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"
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands <code>{command!s}</code> and "
-"<code>{suffix!s}</code> for unit {name!s}."
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
 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."
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/bootloader/main.py:783
+#: src/modules/displaymanager/main.py:993
 msgid ""
-"The bootloader could not be installed. The installation command "
-"<pre>{!s}</pre> 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"
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-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 <pre>{!s}</pre> to use."
+msgstr "Nu este definită o partiţie rădăcină pentru 1{!s}1 ."
 
-#: src/modules/fstab/main.py:429
-msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
 
 #: src/modules/services-openrc/main.py:29
@@ -333,80 +283,130 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-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/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: 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/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command <pre>{!s}</pre> "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command <pre>{!s}</pre>"
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command <pre>{!s}</pre> returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"<pre>{!s}</pre> returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:992
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:993
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:1075
-msgid "Display manager configuration was incomplete"
+#: 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/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> 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 10fdbe7022494a9cf28d3fc42b63402c5f382b08..c7ad0047018a541e6422ed6dd2190bcc0bf3ba41 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/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/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Настройте GRUB."
 
-#: 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:42
+msgid "Mounting partitions."
+msgstr "Монтирование разделов."
 
-#: 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 <pre>{!s}</pre> "
-"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 <pre>{!s}</pre>"
-" 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 <pre>{!s}</pre> 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 <pre>{!s}</pre> to use."
+#: 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 <pre>{!s}</pre> to use."
+msgstr "Не определены разделы для использования <pre>{!S}</pre>."
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: 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 ""
+"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
 msgstr ""
+"Вызов <code>systemctl {arg!s}</code> в chroot вернул код ошибки {num!s}."
 
-#: 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
-msgid "No partitions are defined for <pre>{!s}</pre> to use."
-msgstr "Не определены разделы для использования <pre>{!S}</pre>."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service <code>{name!s}</code>."
+msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer <code>{name!s}</code>."
 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 <code>{name!s}</code>."
+msgstr ""
 
-#: 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 <code>{name!s}</code>."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands <code>{command!s}</code> and "
+"<code>{suffix!s}</code> for unit {name!s}."
+msgstr ""
 
 #: src/modules/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -183,114 +172,73 @@ 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 ""
-"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
 msgstr ""
-"Вызов <code>systemctl {arg!s}</code> в chroot вернул код ошибки {num!s}."
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands <code>{command!s}</code> and "
-"<code>{suffix!s}</code> for unit {name!s}."
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
 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"
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/bootloader/main.py:783
+#: src/modules/displaymanager/main.py:993
 msgid ""
-"The bootloader could not be installed. The installation command "
-"<pre>{!s}</pre> 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"
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/mount/main.py:116
-msgid "Failed to unlock zpool"
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
+#: 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 <pre>{!s}</pre> to use."
 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 <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
-msgstr ""
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Установка данных."
 
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
@@ -335,80 +283,132 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Создание initramfs с помощью dracut."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Настроить тему Plymouth"
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Не удалось запустить dracut на цели"
+#: 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/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-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/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr ""
+#: 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/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
+#: 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/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command <pre>{!s}</pre> "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command <pre>{!s}</pre>"
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command <pre>{!s}</pre> returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr ""
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Установить загрузчик."
 
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"<pre>{!s}</pre> returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:992
-msgid "No display managers selected for the displaymanager module."
-msgstr ""
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Установка аппаратных часов."
 
-#: src/modules/displaymanager/main.py:993
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:1075
-msgid "Display manager configuration was incomplete"
+#: 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/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Установка аппаратных часов."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Настройка службы OpenRC dmcrypt."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Установка данных."
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr "Запись fstab."
+
+#: src/modules/fstab/main.py:429
+msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> 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 844eef1170d437ca62387f1af693497aa74620ab..267e2359797d9d64ab0db42a89db87e76fac0d80 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/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/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "GRUB වින්‍යාස කරන්න."
 
-#: 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:42
+msgid "Mounting partitions."
+msgstr "කොටස් සවි කිරීම."
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command <pre>{!s}</pre> "
-"returned error code {!s}."
-msgstr ""
-"පැකේජ කළමනාකරුට යාවත්කාලීන සකස් කිරීමට නොහැකි විය. විධානය <pre>{!s}</pre> "
-"දෝෂ කේතය {!s} ලබා දුන්නේය."
+#: 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:738
-msgid ""
-"The package manager could not update the system. The command <pre>{!s}</pre>"
-" returned error code {!s}."
-msgstr ""
-"පැකේජ කළමනාකරුට පද්ධතිය යාවත්කාලීන කළ නොහැකි විය. විධානය <pre>{!s}</pre> දෝෂ"
-" කේතය {!s} ලබා දුන්නේය."
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr "zpool ආයාත කිරීමට අසමත් විය"
 
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command <pre>{!s}</pre> returned error code {!s}."
-msgstr ""
-"පැකේජ කළමනාකරුට ස්ථාපිත පද්ධතියට වෙනස්කම් සිදු කළ නොහැක. විධානය "
-"<pre>{!s}</pre> දෝෂ කේතය {!s} ලබා දුන්නේය."
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr "zpool අගුලු හැරීමට අසමත් විය"
 
-#: 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 "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 "වින්‍යාස දෝෂය"
 
-#: 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 <pre>{!s}</pre> 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 <pre>{!s}</pre> 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 ""
+"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
+msgstr ""
+"<code>systemctl {arg!s}</code> chroot වෙත ඇමතුමක් ලබා දුන් දෝෂ කේතය {num!s}."
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service <code>{name!s}</code>."
+msgstr "systemd සේවාව <code>{name!s}</code> සබල කළ නොහැක."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target <code>{name!s}</code>."
+msgstr "systemd ඉලක්කය <code>{name!s}</code> සබල කළ නොහැක."
+
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer <code>{name!s}</code>."
+msgstr "systemd ටයිමරය <code>{name!s}</code> සබල කළ නොහැක."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target <code>{name!s}</code>."
+msgstr "systemd ඉලක්කය <code>{name!s}</code> අක්‍රිය කළ නොහැක."
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit <code>{name!s}</code>."
+msgstr "systemd ඒකකය <code>{name!s}</code> වසන් කළ නොහැක."
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands <code>{command!s}</code> and "
+"<code>{suffix!s}</code> for unit {name!s}."
+msgstr ""
+"{name!s} ඒකකය සඳහා නොදන්නා systemd විධාන <code>{command!s}</code> සහ "
+"<code>{suffix!s}</code>."
 
 #: src/modules/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -187,120 +176,75 @@ 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 ""
-"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
-msgstr ""
-"<code>systemctl {arg!s}</code> chroot වෙත ඇමතුමක් ලබා දුන් දෝෂ කේතය {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service <code>{name!s}</code>."
-msgstr "systemd සේවාව <code>{name!s}</code> සබල කළ නොහැක."
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "KDM වින්‍යාස ගොනුව ලිවිය නොහැක"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target <code>{name!s}</code>."
-msgstr "systemd ඉලක්කය <code>{name!s}</code> සබල කළ නොහැක."
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "KDM වින්‍යාස ගොනුව {!s} නොපවතී"
 
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer <code>{name!s}</code>."
-msgstr "systemd ටයිමරය <code>{name!s}</code> සබල කළ නොහැක."
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "LXDM වින්‍යාස ගොනුව ලිවිය නොහැක"
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target <code>{name!s}</code>."
-msgstr "systemd ඉලක්කය <code>{name!s}</code> අක්‍රිය කළ නොහැක."
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "LXDM වින්‍යාස ගොනුව {!s} නොපවතී"
 
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit <code>{name!s}</code>."
-msgstr "systemd ඒකකය <code>{name!s}</code> වසන් කළ නොහැක."
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "LightDM වින්‍යාස ගොනුව ලිවිය නොහැක"
 
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands <code>{command!s}</code> and "
-"<code>{suffix!s}</code> for unit {name!s}."
-msgstr ""
-"{name!s} ඒකකය සඳහා නොදන්නා systemd විධාන <code>{command!s}</code> සහ "
-"<code>{suffix!s}</code>."
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "LightDM වින්‍යාස ගොනුව {!s} නොපවතී"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "ඩමි python වැඩසටහන."
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "LightDM වින්‍යාස කළ නොහැක"
 
-#: 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/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr "LightDM ග්‍රීටර් ස්ථාපනය කර නැත."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "bootloader ස්ථාපනය කරන්න."
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "SLIM වින්‍යාස ගොනුව ලිවිය නොහැක"
 
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-"Grub ස්ථාපනය කිරීමට අපොහොසත් විය, ගෝලීය ආචයනය තුළ කොටස් අර්ථ දක්වා නොමැත"
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "SLIM වින්‍යාස ගොනුව {!s} නොපවතී"
 
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr "Bootloader ස්ථාපනය කිරීමේ දෝෂයකි"
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr "සංදර්ශක කළමනාකරු මොඩියුලය සඳහා සංදර්ශක කළමනාකරුවන් තෝරාගෙන නොමැත."
 
-#: src/modules/bootloader/main.py:783
+#: src/modules/displaymanager/main.py:993
 msgid ""
-"The bootloader could not be installed. The installation command "
-"<pre>{!s}</pre> returned error code {!s}."
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
-"ඇරඹුම් කාරකය ස්ථාපනය කල නොහැක. ස්ථාපන විධානය <pre>{!s}</pre> දෝෂ කේතය {!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 සවිකිරීමේ ලක්ෂ්‍යය සැකසීමට අසමත් විය"
+"ගෝලීය ගබඩාව සහ displaymanager.conf යන දෙකෙහිම සංදර්ශක කළමනාකරු ලැයිස්තුව "
+"හිස් හෝ අර්ථ දක්වා නොමැත."
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr "zfs සවිකිරීමේ දෝෂයකි"
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr "සංදර්ශක කළමනාකරු වින්‍යාසය අසම්පූර්ණ විය"
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Plymouth තේමාව වින්‍යාස කරන්න"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "mkinitcpio වින්‍යාස කරමින්."
 
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr "fstab ලියමින්."
+#: 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 <pre>{!s}</pre> to use."
+msgstr "{!s} සඳහා භාවිතා කිරීමට root mount point ලබා දී නොමැත."
 
-#: src/modules/fstab/main.py:429
-msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
-msgstr ""
-"භාවිතා කිරීමට <pre>{!s}</pre> සඳහා <pre>{!s}</pre> වින්‍යාසයක් ලබා දී නොමැත."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "දත්ත ස්ථාපනය වෙමින්."
 
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
@@ -348,82 +292,138 @@ msgid ""
 "exist."
 msgstr "සේවාව සඳහා {name!s} මාර්ගය <code>{path!s}</code>, එය නොපවතී."
 
-#: 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/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Plymouth තේමාව වින්‍යාස කරන්න"
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "KDM වින්‍යාස ගොනුව ලිවිය නොහැක"
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "ඇසුරුම් ස්ථාපනය කරන්න."
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "KDM වින්‍යාස ගොනුව {!s} නොපවතී"
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "පැකේජ සැකසීම (%(count)d / %(total)d)"
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "LXDM වින්‍යාස ගොනුව ලිවිය නොහැක"
+#: 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/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "LXDM වින්‍යාස ගොනුව {!s} නොපවතී"
+#: 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/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "LightDM වින්‍යාස ගොනුව ලිවිය නොහැක"
+#: 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/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "LightDM වින්‍යාස ගොනුව {!s} නොපවතී"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command <pre>{!s}</pre> "
+"returned error code {!s}."
+msgstr ""
+"පැකේජ කළමනාකරුට යාවත්කාලීන සකස් කිරීමට නොහැකි විය. විධානය <pre>{!s}</pre> "
+"දෝෂ කේතය {!s} ලබා දුන්නේය."
 
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "LightDM වින්‍යාස කළ නොහැක"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command <pre>{!s}</pre>"
+" returned error code {!s}."
+msgstr ""
+"පැකේජ කළමනාකරුට පද්ධතිය යාවත්කාලීන කළ නොහැකි විය. විධානය <pre>{!s}</pre> දෝෂ"
+" කේතය {!s} ලබා දුන්නේය."
 
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr "LightDM ග්‍රීටර් ස්ථාපනය කර නැත."
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command <pre>{!s}</pre> returned error code {!s}."
+msgstr ""
+"පැකේජ කළමනාකරුට ස්ථාපිත පද්ධතියට වෙනස්කම් සිදු කළ නොහැක. විධානය "
+"<pre>{!s}</pre> දෝෂ කේතය {!s} ලබා දුන්නේය."
 
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "SLIM වින්‍යාස ගොනුව ලිවිය නොහැක"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "bootloader ස්ථාපනය කරන්න."
 
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "SLIM වින්‍යාස ගොනුව {!s} නොපවතී"
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+"Grub ස්ථාපනය කිරීමට අපොහොසත් විය, ගෝලීය ආචයනය තුළ කොටස් අර්ථ දක්වා නොමැත"
 
-#: src/modules/displaymanager/main.py:992
-msgid "No display managers selected for the displaymanager module."
-msgstr "සංදර්ශක කළමනාකරු මොඩියුලය සඳහා සංදර්ශක කළමනාකරුවන් තෝරාගෙන නොමැත."
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr "Bootloader ස්ථාපනය කිරීමේ දෝෂයකි"
 
-#: src/modules/displaymanager/main.py:993
+#: src/modules/bootloader/main.py:783
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"The bootloader could not be installed. The installation command "
+"<pre>{!s}</pre> returned error code {!s}."
 msgstr ""
-"ගෝලීය ගබඩාව සහ displaymanager.conf යන දෙකෙහිම සංදර්ශක කළමනාකරු ලැයිස්තුව "
-"හිස් හෝ අර්ථ දක්වා නොමැත."
+"ඇරඹුම් කාරකය ස්ථාපනය කල නොහැක. ස්ථාපන විධානය <pre>{!s}</pre> දෝෂ කේතය {!s} "
+"ලබා දුන්නේය."
 
-#: src/modules/displaymanager/main.py:1075
-msgid "Display manager configuration was incomplete"
-msgstr "සංදර්ශක කළමනාකරු වින්‍යාසය අසම්පූර්ණ විය"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+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/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "දෘඩාංග ඔරලෝසුව සැකසෙමින්."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "OpenRC dmcrypt සේවාව වින්‍යාස කරමින්."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "දත්ත ස්ථාපනය වෙමින්."
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr "fstab ලියමින්."
+
+#: src/modules/fstab/main.py:429
+msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
+msgstr ""
+"භාවිතා කිරීමට <pre>{!s}</pre> සඳහා <pre>{!s}</pre> වින්‍යාසයක් ලබා දී නොමැත."
+
+#: 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 b5747608fa30620e874808926d0454cc1abcfb82..d9d113213a1d744d340f076805e1c18ed0b4c282 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 <prescott66@gmail.com>, 2020\n"
 "Language-Team: Slovak (https://www.transifex.com/calamares/teams/20061/sk/)\n"
@@ -21,103 +21,95 @@ 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/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/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Konfigurácia zavádzača GRUB."
 
-#: 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/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "Pripájanie oddielov."
 
-#: 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 <pre>{!s}</pre> "
-"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 <pre>{!s}</pre>"
-" 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 <pre>{!s}</pre> 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 <pre>{!s}</pre> to use."
-msgstr "Nie je zadaný žiadny bod pripojenia na použitie pre <pre>{!s}</pre>."
-
-#: 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 <pre>{!s}</pre> to use."
 msgstr "Nie sú určené žiadne oddiely na použitie pre <pre>{!s}</pre>."
 
-#: 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 ""
+"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
 msgstr ""
+"Volanie <code>systemctl {arg!s}</code> in prostredí chroot vrátilo chybový "
+"kód {num!s}."
 
-#: 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:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service <code>{name!s}</code>."
+msgstr "Nedá sa povoliť služba systému systemd <code>{name!s}</code>."
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target <code>{name!s}</code>."
+msgstr "Nedá sa povoliť cieľ systému systemd <code>{name!s}</code>."
+
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer <code>{name!s}</code>."
 msgstr ""
 
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target <code>{name!s}</code>."
+msgstr "Nedá sa zakázať cieľ systému systemd <code>{name!s}</code>."
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit <code>{name!s}</code>."
+msgstr "Nedá sa zamaskovať jednotka systému systemd <code>{name!s}</code>."
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands <code>{command!s}</code> and "
+"<code>{suffix!s}</code> for unit {name!s}."
+msgstr ""
+"Neznáme príkazy systému systemd <code>{command!s}</code> a "
+"<code>{suffix!s}</code> pre jednotku {name!s}."
+
 #: src/modules/unpackfs/main.py:34
 msgid "Filling up filesystems."
 msgstr "Napĺňanie súborových systémov."
@@ -182,117 +174,73 @@ 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 ""
-"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
-msgstr ""
-"Volanie <code>systemctl {arg!s}</code> 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 <code>{name!s}</code>."
-msgstr "Nedá sa povoliť služba systému systemd <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "Nedá sa zapísať konfiguračný súbor správcu KDM"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target <code>{name!s}</code>."
-msgstr "Nedá sa povoliť cieľ systému systemd <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "Konfiguračný súbor správcu KDM {!s} neexistuje"
 
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer <code>{name!s}</code>."
-msgstr ""
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "Nedá sa zapísať konfiguračný súbor správcu LXDM"
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target <code>{name!s}</code>."
-msgstr "Nedá sa zakázať cieľ systému systemd <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "Konfiguračný súbor správcu LXDM {!s} neexistuje"
 
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit <code>{name!s}</code>."
-msgstr "Nedá sa zamaskovať jednotka systému systemd <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "Nedá sa zapísať konfiguračný súbor správcu LightDM"
 
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands <code>{command!s}</code> and "
-"<code>{suffix!s}</code> for unit {name!s}."
-msgstr ""
-"Neznáme príkazy systému systemd <code>{command!s}</code> a "
-"<code>{suffix!s}</code> pre jednotku {name!s}."
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "Konfiguračný súbor správcu LightDM {!s} neexistuje"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Fiktívna úloha jazyka python."
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "Nedá s nakonfigurovať správca LightDM"
 
-#: 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/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr "Nie je nainštalovaný žiadny vítací nástroj LightDM."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Inštalácia zavádzača."
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "Nedá sa zapísať konfiguračný súbor správcu SLIM"
 
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "Konfiguračný súbor správcu SLIM {!s} neexistuje"
 
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr "Neboli vybraní žiadni správcovia zobrazenia pre modul displaymanager."
 
-#: src/modules/bootloader/main.py:783
+#: src/modules/displaymanager/main.py:993
 msgid ""
-"The bootloader could not be installed. The installation command "
-"<pre>{!s}</pre> 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"
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr ""
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr "Konfigurácia správcu zobrazenia nebola úplná"
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Konfigurácia motívu služby Plymouth"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Konfigurácia mkinitcpio."
 
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr "Zapisovanie fstab."
+#: 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 <pre>{!s}</pre> to use."
+msgstr "Nie je zadaný žiadny bod pripojenia na použitie pre <pre>{!s}</pre>."
 
-#: src/modules/fstab/main.py:429
-msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
-msgstr ""
+#: 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"
@@ -337,80 +285,132 @@ msgid ""
 "exist."
 msgstr "Cesta k službe {name!s} je <code>{path!s}</code>, ale neexistuje."
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Vytváranie initramfs pomocou nástroja dracut."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Konfigurácia motívu služby Plymouth"
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Zlyhalo spustenie nástroja dracut v cieli"
+#: 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/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "Nedá sa zapísať konfiguračný súbor správcu KDM"
+#: 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/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "Konfiguračný súbor správcu KDM {!s} neexistuje"
+#: 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/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "Nedá sa zapísať konfiguračný súbor správcu LXDM"
+#: 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/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "Konfiguračný súbor správcu LXDM {!s} neexistuje"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command <pre>{!s}</pre> "
+"returned error code {!s}."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "Nedá sa zapísať konfiguračný súbor správcu LightDM"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command <pre>{!s}</pre>"
+" returned error code {!s}."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "Konfiguračný súbor správcu LightDM {!s} neexistuje"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command <pre>{!s}</pre> returned error code {!s}."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "Nedá s nakonfigurovať správca LightDM"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Inštalácia zavádzača."
 
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr "Nie je nainštalovaný žiadny vítací nástroj LightDM."
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
 
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "Nedá sa zapísať konfiguračný súbor správcu SLIM"
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
 
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "Konfiguračný súbor správcu SLIM {!s} neexistuje"
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"<pre>{!s}</pre> returned error code {!s}."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:992
-msgid "No display managers selected for the displaymanager module."
-msgstr "Neboli vybraní žiadni správcovia zobrazenia pre modul displaymanager."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Nastavovanie hardvérových hodín."
 
-#: src/modules/displaymanager/main.py:993
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:1075
-msgid "Display manager configuration was incomplete"
-msgstr "Konfigurácia správcu zobrazenia nebola úplná"
+#: 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/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Nastavovanie hardvérových hodín."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Inštalácia údajov."
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr "Zapisovanie fstab."
+
+#: src/modules/fstab/main.py:429
+msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> 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 8e3792933a000e9ce3a019f186f7f87c2a81101b..f9402c8bc8216cf01084290756af070403dbfcef 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/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr ""
 
-#: 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/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr ""
 
-#: 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 <pre>{!s}</pre> "
-"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 <pre>{!s}</pre>"
-" returned error code {!s}."
+#: 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/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command <pre>{!s}</pre> returned error code {!s}."
+#: 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 <pre>{!s}</pre> to use."
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
 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/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
-msgid "Configuration Error"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 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 <pre>{!s}</pre> to use."
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
 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
-msgid "No partitions are defined for <pre>{!s}</pre> to use."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit <code>{name!s}</code>."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands <code>{command!s}</code> and "
+"<code>{suffix!s}</code> for unit {name!s}."
 msgstr ""
 
 #: src/modules/unpackfs/main.py:34
@@ -178,112 +166,72 @@ 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 ""
-"<code>systemctl {arg!s}</code> 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 <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands <code>{command!s}</code> and "
-"<code>{suffix!s}</code> for unit {name!s}."
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/bootloader/main.py:783
+#: src/modules/displaymanager/main.py:993
 msgid ""
-"The bootloader could not be installed. The installation command "
-"<pre>{!s}</pre> 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"
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
+#: 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 <pre>{!s}</pre> to use."
 msgstr ""
 
-#: src/modules/fstab/main.py:429
-msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
 
 #: src/modules/services-openrc/main.py:29
@@ -329,80 +277,132 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: 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."
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
+#: 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/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command <pre>{!s}</pre> "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command <pre>{!s}</pre>"
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command <pre>{!s}</pre> returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"<pre>{!s}</pre> returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:992
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:993
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:1075
-msgid "Display manager configuration was incomplete"
+#: 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/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> 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 3be6c94f965a705200e6458dc83c0407ff212b9f..bb458ca6a3db14158040a6bcb2c9443cc1003bba 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 <besnik@programeshqip.org>, 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/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/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Formësoni GRUB-in."
 
-#: 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:42
+msgid "Mounting partitions."
+msgstr "Po montohen pjesë."
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command <pre>{!s}</pre> "
-"returned error code {!s}."
-msgstr ""
-"Përgjegjësi i paketave s’përgatiti dot përditësime. Urdhri <pre>{!s}</pre> u"
-" përgjigj me kod gabimi {!s}."
+#: 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:738
-msgid ""
-"The package manager could not update the system. The command <pre>{!s}</pre>"
-" returned error code {!s}."
-msgstr ""
-"Përgjegjësi i paketave s’përditësoi dot sistemin. Urdhri <pre>{!s}</pre> u "
-"përgjigj me kod gabimi {!s}."
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr "S’u arrit të importohej zpool"
 
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command <pre>{!s}</pre> returned error code {!s}."
-msgstr ""
-"Përgjegjësi i paketave s’bëri dot ndryshime te sistemi i instaluar. Urdhri "
-"<pre>{!s}</pre> u përgjigj me kod gabimi {!s}."
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr "S’u arrit të shkyçej zpool"
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Po ruhet formësimi i rrjetit."
+#: 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/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 <pre>{!s}</pre> to use."
+#: 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 <pre>{!s}</pre> to use."
+msgstr "S’ka pjesë të përkufizuara për <pre>{!s}</pre> për t’u përdorur."
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr "Gabim montimi zfs"
+
+#: 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 ""
+"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
 msgstr ""
-"S’është dhënë pikë montimi rrënjë për <pre>{!s}</pre> për t’u përdorur."
+"Thirrja <code>systemctl {arg!s}</code> në chroot u përgjigj me kod gabimi "
+"{num!s}."
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Po formësohet mkinitcpio."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service <code>{name!s}</code>."
+msgstr "S’aktivizohet dot shërbimi systemd <code>{name!s}</code>."
 
-#: 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
-msgid "No partitions are defined for <pre>{!s}</pre> to use."
-msgstr "S’ka pjesë të përkufizuara për <pre>{!s}</pre> për t’u përdorur."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target <code>{name!s}</code>."
+msgstr "S’aktivizohet dot objektivi systemd <code>{name!s}</code>."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Po krijohet initramfs me mkinitfs."
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer <code>{name!s}</code>."
+msgstr "S’aktivizohet dot kohëmatës systemd <code>{name!s}</code>."
 
-#: 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:71
+msgid "Cannot disable systemd target <code>{name!s}</code>."
+msgstr "S’çaktivizohet dot objektivi systemd <code>{name!s}</code>."
 
-#: 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:73
+msgid "Cannot mask systemd unit <code>{name!s}</code>."
+msgstr "S’maskohet dot njësia systemd <code>{name!s}</code>."
 
-#: 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:75
+msgid ""
+"Unknown systemd commands <code>{command!s}</code> and "
+"<code>{suffix!s}</code> for unit {name!s}."
+msgstr ""
+"Urdhra të panjohur systemd <code>{command!s}</code> dhe "
+"<code>{suffix!s}</code> për njësi {name!s}."
 
 #: src/modules/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -188,121 +177,76 @@ 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 ""
-"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
-msgstr ""
-"Thirrja <code>systemctl {arg!s}</code> 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 <code>{name!s}</code>."
-msgstr "S’aktivizohet dot shërbimi systemd <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "S’shkruhet dot kartelë formësimi KDM"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target <code>{name!s}</code>."
-msgstr "S’aktivizohet dot objektivi systemd <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "S’ekziston kartelë formësimi KDM {!s}"
 
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer <code>{name!s}</code>."
-msgstr "S’aktivizohet dot kohëmatës systemd <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "S’shkruhet dot kartelë formësimi LXDM"
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target <code>{name!s}</code>."
-msgstr "S’çaktivizohet dot objektivi systemd <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "S’ekziston kartelë formësimi LXDM {!s}"
 
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit <code>{name!s}</code>."
-msgstr "S’maskohet dot njësia systemd <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "S’shkruhet dot kartelë formësimi LightDM"
 
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands <code>{command!s}</code> and "
-"<code>{suffix!s}</code> for unit {name!s}."
-msgstr ""
-"Urdhra të panjohur systemd <code>{command!s}</code> dhe "
-"<code>{suffix!s}</code> për njësi {name!s}."
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "S’ekziston kartelë formësimi LightDM {!s}"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Akt python dummy."
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "S’formësohet dot LightDM"
 
-#: 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/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr "S’ka të instaluar përshëndetës LightDM."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Instalo ngarkues nisjesh."
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "S’shkruhet dot kartelë formësimi SLIM"
 
-#: 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/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "S’ekziston kartelë formësimi SLIM {!s}"
 
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr "Gabim instalimi Ngarkuesi Nisësi"
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr "S’janë përzgjedhur përgjegjës ekrani për modulin displaymanager."
 
-#: src/modules/bootloader/main.py:783
+#: src/modules/displaymanager/main.py:993
 msgid ""
-"The bootloader could not be installed. The installation command "
-"<pre>{!s}</pre> returned error code {!s}."
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
-"Ngarkuesi i nisësit s’u instalua dot. Urdhri i instalimit <pre>{!s}</pre> 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"
+"Lista “displaymanagers” është e zbrazët ose e papërkufizuar për të dy "
+"rastet, për “globalstorage” dhe për “displaymanager.conf”."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Formësoni temën Plimuth"
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr "Formësimi i përgjegjësit të ekranit s’qe i plotë"
 
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr "Po shkruhet fstab."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Po formësohet mkinitcpio."
 
-#: src/modules/fstab/main.py:429
-msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
+#: 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 <pre>{!s}</pre> to use."
 msgstr ""
-"S’është dhënë formësim <pre>{!s}</pre> për t’u përdorur nga <pre>{!s}</pre>."
+"S’është dhënë pikë montimi rrënjë për <pre>{!s}</pre> 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"
@@ -355,82 +299,138 @@ msgstr ""
 "Shtegu për shërbimin {name!s} është <code>{path!s}</code>, 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/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Formësoni temën Plimuth"
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "S’shkruhet dot kartelë formësimi KDM"
+#: 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/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "S’ekziston kartelë formësimi KDM {!s}"
+#: 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/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "S’shkruhet dot kartelë formësimi LXDM"
+#: 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/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "S’ekziston kartelë formësimi LXDM {!s}"
+#: 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/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "S’shkruhet dot kartelë formësimi LightDM"
+#: 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/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "S’ekziston kartelë formësimi LightDM {!s}"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command <pre>{!s}</pre> "
+"returned error code {!s}."
+msgstr ""
+"Përgjegjësi i paketave s’përgatiti dot përditësime. Urdhri <pre>{!s}</pre> u"
+" përgjigj me kod gabimi {!s}."
 
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "S’formësohet dot LightDM"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command <pre>{!s}</pre>"
+" returned error code {!s}."
+msgstr ""
+"Përgjegjësi i paketave s’përditësoi dot sistemin. Urdhri <pre>{!s}</pre> u "
+"përgjigj me kod gabimi {!s}."
 
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr "S’ka të instaluar përshëndetës LightDM."
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command <pre>{!s}</pre> returned error code {!s}."
+msgstr ""
+"Përgjegjësi i paketave s’bëri dot ndryshime te sistemi i instaluar. Urdhri "
+"<pre>{!s}</pre> u përgjigj me kod gabimi {!s}."
 
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "S’shkruhet dot kartelë formësimi SLIM"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Instalo ngarkues nisjesh."
 
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "S’ekziston kartelë formësimi SLIM {!s}"
+#: 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/displaymanager/main.py:992
-msgid "No display managers selected for the displaymanager module."
-msgstr "S’janë përzgjedhur përgjegjës ekrani për modulin displaymanager."
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr "Gabim instalimi Ngarkuesi Nisësi"
 
-#: src/modules/displaymanager/main.py:993
+#: src/modules/bootloader/main.py:783
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"The bootloader could not be installed. The installation command "
+"<pre>{!s}</pre> returned error code {!s}."
 msgstr ""
-"Lista “displaymanagers” është e zbrazët ose e papërkufizuar për të dy "
-"rastet, për “globalstorage” dhe për “displaymanager.conf”."
+"Ngarkuesi i nisësit s’u instalua dot. Urdhri i instalimit <pre>{!s}</pre> u "
+"përgjigj me kod gabimi {!s}."
 
-#: src/modules/displaymanager/main.py:1075
-msgid "Display manager configuration was incomplete"
-msgstr "Formësimi i përgjegjësit të ekranit s’qe i plotë"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Po caktohet ora hardware."
+
+#: 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/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Po caktohet ora hardware."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Po formësohet shërbim OpenRC dmcrypt."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Po instalohen të dhëna."
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr "Po shkruhet fstab."
+
+#: src/modules/fstab/main.py:429
+msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
+msgstr ""
+"S’është dhënë formësim <pre>{!s}</pre> për t’u përdorur nga <pre>{!s}</pre>."
+
+#: 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 606b71e62d92dab85d44cb3158ca8f343b4d2617..c4d4480e05700c32dbd670224b8e676f06050d29 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ć <slsimic@gmail.com>, 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."
-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/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Подеси ГРУБ"
 
-#: 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/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "Монтирање партиција."
 
-#: 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 <pre>{!s}</pre> "
-"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 <pre>{!s}</pre>"
-" 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 <pre>{!s}</pre> 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 <pre>{!s}</pre> to use."
+#: 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 <pre>{!s}</pre> to use."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
 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
-msgid "No partitions are defined for <pre>{!s}</pre> to use."
+#: 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 ""
+"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target <code>{name!s}</code>."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit <code>{name!s}</code>."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands <code>{command!s}</code> and "
+"<code>{suffix!s}</code> for unit {name!s}."
 msgstr ""
 
 #: src/modules/unpackfs/main.py:34
@@ -180,113 +170,73 @@ 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 ""
-"<code>systemctl {arg!s}</code> 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 <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands <code>{command!s}</code> and "
-"<code>{suffix!s}</code> for unit {name!s}."
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/bootloader/main.py:783
+#: src/modules/displaymanager/main.py:993
 msgid ""
-"The bootloader could not be installed. The installation command "
-"<pre>{!s}</pre> 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"
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
-msgid "Failed to set zfs mountpoint"
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/initcpiocfg/main.py: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 <pre>{!s}</pre> to use."
 msgstr ""
 
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr "Уписивање fstab."
-
-#: src/modules/fstab/main.py:429
-msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
-msgstr ""
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Инсталирање података."
 
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
@@ -331,80 +281,130 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: 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 ""
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
+#: 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/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command <pre>{!s}</pre> "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command <pre>{!s}</pre>"
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command <pre>{!s}</pre> returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"<pre>{!s}</pre> returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:992
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:993
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:1075
-msgid "Display manager configuration was incomplete"
+#: 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/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Инсталирање података."
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr "Уписивање fstab."
+
+#: src/modules/fstab/main.py:429
+msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> 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 804c3269f420c0d238ba4ee944c961afbc4819f4..9dad5fcc879ba476b730ffc6184ad5186ec0eab1 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/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr ""
 
-#: 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/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr ""
 
-#: 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 <pre>{!s}</pre> "
-"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 <pre>{!s}</pre>"
-" returned error code {!s}."
+#: 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/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command <pre>{!s}</pre> returned error code {!s}."
+#: 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 <pre>{!s}</pre> to use."
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
 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/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
-msgid "Configuration Error"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 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 <pre>{!s}</pre> to use."
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
 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
-msgid "No partitions are defined for <pre>{!s}</pre> to use."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit <code>{name!s}</code>."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands <code>{command!s}</code> and "
+"<code>{suffix!s}</code> for unit {name!s}."
 msgstr ""
 
 #: src/modules/unpackfs/main.py:34
@@ -176,112 +166,72 @@ 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 ""
-"<code>systemctl {arg!s}</code> 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 <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands <code>{command!s}</code> and "
-"<code>{suffix!s}</code> for unit {name!s}."
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/bootloader/main.py:783
+#: src/modules/displaymanager/main.py:993
 msgid ""
-"The bootloader could not be installed. The installation command "
-"<pre>{!s}</pre> 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"
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
+#: 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 <pre>{!s}</pre> to use."
 msgstr ""
 
-#: src/modules/fstab/main.py:429
-msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
 
 #: src/modules/services-openrc/main.py:29
@@ -327,80 +277,130 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: 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."
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
+#: 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/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command <pre>{!s}</pre> "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command <pre>{!s}</pre>"
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command <pre>{!s}</pre> returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"<pre>{!s}</pre> returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:992
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:993
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:1075
-msgid "Display manager configuration was incomplete"
+#: 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/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> 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 560440a6208209ff25279f5844ca5be1b993ac70..2756d98be889515924c1439cffb6ec94e82dc7b9 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 <bittin@cafe8bitar.se>, 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/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/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Konfigurera GRUB."
 
-#: 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:42
+msgid "Mounting partitions."
+msgstr "Monterar partitioner."
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command <pre>{!s}</pre> "
-"returned error code {!s}."
-msgstr ""
-"Pakethanteraren kunde inte förbereda uppdateringar kommandot <pre>{!s}</pre>"
-" returnerade felkod {!s}."
+#: 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:738
-msgid ""
-"The package manager could not update the system. The command <pre>{!s}</pre>"
-" returned error code {!s}."
-msgstr ""
-"Pakethanteraren kunde inte uppdatera systemet. kommandot <pre>{!s}</pre> "
-"returnerade felkod {!s}."
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr "Misslyckades att importera zpool"
 
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command <pre>{!s}</pre> returned error code {!s}."
-msgstr ""
-"Pakethanteraren kunde inte göra ändringar till det installerade systemet. "
-"kommandot <pre>{!s}</pre> returnerade felkod {!s}."
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr "Misslyckades att låsa upp zpool"
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Sparar nätverkskonfiguration."
+#: 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/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 <pre>{!s}</pre> to use."
+#: 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 <pre>{!s}</pre> to use."
+msgstr "Inga partitioner är definerade för <pre>{!s}</pre> att använda."
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr "zfs monteringsfel"
+
+#: 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 ""
+"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
 msgstr ""
-"Ingen root monteringspunkt är angiven för <pre>{!s}</pre> att använda."
+"Anrop till <code>systemctl {arg!s}</code>i chroot returnerade felkod "
+"{num!s}."
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Konfigurerar mkinitcpio."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service <code>{name!s}</code>."
+msgstr "Kunde inte aktivera systemd tjänst <code>{name!s}</code>."
 
-#: 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
-msgid "No partitions are defined for <pre>{!s}</pre> to use."
-msgstr "Inga partitioner är definerade för <pre>{!s}</pre> att använda."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target <code>{name!s}</code>."
+msgstr "Kunde inte aktivera systemd målsystem <code>{name!s}</code>."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Skapar initramfs med mkinitfs."
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer <code>{name!s}</code>."
+msgstr "Kunde inte aktivera systemd timer <code>{name!s}</code>."
 
-#: 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:71
+msgid "Cannot disable systemd target <code>{name!s}</code>."
+msgstr "Kunde inte inaktivera systemd målsystem <code>{name!s}</code>."
 
-#: 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:73
+msgid "Cannot mask systemd unit <code>{name!s}</code>."
+msgstr "Kan inte maskera systemd unit <code>{name!s}</code>"
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Konfigurerar OpenRC dmcrypt tjänst."
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands <code>{command!s}</code> and "
+"<code>{suffix!s}</code> for unit {name!s}."
+msgstr ""
+"Okända systemd kommandon <code>{command!s}</code> och {suffix!s}<code> för "
+"enhet {name!s}."
 
 #: src/modules/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -189,123 +178,76 @@ 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 ""
-"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
-msgstr ""
-"Anrop till <code>systemctl {arg!s}</code>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 <code>{name!s}</code>."
-msgstr "Kunde inte aktivera systemd tjänst <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "Misslyckades med att skriva KDM konfigurationsfil"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target <code>{name!s}</code>."
-msgstr "Kunde inte aktivera systemd målsystem <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "KDM konfigurationsfil {!s} existerar inte"
 
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer <code>{name!s}</code>."
-msgstr "Kunde inte aktivera systemd timer <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "Misslyckades med att skriva LXDM konfigurationsfil"
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target <code>{name!s}</code>."
-msgstr "Kunde inte inaktivera systemd målsystem <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "LXDM konfigurationsfil {!s} existerar inte"
 
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit <code>{name!s}</code>."
-msgstr "Kan inte maskera systemd unit <code>{name!s}</code>"
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "Misslyckades med att skriva LightDM konfigurationsfil"
 
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands <code>{command!s}</code> and "
-"<code>{suffix!s}</code> for unit {name!s}."
-msgstr ""
-"Okända systemd kommandon <code>{command!s}</code> och {suffix!s}<code> för "
-"enhet {name!s}."
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "LightDM konfigurationsfil {!s} existerar inte"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Exempel python jobb"
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "Kunde inte konfigurera LightDM"
 
-#: 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/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr "Ingen LightDM greeter installerad."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Installera starthanterare."
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "Misslyckades med att SLIM konfigurationsfil"
 
-#: 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/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "SLIM konfigurationsfil {!s} existerar inte"
 
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr "Starthanterare installationsfel"
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr "Ingen skärmhanterare vald för displaymanager modulen."
 
-#: src/modules/bootloader/main.py:783
+#: src/modules/displaymanager/main.py:993
 msgid ""
-"The bootloader could not be installed. The installation command "
-"<pre>{!s}</pre> returned error code {!s}."
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
-"Starthanterare kunde inte installeras. Installationskommandot "
-"<pre>{!s}</pre>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"
+"Skärmhanterar listan är tom eller odefinierad i både globalstorage och "
+"displaymanager.conf."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Konfigurera Plymouth tema"
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr "Konfiguration för displayhanteraren var inkomplett"
 
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr "Skriver fstab."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Konfigurerar mkinitcpio."
 
-#: src/modules/fstab/main.py:429
-msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
+#: 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 <pre>{!s}</pre> to use."
 msgstr ""
-"Ingen <pre>{!s}</pre> konfiguration är angiven för <pre>{!s}</pre> att "
-"använda. "
+"Ingen root monteringspunkt är angiven för <pre>{!s}</pre> 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"
@@ -357,82 +299,140 @@ msgid ""
 msgstr ""
 "Sökvägen för tjänst {name!s} är <code>{path!s}</code>, 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/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Konfigurera Plymouth tema"
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "Misslyckades med att skriva KDM konfigurationsfil"
+#: 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/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "KDM konfigurationsfil {!s} existerar inte"
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Bearbetar paket (%(count)d / %(total)d)"
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "Misslyckades med att skriva LXDM konfigurationsfil"
+#: 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/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "LXDM konfigurationsfil {!s} existerar inte"
+#: 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/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "Misslyckades med att skriva LightDM konfigurationsfil"
+#: 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/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "LightDM konfigurationsfil {!s} existerar inte"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command <pre>{!s}</pre> "
+"returned error code {!s}."
+msgstr ""
+"Pakethanteraren kunde inte förbereda uppdateringar kommandot <pre>{!s}</pre>"
+" returnerade felkod {!s}."
 
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "Kunde inte konfigurera LightDM"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command <pre>{!s}</pre>"
+" returned error code {!s}."
+msgstr ""
+"Pakethanteraren kunde inte uppdatera systemet. kommandot <pre>{!s}</pre> "
+"returnerade felkod {!s}."
 
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr "Ingen LightDM greeter installerad."
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command <pre>{!s}</pre> returned error code {!s}."
+msgstr ""
+"Pakethanteraren kunde inte göra ändringar till det installerade systemet. "
+"kommandot <pre>{!s}</pre> returnerade felkod {!s}."
 
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "Misslyckades med att SLIM konfigurationsfil"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Installera starthanterare."
 
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "SLIM konfigurationsfil {!s} existerar inte"
+#: 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/displaymanager/main.py:992
-msgid "No display managers selected for the displaymanager module."
-msgstr "Ingen skärmhanterare vald för displaymanager modulen."
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr "Starthanterare installationsfel"
 
-#: src/modules/displaymanager/main.py:993
+#: src/modules/bootloader/main.py:783
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"The bootloader could not be installed. The installation command "
+"<pre>{!s}</pre> returned error code {!s}."
 msgstr ""
-"Skärmhanterar listan är tom eller odefinierad i både globalstorage och "
-"displaymanager.conf."
+"Starthanterare kunde inte installeras. Installationskommandot "
+"<pre>{!s}</pre>returnerade felkod {!s}."
 
-#: src/modules/displaymanager/main.py:1075
-msgid "Display manager configuration was incomplete"
-msgstr "Konfiguration för displayhanteraren var inkomplett"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Ställer hårdvaruklockan."
+
+#: 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/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Ställer hårdvaruklockan."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Konfigurerar OpenRC dmcrypt tjänst."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Installerar data."
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr "Skriver fstab."
+
+#: src/modules/fstab/main.py:429
+msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
+msgstr ""
+"Ingen <pre>{!s}</pre> konfiguration är angiven för <pre>{!s}</pre> 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 c66526df30fb2ec4099a96e69be3d40b2c12767d..a2533ed346f0176234f6354b969688ed6513ed5d 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/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr ""
 
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr ""
 
-#: 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 <pre>{!s}</pre> "
-"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 <pre>{!s}</pre>"
-" returned error code {!s}."
+#: 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/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command <pre>{!s}</pre> returned error code {!s}."
+#: 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 <pre>{!s}</pre> to use."
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
 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/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
-msgid "Configuration Error"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 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 <pre>{!s}</pre> to use."
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
 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
-msgid "No partitions are defined for <pre>{!s}</pre> to use."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit <code>{name!s}</code>."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands <code>{command!s}</code> and "
+"<code>{suffix!s}</code> for unit {name!s}."
 msgstr ""
 
 #: src/modules/unpackfs/main.py:34
@@ -174,112 +166,72 @@ 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 ""
-"<code>systemctl {arg!s}</code> 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 <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands <code>{command!s}</code> and "
-"<code>{suffix!s}</code> for unit {name!s}."
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/bootloader/main.py:783
+#: src/modules/displaymanager/main.py:993
 msgid ""
-"The bootloader could not be installed. The installation command "
-"<pre>{!s}</pre> 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"
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
+#: 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 <pre>{!s}</pre> to use."
 msgstr ""
 
-#: src/modules/fstab/main.py:429
-msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
 
 #: src/modules/services-openrc/main.py:29
@@ -325,80 +277,128 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: 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."
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
+#: 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/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command <pre>{!s}</pre> "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command <pre>{!s}</pre>"
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command <pre>{!s}</pre> returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"<pre>{!s}</pre> returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:992
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:993
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:1075
-msgid "Display manager configuration was incomplete"
+#: 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/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> 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 2586f68c1fd30e9834fb815a4fe1d162d6b9287e..c77fc0462d07d9a242548f9ca73a43e0ac9ece2b 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/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr ""
 
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr ""
 
-#: 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 <pre>{!s}</pre> "
-"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 <pre>{!s}</pre>"
-" returned error code {!s}."
+#: 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/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command <pre>{!s}</pre> returned error code {!s}."
+#: 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 <pre>{!s}</pre> to use."
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
 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/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
-msgid "Configuration Error"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 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 <pre>{!s}</pre> to use."
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
 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
-msgid "No partitions are defined for <pre>{!s}</pre> to use."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit <code>{name!s}</code>."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands <code>{command!s}</code> and "
+"<code>{suffix!s}</code> for unit {name!s}."
 msgstr ""
 
 #: src/modules/unpackfs/main.py:34
@@ -174,112 +166,72 @@ 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 ""
-"<code>systemctl {arg!s}</code> 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 <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands <code>{command!s}</code> and "
-"<code>{suffix!s}</code> for unit {name!s}."
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/bootloader/main.py:783
+#: src/modules/displaymanager/main.py:993
 msgid ""
-"The bootloader could not be installed. The installation command "
-"<pre>{!s}</pre> 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"
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
+#: 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 <pre>{!s}</pre> to use."
 msgstr ""
 
-#: src/modules/fstab/main.py:429
-msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
 
 #: src/modules/services-openrc/main.py:29
@@ -325,80 +277,128 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: 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."
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
+#: 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/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command <pre>{!s}</pre> "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command <pre>{!s}</pre>"
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command <pre>{!s}</pre> returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"<pre>{!s}</pre> returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:992
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:993
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:1075
-msgid "Display manager configuration was incomplete"
+#: 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/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> 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 9d979414cf3ef11f1cb1e7bb31c0b55d5c4c3694..04912fcd8efb8fc8f3266cdbad3707e99db709cb 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 <victor.ibragimov@gmail.com>, 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/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/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Танзимоти GRUB."
 
-#: 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:42
+msgid "Mounting partitions."
+msgstr "Васлкунии қисмҳои диск."
 
-#: 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 <pre>{!s}</pre> "
-"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 <pre>{!s}</pre>"
-" 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 <pre>{!s}</pre> 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 <pre>{!s}</pre> to use."
-msgstr "Нуқтаи васли реша (root) барои истифодаи <pre>{!s}</pre> дода нашуд."
-
-#: 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 <pre>{!s}</pre> to use."
 msgstr "Ягон қисми диск барои истифодаи <pre>{!s}</pre> муайян карда нашуд."
 
-#: 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 ""
+"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
+msgstr ""
+"Дархости <code>systemctl {arg!s}</code> дар chroot рамзи хатои {num!s}-ро ба"
+" вуҷуд овард."
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service <code>{name!s}</code>."
+msgstr "Хидмати systemd-и <code>{name!s}</code> фаъол карда намешавад."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target <code>{name!s}</code>."
+msgstr "Интихоби systemd-и <code>{name!s}</code> фаъол карда намешавад."
+
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer <code>{name!s}</code>."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target <code>{name!s}</code>."
+msgstr "Интихоби systemd-и <code>{name!s}</code> ғайрифаъол карда намешавад."
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit <code>{name!s}</code>."
+msgstr "Воҳиди systemd-и <code>{name!s}</code> пинҳон карда намешавад."
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands <code>{command!s}</code> and "
+"<code>{suffix!s}</code> for unit {name!s}."
+msgstr ""
+"Фармонҳои systemd-и номаълум <code>{command!s}</code> ва "
+"<code>{suffix!s}</code> барои воҳиди {name!s}."
 
 #: src/modules/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -178,117 +174,75 @@ 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 ""
-"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
-msgstr ""
-"Дархости <code>systemctl {arg!s}</code> дар chroot рамзи хатои {num!s}-ро ба"
-" вуҷуд овард."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service <code>{name!s}</code>."
-msgstr "Хидмати systemd-и <code>{name!s}</code> фаъол карда намешавад."
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "Файли танзимии KDM сабт карда намешавад"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target <code>{name!s}</code>."
-msgstr "Интихоби systemd-и <code>{name!s}</code> фаъол карда намешавад."
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "Файли танзимии KDM {!s} вуҷуд надорад"
 
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer <code>{name!s}</code>."
-msgstr ""
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "Файли танзимии LXDM сабт карда намешавад"
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target <code>{name!s}</code>."
-msgstr "Интихоби systemd-и <code>{name!s}</code> ғайрифаъол карда намешавад."
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "Файли танзимии LXDM {!s} вуҷуд надорад"
 
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit <code>{name!s}</code>."
-msgstr "Воҳиди systemd-и <code>{name!s}</code> пинҳон карда намешавад."
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "Файли танзимии LightDM сабт карда намешавад"
 
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands <code>{command!s}</code> and "
-"<code>{suffix!s}</code> for unit {name!s}."
-msgstr ""
-"Фармонҳои systemd-и номаълум <code>{command!s}</code> ва "
-"<code>{suffix!s}</code> барои воҳиди {name!s}."
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "Файли танзимии LightDM {!s} вуҷуд надорад"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Вазифаи амсилаи python."
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "LightDM танзим карда намешавад"
 
-#: 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/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr "Хушомади LightDM насб нашудааст."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Насбкунии боркунандаи роҳандозӣ."
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "Файли танзимии SLIM сабт карда намешавад"
 
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "Файли танзимии SLIM {!s} вуҷуд надорад"
 
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr ""
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr "Ягон мудири намоиш барои модули displaymanager интихоб нашудааст."
 
-#: src/modules/bootloader/main.py:783
+#: src/modules/displaymanager/main.py:993
 msgid ""
-"The bootloader could not be installed. The installation command "
-"<pre>{!s}</pre> 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"
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
+"Рӯйхати displaymanagers ҳам дар globalstorage ва ҳам дар displaymanager.conf"
+" холӣ ё номаълум аст."
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr ""
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr "Раванди танзимкунии мудири намоиш ба анҷом нарасид"
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Танзимоти мавзӯи Plymouth"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Танзимкунии mkinitcpio."
 
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr "Сабткунии fstab."
+#: 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 <pre>{!s}</pre> to use."
+msgstr "Нуқтаи васли реша (root) барои истифодаи <pre>{!s}</pre> дода нашуд."
 
-#: src/modules/fstab/main.py:429
-msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
-msgstr ""
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Насбкунии иттилоот."
 
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
@@ -341,82 +295,128 @@ msgstr ""
 "Масир барои хидмати {name!s} аз <code>{path!s}</code> иборат аст, аммо он "
 "вуҷуд надорад."
 
-#: 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/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Танзимоти мавзӯи Plymouth"
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "Файли танзимии KDM сабт карда намешавад"
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "Насбкунии қуттиҳо."
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "Файли танзимии KDM {!s} вуҷуд надорад"
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Коргузории қуттиҳо (%(count)d / %(total)d)"
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "Файли танзимии LXDM сабт карда намешавад"
+#: 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/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "Файли танзимии LXDM {!s} вуҷуд надорад"
+#: 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/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "Файли танзимии LightDM сабт карда намешавад"
+#: 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/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "Файли танзимии LightDM {!s} вуҷуд надорад"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command <pre>{!s}</pre> "
+"returned error code {!s}."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "LightDM танзим карда намешавад"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command <pre>{!s}</pre>"
+" returned error code {!s}."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr "Хушомади LightDM насб нашудааст."
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command <pre>{!s}</pre> returned error code {!s}."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "Файли танзимии SLIM сабт карда намешавад"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Насбкунии боркунандаи роҳандозӣ."
 
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "Файли танзимии SLIM {!s} вуҷуд надорад"
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
 
-#: src/modules/displaymanager/main.py:992
-msgid "No display managers selected for the displaymanager module."
-msgstr "Ягон мудири намоиш барои модули displaymanager интихоб нашудааст."
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr ""
 
-#: src/modules/displaymanager/main.py:993
+#: src/modules/bootloader/main.py:783
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"The bootloader could not be installed. The installation command "
+"<pre>{!s}</pre> returned error code {!s}."
 msgstr ""
-"Рӯйхати displaymanagers ҳам дар globalstorage ва ҳам дар displaymanager.conf"
-" холӣ ё номаълум аст."
 
-#: src/modules/displaymanager/main.py:1075
-msgid "Display manager configuration was incomplete"
-msgstr "Раванди танзимкунии мудири намоиш ба анҷом нарасид"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+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/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Танзимкунии соати сахтафзор."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Танзимкунии хидмати OpenRC dmcrypt."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Насбкунии иттилоот."
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr "Сабткунии fstab."
+
+#: src/modules/fstab/main.py:429
+msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> 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 bb7f4bc58f891b9df65ae31ca090f5cd279ac253..395c481f21230a0a8dfd88c86fd3819bd642e117 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/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr ""
 
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr ""
 
-#: 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 <pre>{!s}</pre> "
-"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 <pre>{!s}</pre>"
-" returned error code {!s}."
+#: 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/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command <pre>{!s}</pre> returned error code {!s}."
+#: 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 <pre>{!s}</pre> to use."
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
 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/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
-msgid "Configuration Error"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 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 <pre>{!s}</pre> to use."
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
 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
-msgid "No partitions are defined for <pre>{!s}</pre> to use."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit <code>{name!s}</code>."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands <code>{command!s}</code> and "
+"<code>{suffix!s}</code> for unit {name!s}."
 msgstr ""
 
 #: src/modules/unpackfs/main.py:34
@@ -172,112 +166,72 @@ 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 ""
-"<code>systemctl {arg!s}</code> 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 <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands <code>{command!s}</code> and "
-"<code>{suffix!s}</code> for unit {name!s}."
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/bootloader/main.py:783
+#: src/modules/displaymanager/main.py:993
 msgid ""
-"The bootloader could not be installed. The installation command "
-"<pre>{!s}</pre> 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"
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
+#: 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 <pre>{!s}</pre> to use."
 msgstr ""
 
-#: src/modules/fstab/main.py:429
-msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
 
 #: src/modules/services-openrc/main.py:29
@@ -323,80 +277,126 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: 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."
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
+#: 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/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command <pre>{!s}</pre> "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command <pre>{!s}</pre>"
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command <pre>{!s}</pre> returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"<pre>{!s}</pre> returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:992
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:993
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:1075
-msgid "Display manager configuration was incomplete"
+#: 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/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> 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 e6d7191fb1f2a9c6e258777778e50dfdf41864ec..6470301c1fad2ca5e29a263e3de2e665358a3915 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 <mdemiray@msn.com>, 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/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/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "GRUB'u yapılandır."
 
-#: 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:42
+msgid "Mounting partitions."
+msgstr "Disk bölümlemeleri bağlanıyor."
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command <pre>{!s}</pre> "
-"returned error code {!s}."
-msgstr ""
-"Paket yöneticisi güncellemeleri hazırlayamadı. <pre>{!s}</pre> komutu {!s} "
-"hata kodunu döndürdü."
+#: 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:738
-msgid ""
-"The package manager could not update the system. The command <pre>{!s}</pre>"
-" returned error code {!s}."
-msgstr ""
-"Paket yöneticisi sistemi güncelleyemedi. <pre>{!s}</pre> komutu {!s} hata "
-"kodunu döndürdü."
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr "zpool içe aktarılamadı"
 
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command <pre>{!s}</pre> returned error code {!s}."
-msgstr ""
-"Paket yöneticisi kurulu sistemde değişiklik yapamadı. <pre>{!s}</pre> komutu"
-" {!s} hata kodunu döndürdü."
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr "zpool kilidi açılamadı"
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Ağ yapılandırması kaydediliyor."
+#: 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/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 <pre>{!s}</pre> to use."
-msgstr "<pre>{!s}</pre> 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 <pre>{!s}</pre> to use."
 msgstr "<pre>{!s}</pre> 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 ""
+"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
+msgstr ""
+"<code>systemctl {arg!s}</code> 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 <code>{name!s}</code>."
+msgstr "Systemd hizmeti etkinleştirilemiyor <code>{name!s}</code>."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target <code>{name!s}</code>."
+msgstr "Systemd hedefi etkinleştirilemiyor <code>{name!s}</code>."
+
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer <code>{name!s}</code>."
+msgstr "<code>{name!s}</code> sistem zamanlayıcısı etkinleştirilemiyor."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target <code>{name!s}</code>."
+msgstr "Systemd hedefi devre dışı bırakılamıyor <code>{name!s}</code>."
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit <code>{name!s}</code>."
+msgstr "Systemd birimi maskeleyemiyor <code>{name!s}</code>."
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands <code>{command!s}</code> and "
+"<code>{suffix!s}</code> for unit {name!s}."
+msgstr ""
+"Bilinmeyen sistem komutları <code>{command!s}</code> ve "
+"<code>{suffix!s}</code>  {name!s} birimi için."
 
 #: src/modules/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -186,121 +176,75 @@ 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 ""
-"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
-msgstr ""
-"<code>systemctl {arg!s}</code> 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 <code>{name!s}</code>."
-msgstr "Systemd hizmeti etkinleştirilemiyor <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "KDM yapılandırma dosyası yazılamıyor"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target <code>{name!s}</code>."
-msgstr "Systemd hedefi etkinleştirilemiyor <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "KDM yapılandırma dosyası {!s} mevcut değil"
 
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer <code>{name!s}</code>."
-msgstr "<code>{name!s}</code> sistem zamanlayıcısı etkinleştirilemiyor."
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "LXDM yapılandırma dosyası yazılamıyor"
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target <code>{name!s}</code>."
-msgstr "Systemd hedefi devre dışı bırakılamıyor <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "LXDM yapılandırma dosyası {!s} mevcut değil"
 
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit <code>{name!s}</code>."
-msgstr "Systemd birimi maskeleyemiyor <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "LightDM yapılandırma dosyası yazılamıyor"
 
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands <code>{command!s}</code> and "
-"<code>{suffix!s}</code> for unit {name!s}."
-msgstr ""
-"Bilinmeyen sistem komutları <code>{command!s}</code> ve "
-"<code>{suffix!s}</code>  {name!s} birimi için."
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "LightDM yapılandırma dosyası {!s} mevcut değil"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Dummy python job."
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "LightDM yapılandırılamıyor"
 
-#: 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/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr "LightDM karşılama yüklü değil."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Önyükleyici kuruluyor"
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "SLIM yapılandırma dosyası yazılamıyor"
 
-#: 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/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "SLIM yapılandırma dosyası {!s} mevcut değil"
 
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr "Önyükleyici yükleme hatası"
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr "Ekran yöneticisi modülü için ekran yöneticisi seçilmedi."
 
-#: src/modules/bootloader/main.py:783
+#: src/modules/displaymanager/main.py:993
 msgid ""
-"The bootloader could not be installed. The installation command "
-"<pre>{!s}</pre> returned error code {!s}."
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
-"Önyükleyici yüklenemedi. Kurulum komutu <pre>{!s}</pre>, {!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ı"
+"Displaymanagers listesi hem globalstorage hem de displaymanager.conf'ta boş "
+"veya tanımsız."
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr "zfs bağlama hatası"
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr "Ekran yöneticisi yapılandırma işi tamamlanamadı"
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Plymouth temasını yapılandır"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Mkinitcpio yapılandırılıyor."
 
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr "Fstab dosyasına yazı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 <pre>{!s}</pre> to use."
+msgstr "<pre>{!s}</pre> kullanması için kök bağlama noktası verilmedi."
 
-#: src/modules/fstab/main.py:429
-msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
-msgstr ""
-"<pre>{!s}</pre>'nin kullanması için <pre>{!s}</pre> yapılandırması "
-"verilmemiştir."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Veri yükleniyor."
 
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
@@ -349,82 +293,138 @@ msgid ""
 "exist."
 msgstr "{name!s} hizmetinin yolu <code>{path!s}</code>, 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/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Plymouth temasını yapılandır"
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "KDM yapılandırma dosyası yazılamıyor"
+#: 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/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "KDM yapılandırma dosyası {!s} mevcut değil"
+#: 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/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "LXDM yapılandırma dosyası yazılamı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/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "LXDM yapılandırma dosyası {!s} mevcut değil"
+#: 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/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "LightDM yapılandırma dosyası yazılamı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/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "LightDM yapılandırma dosyası {!s} mevcut değil"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command <pre>{!s}</pre> "
+"returned error code {!s}."
+msgstr ""
+"Paket yöneticisi güncellemeleri hazırlayamadı. <pre>{!s}</pre> komutu {!s} "
+"hata kodunu döndürdü."
 
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "LightDM yapılandırılamıyor"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command <pre>{!s}</pre>"
+" returned error code {!s}."
+msgstr ""
+"Paket yöneticisi sistemi güncelleyemedi. <pre>{!s}</pre> komutu {!s} hata "
+"kodunu döndürdü."
 
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr "LightDM karşılama yüklü değil."
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command <pre>{!s}</pre> returned error code {!s}."
+msgstr ""
+"Paket yöneticisi kurulu sistemde değişiklik yapamadı. <pre>{!s}</pre> komutu"
+" {!s} hata kodunu döndürdü."
 
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "SLIM yapılandırma dosyası yazılamıyor"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Önyükleyici kuruluyor"
 
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "SLIM yapılandırma dosyası {!s} mevcut değil"
+#: 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/displaymanager/main.py:992
-msgid "No display managers selected for the displaymanager module."
-msgstr "Ekran yöneticisi modülü için ekran yöneticisi seçilmedi."
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr "Önyükleyici yükleme hatası"
 
-#: src/modules/displaymanager/main.py:993
+#: src/modules/bootloader/main.py:783
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"The bootloader could not be installed. The installation command "
+"<pre>{!s}</pre> returned error code {!s}."
 msgstr ""
-"Displaymanagers listesi hem globalstorage hem de displaymanager.conf'ta boş "
-"veya tanımsız."
+"Önyükleyici yüklenemedi. Kurulum komutu <pre>{!s}</pre>, {!s} hata kodunu "
+"döndürdü."
 
-#: src/modules/displaymanager/main.py:1075
-msgid "Display manager configuration was incomplete"
-msgstr "Ekran yöneticisi yapılandırma işi tamamlanamadı"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Donanım saati ayarlanıyor."
+
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Mkinitfs ile initramfs oluşturuluyor."
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Hedefte mkinitfs çalıştırılamadı"
+
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "Çıkış kodu {} idi"
+
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Dracut ile initramfs oluşturuluyor."
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Hedef üzerinde dracut çalıştırılamadı"
 
 #: src/modules/initramfscfg/main.py:32
 msgid "Configuring initramfs."
 msgstr "Initramfs yapılandırılıyor."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Donanım saati ayarlanıyor."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "OpenRC dmcrypt hizmeti yapılandırılıyor."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Veri yükleniyor."
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr "Fstab dosyasına yazılıyor."
+
+#: src/modules/fstab/main.py:429
+msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
+msgstr ""
+"<pre>{!s}</pre>'nin kullanması için <pre>{!s}</pre> 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 a42d98710fe6068e6979d62414fa378a28429724..255c33a488c2f5b82f20e7ddac95172584d1b880 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 <yurchor@ukr.net>, 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/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/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Налаштовування GRUB."
 
-#: 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:42
+msgid "Mounting partitions."
+msgstr "Монтування розділів."
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command <pre>{!s}</pre> "
-"returned error code {!s}."
-msgstr ""
-"Засобу керування пакунками не вдалося приготувати оновлення. Програмою "
-"<pre>{!s}</pre> повернуто код помилки {!s}."
+#: 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:738
-msgid ""
-"The package manager could not update the system. The command <pre>{!s}</pre>"
-" returned error code {!s}."
-msgstr ""
-"Засобу керування пакунками не вдалося оновити систему. Програмою "
-"<pre>{!s}</pre> повернуто код помилки {!s}."
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr "Не вдалося імпортувати zpool"
 
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command <pre>{!s}</pre> returned error code {!s}."
-msgstr ""
-"Засобу керування пакунками не вдалося внести зміну до встановленої системи. "
-"Програмою <pre>{!s}</pre> повернуто код помилки {!s}."
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr "Не вдалося розблокувати zpool"
 
-#: 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 "Не вдалося встановити точку монтування 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 "Помилка налаштовування"
 
-#: 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 <pre>{!s}</pre> to use."
+#: 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 <pre>{!s}</pre> to use."
+msgstr "Не визначено розділів для використання <pre>{!s}</pre>."
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr "Помилка монтування zfs"
+
+#: 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 ""
+"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
 msgstr ""
-"Не вказано кореневої точки монтування для використання у <pre>{!s}</pre>."
+"Внаслідок виклику <code>systemctl {arg!s}</code> у chroot було повернуто "
+"повідомлення з кодом помилки {num! s}."
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Налаштовуємо mkinitcpio."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service <code>{name!s}</code>."
+msgstr "Не вдалося ввімкнути службу systemd <code>{name!s}</code>."
 
-#: 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
-msgid "No partitions are defined for <pre>{!s}</pre> to use."
-msgstr "Не визначено розділів для використання <pre>{!s}</pre>."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target <code>{name!s}</code>."
+msgstr "Не вдалося ввімкнути завдання systemd <code>{name!s}</code>."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Створення initramfs за допомогою mkinitfs."
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer <code>{name!s}</code>."
+msgstr "Не вдалося ввімкнути таймер systemd <code>{name!s}</code>."
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Не вдалося виконати mkinitfs над призначенням"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target <code>{name!s}</code>."
+msgstr "Не вдалося вимкнути завдання systemd <code>{name!s}</code>."
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Код виходу — {}"
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit <code>{name!s}</code>."
+msgstr "Не вдалося замаскувати вузол systemd <code>{name!s}</code>."
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Налаштовуємо службу dmcrypt OpenRC."
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands <code>{command!s}</code> and "
+"<code>{suffix!s}</code> for unit {name!s}."
+msgstr ""
+"Невідомі команди systemd <code>{command!s}</code> та <code>{suffix!s}</code>"
+" для пристрою {name!s}."
 
 #: src/modules/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -194,122 +179,76 @@ 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 ""
-"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
-msgstr ""
-"Внаслідок виклику <code>systemctl {arg!s}</code> у chroot було повернуто "
-"повідомлення з кодом помилки {num! s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service <code>{name!s}</code>."
-msgstr "Не вдалося ввімкнути службу systemd <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "Не вдалося записати файл налаштувань KDM"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target <code>{name!s}</code>."
-msgstr "Не вдалося ввімкнути завдання systemd <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "Файла налаштувань KDM {!s} не існує"
 
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer <code>{name!s}</code>."
-msgstr "Не вдалося ввімкнути таймер systemd <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "Не вдалося виконати запис до файла налаштувань LXDM"
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target <code>{name!s}</code>."
-msgstr "Не вдалося вимкнути завдання systemd <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "Файла налаштувань LXDM {!s} не існує"
 
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit <code>{name!s}</code>."
-msgstr "Не вдалося замаскувати вузол systemd <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "Не вдалося виконати запис до файла налаштувань LightDM"
 
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands <code>{command!s}</code> and "
-"<code>{suffix!s}</code> for unit {name!s}."
-msgstr ""
-"Невідомі команди systemd <code>{command!s}</code> та <code>{suffix!s}</code>"
-" для пристрою {name!s}."
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "Файла налаштувань LightDM {!s} не існує"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Фіктивне завдання python."
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "Не вдалося налаштувати LightDM"
 
-#: 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/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr "Засіб входу до системи LightDM не встановлено."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Встановити завантажувач."
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "Не вдалося виконати запис до файла налаштувань SLIM"
 
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr ""
-"Не вдалося встановити grub — на загальному сховищі даних не визначено "
-"розділів"
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "Файла налаштувань SLIM {!s} не існує"
 
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr "Помилка встановлення завантажувача"
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr "Не вибрано засобу керування дисплеєм для модуля displaymanager."
 
-#: src/modules/bootloader/main.py:783
+#: src/modules/displaymanager/main.py:993
 msgid ""
-"The bootloader could not be installed. The installation command "
-"<pre>{!s}</pre> returned error code {!s}."
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
-"Не вдалося встановити завантажувач. Програмою для встановлення "
-"<pre>{!s}</pre> повернуто код помилки {!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"
+"Список засобів керування дисплеєм є порожнім або невизначеним у "
+"bothglobalstorage та displaymanager.conf."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Налаштувати тему Plymouth"
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr "Налаштування засобу керування дисплеєм є неповними"
 
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr "Записуємо fstab."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Налаштовуємо mkinitcpio."
 
-#: src/modules/fstab/main.py:429
-msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
+#: 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 <pre>{!s}</pre> to use."
 msgstr ""
-"Не надано налаштувань <pre>{!s}</pre> для використання у <pre>{!s}</pre>."
+"Не вказано кореневої точки монтування для використання у <pre>{!s}</pre>."
+
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Встановлюємо дані."
 
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
@@ -362,82 +301,143 @@ msgstr ""
 "Шляхом до служби {name!s} вказано <code>{path!s}</code>. Такого шляху не "
 "існує."
 
-#: 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/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Налаштувати тему Plymouth"
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "Не вдалося записати файл налаштувань KDM"
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
+msgid "Install packages."
+msgstr "Встановити пакети."
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "Файла налаштувань KDM {!s} не існує"
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Обробляємо пакунки (%(count)d з %(total)d)"
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "Не вдалося виконати запис до файла налаштувань LXDM"
+#: 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/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "Файла налаштувань LXDM {!s} не існує"
+#: 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/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "Не вдалося виконати запис до файла налаштувань LightDM"
+#: 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/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "Файла налаштувань LightDM {!s} не існує"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command <pre>{!s}</pre> "
+"returned error code {!s}."
+msgstr ""
+"Засобу керування пакунками не вдалося приготувати оновлення. Програмою "
+"<pre>{!s}</pre> повернуто код помилки {!s}."
 
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "Не вдалося налаштувати LightDM"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command <pre>{!s}</pre>"
+" returned error code {!s}."
+msgstr ""
+"Засобу керування пакунками не вдалося оновити систему. Програмою "
+"<pre>{!s}</pre> повернуто код помилки {!s}."
 
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr "Засіб входу до системи LightDM не встановлено."
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command <pre>{!s}</pre> returned error code {!s}."
+msgstr ""
+"Засобу керування пакунками не вдалося внести зміну до встановленої системи. "
+"Програмою <pre>{!s}</pre> повернуто код помилки {!s}."
 
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "Не вдалося виконати запис до файла налаштувань SLIM"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Встановити завантажувач."
 
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "Файла налаштувань SLIM {!s} не існує"
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+"Не вдалося встановити grub — на загальному сховищі даних не визначено "
+"розділів"
 
-#: src/modules/displaymanager/main.py:992
-msgid "No display managers selected for the displaymanager module."
-msgstr "Не вибрано засобу керування дисплеєм для модуля displaymanager."
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr "Помилка встановлення завантажувача"
 
-#: src/modules/displaymanager/main.py:993
+#: src/modules/bootloader/main.py:783
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"The bootloader could not be installed. The installation command "
+"<pre>{!s}</pre> returned error code {!s}."
 msgstr ""
-"Список засобів керування дисплеєм є порожнім або невизначеним у "
-"bothglobalstorage та displaymanager.conf."
+"Не вдалося встановити завантажувач. Програмою для встановлення "
+"<pre>{!s}</pre> повернуто код помилки {!s}."
 
-#: src/modules/displaymanager/main.py:1075
-msgid "Display manager configuration was incomplete"
-msgstr "Налаштування засобу керування дисплеєм є неповними"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+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/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Встановлюємо значення для апаратного годинника."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Налаштовуємо службу dmcrypt OpenRC."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Встановлюємо дані."
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr "Записуємо fstab."
+
+#: src/modules/fstab/main.py:429
+msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
+msgstr ""
+"Не надано налаштувань <pre>{!s}</pre> для використання у <pre>{!s}</pre>."
+
+#: 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 c9c16f8ace6c8b542de008ca68115a74f041ef0e..26e3db7fb6bb7255436b8824bdecc9add0294f5d 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/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr ""
 
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr ""
 
-#: 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 <pre>{!s}</pre> "
-"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 <pre>{!s}</pre>"
-" returned error code {!s}."
+#: 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/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command <pre>{!s}</pre> returned error code {!s}."
+#: 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 <pre>{!s}</pre> to use."
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
 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/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
-msgid "Configuration Error"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 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 <pre>{!s}</pre> to use."
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
 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
-msgid "No partitions are defined for <pre>{!s}</pre> to use."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit <code>{name!s}</code>."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands <code>{command!s}</code> and "
+"<code>{suffix!s}</code> for unit {name!s}."
 msgstr ""
 
 #: src/modules/unpackfs/main.py:34
@@ -174,112 +166,72 @@ 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 ""
-"<code>systemctl {arg!s}</code> 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 <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands <code>{command!s}</code> and "
-"<code>{suffix!s}</code> for unit {name!s}."
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/bootloader/main.py:783
+#: src/modules/displaymanager/main.py:993
 msgid ""
-"The bootloader could not be installed. The installation command "
-"<pre>{!s}</pre> 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"
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
+#: 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 <pre>{!s}</pre> to use."
 msgstr ""
 
-#: src/modules/fstab/main.py:429
-msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
 
 #: src/modules/services-openrc/main.py:29
@@ -325,80 +277,128 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: 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."
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
+#: 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/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command <pre>{!s}</pre> "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command <pre>{!s}</pre>"
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command <pre>{!s}</pre> returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"<pre>{!s}</pre> returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:992
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:993
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:1075
-msgid "Display manager configuration was incomplete"
+#: 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/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> 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/uz/LC_MESSAGES/python.po b/lang/python/uz/LC_MESSAGES/python.po
new file mode 100644
index 0000000000000000000000000000000000000000..8ab5489f91b74392a3a4b8c679fb2e71eda248b6
--- /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 <EMAIL@ADDRESS>, 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 <pre>{!s}</pre> 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 ""
+"<code>systemctl {arg!s}</code> 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 <code>{name!s}</code>."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target <code>{name!s}</code>."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer <code>{name!s}</code>."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target <code>{name!s}</code>."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit <code>{name!s}</code>."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands <code>{command!s}</code> and "
+"<code>{suffix!s}</code> 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 <pre>{!s}</pre> 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 <code>{arg!s}</code> for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"<code>rc-update {arg!s}</code> 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 <code>{path!s}</code>, 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 <code>{path!s}</code>, 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 <pre>{!s}</pre> "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command <pre>{!s}</pre>"
+" 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 <pre>{!s}</pre> 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 "
+"<pre>{!s}</pre> 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 <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> 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 78dcbfd229c907cda576f3bf3f1117123e5d8785..7f32565c908ded51d129d4e5180c1bca5b34ea67 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 <th1nhhdk@tutanota.com>, 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/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/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Cấu hình GRUB"
 
-#: 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/mount/main.py:42
+msgid "Mounting partitions."
+msgstr "Đang gắn kết các phân vù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 <pre>{!s}</pre> "
-"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 <pre>{!s}</pre>"
-" 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 <pre>{!s}</pre> 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 <pre>{!s}</pre> to use."
-msgstr "Không có điểm kết nối gốc cho <pre>{!s}</pre> để 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 <pre>{!s}</pre> to use."
 msgstr "Không có phân vùng nào được định nghĩa cho <pre>{!s}</pre> để 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 ""
+"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
+msgstr ""
+"<code>systemctl {arg!s}</code> 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 <code>{name!s}</code>."
+msgstr "Không thể bật dịch vụ systemd <code>{name!s}</code>."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target <code>{name!s}</code>."
+msgstr "Không thể bật nhóm dịch vụ systemd <code>{name!s}</code>."
+
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer <code>{name!s}</code>."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target <code>{name!s}</code>."
+msgstr "Không thể tắt nhóm dịch vụ systemd <code>{name!s}</code>."
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit <code>{name!s}</code>."
+msgstr "Không thể đánh dấu đơn vị systemd <code>{name!s}</code>."
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands <code>{command!s}</code> and "
+"<code>{suffix!s}</code> for unit {name!s}."
+msgstr ""
+"Không nhận ra lệnh systemd <code>{command!s}</code> và "
+"<code>{suffix!s}</code> cho đơn vị {name!s}."
 
 #: src/modules/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -177,118 +174,76 @@ 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 ""
-"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
-msgstr ""
-"<code>systemctl {arg!s}</code> trong môi trường chroot trả về lỗi {num!s}."
+#: 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"
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service <code>{name!s}</code>."
-msgstr "Không thể bật dịch vụ systemd <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "Tập tin cấu hình KDM {!s} không tồn tại"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target <code>{name!s}</code>."
-msgstr "Không thể bật nhóm dịch vụ systemd <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "Không thể ghi vào tập tin cấu hình LXDM"
 
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer <code>{name!s}</code>."
-msgstr ""
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "Tập tin cấu hình LXDM {!s} không tồn tại"
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target <code>{name!s}</code>."
-msgstr "Không thể tắt nhóm dịch vụ systemd <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "Không thể ghi vào tập tin cấu hình LightDM"
 
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit <code>{name!s}</code>."
-msgstr "Không thể đánh dấu đơn vị systemd <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "Tập tin cấu hình LightDM {!s} không tồn tại"
 
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands <code>{command!s}</code> and "
-"<code>{suffix!s}</code> for unit {name!s}."
-msgstr ""
-"Không nhận ra lệnh systemd <code>{command!s}</code> và "
-"<code>{suffix!s}</code> cho đơn vị {name!s}."
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "Không thể cấu hình LXDM"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Ví dụ công việc python."
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr "Màn hình chào mừng LightDM không được cà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 "Ví dụ python bước {}"
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "Không thể ghi vào tập tin cấu hình SLIM"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Đang cài đặt bộ khởi động."
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "Tập tin cấu hình SLIM {!s} không tồn tại"
 
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
+"Không có trình quản lý hiển thị nào được chọn cho mô-đun quản lý hiển thị"
 
-#: src/modules/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
+#: src/modules/displaymanager/main.py:993
 msgid ""
-"The bootloader could not be installed. The installation command "
-"<pre>{!s}</pre> returned error code {!s}."
-msgstr ""
-"Trình khởi động(bootloader) không thể được cài đặt. Lệnh cài đặt "
-"<pre>{!s}</pre>đã 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"
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
+"Danh sách quản lý hiện thị trống hoặc không được định nghĩa cả trong "
+"globalstorage và displaymanager.conf."
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr ""
+#: src/modules/displaymanager/main.py:1075
+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/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Cấu hình giao diện Plymouth"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Đang cấu hình mkinitcpio."
 
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr "Đang viết vào fstab."
+#: 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 <pre>{!s}</pre> to use."
+msgstr "Không có điểm kết nối gốc cho <pre>{!s}</pre> để dùng."
 
-#: src/modules/fstab/main.py:429
-msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
-msgstr ""
+#: 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"
@@ -341,83 +296,128 @@ msgstr ""
 "Đường dẫn cho dịch vụ {name!s} là <code>{path!s}</code>, 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"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Cấu hình giao diện Plymouth"
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "Tập tin cấu hình KDM {!s} không tồn tại"
+#: src/modules/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/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "Không thể ghi vào tập tin cấu hình LXDM"
+#: 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/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "Tập tin cấu hình LXDM {!s} không tồn tại"
+#: src/modules/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/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "Không thể ghi vào tập tin cấu hình LightDM"
+#: 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/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "Tập tin cấu hình LightDM {!s} không tồn tại"
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
+msgid "Package Manager error"
+msgstr ""
 
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "Không thể cấu hình LXDM"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command <pre>{!s}</pre> "
+"returned error code {!s}."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr "Màn hình chào mừng LightDM không được cài đặt."
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command <pre>{!s}</pre>"
+" returned error code {!s}."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "Không thể ghi vào tập tin cấu hình SLIM"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command <pre>{!s}</pre> returned error code {!s}."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "Tập tin cấu hình SLIM {!s} không tồn tại"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Đang cài đặt bộ khởi động."
 
-#: src/modules/displaymanager/main.py:992
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
 msgstr ""
-"Không có trình quản lý hiển thị nào được chọn cho mô-đun quản lý hiển thị"
 
-#: src/modules/displaymanager/main.py:993
+#: 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 displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"The bootloader could not be installed. The installation command "
+"<pre>{!s}</pre> returned error code {!s}."
 msgstr ""
-"Danh sách quản lý hiện thị trống hoặc không được định nghĩa cả trong "
-"globalstorage và displaymanager.conf."
+"Trình khởi động(bootloader) không thể được cài đặt. Lệnh cài đặt "
+"<pre>{!s}</pre>đã trả mã lỗi {!s}."
 
-#: src/modules/displaymanager/main.py:1075
-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/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Đang thiết lập đồng hồ máy tính."
+
+#: 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/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Đang thiết lập đồng hồ máy tính."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Đang cấu hình dịch vụ OpenRC dmcrypt."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Đang cài đặt dữ liệu."
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr "Đang viết vào fstab."
+
+#: src/modules/fstab/main.py:429
+msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> 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 5294ee68626bd9146bc84425bcdd87d3c58f0054..51492fb249da1378b01a92890099fe372b6c6b4e 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/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr ""
 
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr ""
 
-#: 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 <pre>{!s}</pre> "
-"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 <pre>{!s}</pre>"
-" returned error code {!s}."
+#: 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/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command <pre>{!s}</pre> returned error code {!s}."
+#: 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 <pre>{!s}</pre> to use."
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
 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/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
-msgid "Configuration Error"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 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 <pre>{!s}</pre> to use."
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
 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
-msgid "No partitions are defined for <pre>{!s}</pre> to use."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit <code>{name!s}</code>."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands <code>{command!s}</code> and "
+"<code>{suffix!s}</code> for unit {name!s}."
 msgstr ""
 
 #: src/modules/unpackfs/main.py:34
@@ -172,112 +166,72 @@ 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 ""
-"<code>systemctl {arg!s}</code> 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 <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands <code>{command!s}</code> and "
-"<code>{suffix!s}</code> for unit {name!s}."
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/bootloader/main.py:783
+#: src/modules/displaymanager/main.py:993
 msgid ""
-"The bootloader could not be installed. The installation command "
-"<pre>{!s}</pre> 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"
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
+#: 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 <pre>{!s}</pre> to use."
 msgstr ""
 
-#: src/modules/fstab/main.py:429
-msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
 
 #: src/modules/services-openrc/main.py:29
@@ -323,80 +277,126 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: 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."
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
+#: 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/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command <pre>{!s}</pre> "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command <pre>{!s}</pre>"
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command <pre>{!s}</pre> returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"<pre>{!s}</pre> returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:992
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:993
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:1075
-msgid "Display manager configuration was incomplete"
+#: 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/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> 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 cbed0f87bccbb346c2435dce0a4a015659bcfad9..49e6323b2ea2c906f508dea7a9340266861a7ce3 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: 玉堂白鹤 <yjwork@qq.com>, 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/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/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "配置 GRUB."
 
-#: 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:42
+msgid "Mounting partitions."
+msgstr "挂载分区。"
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command <pre>{!s}</pre> "
-"returned error code {!s}."
-msgstr "软件包管理器无法准备更新。命令<pre>{!s}</pre>返回错误代码{!s}。"
+#: 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:738
-msgid ""
-"The package manager could not update the system. The command <pre>{!s}</pre>"
-" returned error code {!s}."
-msgstr "软件包管理器无法更新系统。命令<pre>{!s}</pre>返回错误代码{!s}。"
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr "导入 zpool 失败"
 
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command <pre>{!s}</pre> returned error code {!s}."
-msgstr "软件包管理器无法对已安装的系统进行更改。命令<pre>{!s}</pre>返回错误代码{!s}。"
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr "解锁 zpool 失败"
 
-#: 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 "设置 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 "配置错误"
 
-#: 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 <pre>{!s}</pre> to use."
-msgstr " 未设置 <pre>{!s}</pre> 要使用的根挂载点。"
-
-#: 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 <pre>{!s}</pre> to use."
 msgstr "没有分配分区给 <pre>{!s}</pre>。"
 
-#: 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 ""
+"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
+msgstr "chroot 中的 <code>systemctl {arg!s}</code> 命令返回错误 {num!s}."
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service <code>{name!s}</code>."
+msgstr "无法启用 systemd 服务 <code>{name!s}</code>."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target <code>{name!s}</code>."
+msgstr "无法启用 systemd 目标 <code>{name!s}</code>."
+
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer <code>{name!s}</code>."
+msgstr "无法启用 systemd 计时器 <code>{name!s}</code>。"
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target <code>{name!s}</code>."
+msgstr "无法禁用 systemd 目标 <code>{name!s}</code>."
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit <code>{name!s}</code>."
+msgstr "无法屏蔽 systemd 单元 <code>{name!s}</code>."
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands <code>{command!s}</code> and "
+"<code>{suffix!s}</code> for unit {name!s}."
+msgstr ""
+"未知的 systemd 命令 <code>{command!s}</code> 和 {name!s}  单元前缀 "
+"<code>{suffix!s}</code>."
 
 #: src/modules/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -181,115 +177,73 @@ 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 ""
-"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
-msgstr "chroot 中的 <code>systemctl {arg!s}</code> 命令返回错误 {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service <code>{name!s}</code>."
-msgstr "无法启用 systemd 服务 <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "无法写入 KDM 配置文件"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target <code>{name!s}</code>."
-msgstr "无法启用 systemd 目标 <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "KDM 配置文件 {!s} 不存在"
 
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer <code>{name!s}</code>."
-msgstr "无法启用 systemd 计时器 <code>{name!s}</code>。"
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "无法写入 LXDM 配置文件"
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target <code>{name!s}</code>."
-msgstr "无法禁用 systemd 目标 <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "LXDM 配置文件 {!s} 不存在"
 
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit <code>{name!s}</code>."
-msgstr "无法屏蔽 systemd 单元 <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "无法写入 LightDM 配置文件"
 
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands <code>{command!s}</code> and "
-"<code>{suffix!s}</code> for unit {name!s}."
-msgstr ""
-"未知的 systemd 命令 <code>{command!s}</code> 和 {name!s}  单元前缀 "
-"<code>{suffix!s}</code>."
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "LightDM 配置文件 {!s} 不存在"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "占位 Python 任务。"
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "无法配置 LightDM"
 
-#: 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/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr "未安装 LightDM 欢迎程序。"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "安装启动加载器。"
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "无法写入 SLIM 配置文件"
 
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr "无法安装 grub,全局存储中未定义分区"
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "SLIM 配置文件 {!s} 不存在"
 
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr "启动加载器安装出错"
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr "显示管理器模块中未选择显示管理器。"
 
-#: src/modules/bootloader/main.py:783
+#: src/modules/displaymanager/main.py:993
 msgid ""
-"The bootloader could not be installed. The installation command "
-"<pre>{!s}</pre> returned error code {!s}."
-msgstr "无法安装启动加载器。安装命令<pre>{!s}</pre>返回错误代码 {!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 挂载点失败"
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
+msgstr "globalstorage 和 displaymanager.conf 配置文件中都没有配置显示管理器。"
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr "zfs 挂载出错"
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr "显示管理器配置不完全"
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "配置 Plymouth 主题"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "配置 mkinitcpio."
 
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr "正在写入 fstab。"
+#: 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 <pre>{!s}</pre> to use."
+msgstr " 未设置 <pre>{!s}</pre> 要使用的根挂载点。"
 
-#: src/modules/fstab/main.py:429
-msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
-msgstr "无 <pre>{!s}</pre> 配置可供 <pre>{!s}</pre> 使用。"
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "安装数据."
 
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
@@ -334,80 +288,126 @@ msgid ""
 "exist."
 msgstr "服务 {name!s} 的路径 <code>{path!s}</code> 不存在。"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "用 dracut 创建 initramfs."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "配置 Plymouth 主题"
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "无法在目标中运行 dracut "
+#: 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/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "无法写入 KDM 配置文件"
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "安装%(num)d软件包。"
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "KDM 配置文件 {!s} 不存在"
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "移除%(num)d软件包。"
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "无法写入 LXDM 配置文件"
+#: 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/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "LXDM 配置文件 {!s} 不存在"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command <pre>{!s}</pre> "
+"returned error code {!s}."
+msgstr "软件包管理器无法准备更新。命令<pre>{!s}</pre>返回错误代码{!s}。"
 
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "无法写入 LightDM 配置文件"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command <pre>{!s}</pre>"
+" returned error code {!s}."
+msgstr "软件包管理器无法更新系统。命令<pre>{!s}</pre>返回错误代码{!s}。"
 
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "LightDM 配置文件 {!s} 不存在"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command <pre>{!s}</pre> returned error code {!s}."
+msgstr "软件包管理器无法对已安装的系统进行更改。命令<pre>{!s}</pre>返回错误代码{!s}。"
 
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "无法配置 LightDM"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "安装启动加载器。"
 
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr "未安装 LightDM 欢迎程序。"
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr "无法安装 grub,全局存储中未定义分区"
 
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "无法写入 SLIM 配置文件"
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr "启动加载器安装出错"
 
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "SLIM 配置文件 {!s} 不存在"
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"<pre>{!s}</pre> returned error code {!s}."
+msgstr "无法安装启动加载器。安装命令<pre>{!s}</pre>返回错误代码 {!s}。"
 
-#: src/modules/displaymanager/main.py:992
-msgid "No display managers selected for the displaymanager module."
-msgstr "显示管理器模块中未选择显示管理器。"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "设置硬件时钟。"
 
-#: src/modules/displaymanager/main.py:993
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
-msgstr "globalstorage 和 displaymanager.conf 配置文件中都没有配置显示管理器。"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "正在用 mkinitfs 创建initramfs。"
 
-#: src/modules/displaymanager/main.py:1075
-msgid "Display manager configuration was incomplete"
-msgstr "显示管理器配置不完全"
+#: 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/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "设置硬件时钟。"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "配置 OpenRC dmcrypt 服务。"
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "安装数据."
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr "正在写入 fstab。"
+
+#: src/modules/fstab/main.py:429
+msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
+msgstr "无 <pre>{!s}</pre> 配置可供 <pre>{!s}</pre> 使用。"
+
+#: 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 2a37dd2967b61c4f8e171fba37c7d080b309b1c1..767ebd4c0141cd0f722e485f7004e6983cf69cc1 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/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr ""
 
-#: src/modules/packages/main.py:71
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr ""
 
-#: 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 <pre>{!s}</pre> "
-"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 <pre>{!s}</pre>"
-" returned error code {!s}."
+#: 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/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command <pre>{!s}</pre> returned error code {!s}."
+#: 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 <pre>{!s}</pre> to use."
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
 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/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/rawfs/main.py:164
-msgid "Configuration Error"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 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 <pre>{!s}</pre> to use."
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
 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
-msgid "No partitions are defined for <pre>{!s}</pre> to use."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target <code>{name!s}</code>."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit <code>{name!s}</code>."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands <code>{command!s}</code> and "
+"<code>{suffix!s}</code> for unit {name!s}."
 msgstr ""
 
 #: src/modules/unpackfs/main.py:34
@@ -172,112 +166,72 @@ 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 ""
-"<code>systemctl {arg!s}</code> 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 <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit <code>{name!s}</code>."
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands <code>{command!s}</code> and "
-"<code>{suffix!s}</code> for unit {name!s}."
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/bootloader/main.py:783
+#: src/modules/displaymanager/main.py:993
 msgid ""
-"The bootloader could not be installed. The installation command "
-"<pre>{!s}</pre> 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"
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
+#: 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 <pre>{!s}</pre> to use."
 msgstr ""
 
-#: src/modules/fstab/main.py:429
-msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
 
 #: src/modules/services-openrc/main.py:29
@@ -323,80 +277,126 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: 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."
+#: src/modules/packages/main.py:63
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
+#: 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/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command <pre>{!s}</pre> "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command <pre>{!s}</pre>"
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command <pre>{!s}</pre> returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"<pre>{!s}</pre> returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:992
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:993
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:1075
-msgid "Display manager configuration was incomplete"
+#: 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/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:429
+msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> 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 5f536f8a130a702ff508d3d8278e33e848c979bf..23bb0864979c80b4e5dd029c2c8a6b5eec561fb0 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: 黃柏諺 <s8321414@gmail.com>, 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/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/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "設定 GRUB。"
 
-#: 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:42
+msgid "Mounting partitions."
+msgstr "正在掛載分割區。"
 
-#: src/modules/packages/main.py:726
-msgid ""
-"The package manager could not prepare updates. The command <pre>{!s}</pre> "
-"returned error code {!s}."
-msgstr "軟體包管理程式無法準備更新。指令 <pre>{!s}</pre> 回傳了錯誤碼 {!s}。"
+#: 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:738
-msgid ""
-"The package manager could not update the system. The command <pre>{!s}</pre>"
-" returned error code {!s}."
-msgstr "軟體包管理程式無法更新系統。指令 <pre>{!s}</pre> 回傳了錯誤碼 {!s}。"
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr "匯入 zpool 失敗"
 
-#: src/modules/packages/main.py:766
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command <pre>{!s}</pre> returned error code {!s}."
-msgstr "軟體包管理程式無法對已安裝的系統做出變更。指令 <pre>{!s}</pre> 回傳了錯誤碼 {!s}。"
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr "解鎖 zpool 失敗"
 
-#: 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 "設定 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 "設定錯誤"
 
-#: 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 <pre>{!s}</pre> to use."
-msgstr "沒有給定的根掛載點 <pre>{!s}</pre> 以供使用。"
-
-#: 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 <pre>{!s}</pre> to use."
 msgstr "沒有分割區被定義為 <pre>{!s}</pre> 以供使用。"
 
-#: 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 ""
+"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
+msgstr "在 chroot 中呼叫的 <code>systemctl {arg!s}</code> 回傳了錯誤代碼 {num!s}。"
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service <code>{name!s}</code>."
+msgstr "無法啟用 systemd 服務 <code>{name!s}</code>。"
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target <code>{name!s}</code>."
+msgstr "無法啟用 systemd 目標 <code>{name!s}</code>。"
+
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer <code>{name!s}</code>."
+msgstr "無法啟用 systemd timer <code>{name!s}</code>。"
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target <code>{name!s}</code>."
+msgstr "無法停用 systemd 目標 <code>{name!s}</code>。"
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit <code>{name!s}</code>."
+msgstr "無法 mask systemd 單位 <code>{name!s}</code>。"
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands <code>{command!s}</code> and "
+"<code>{suffix!s}</code> for unit {name!s}."
+msgstr ""
+"未知的 systemd 指令 <code>{command!s}</code> 與 <code>{suffix!s}</code> 給單位 "
+"{name!s}。"
 
 #: src/modules/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -177,115 +173,73 @@ 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 ""
-"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
-msgstr "在 chroot 中呼叫的 <code>systemctl {arg!s}</code> 回傳了錯誤代碼 {num!s}。"
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot enable systemd service <code>{name!s}</code>."
-msgstr "無法啟用 systemd 服務 <code>{name!s}</code>。"
+#: src/modules/displaymanager/main.py:524
+msgid "Cannot write KDM configuration file"
+msgstr "無法寫入 KDM 設定檔"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target <code>{name!s}</code>."
-msgstr "無法啟用 systemd 目標 <code>{name!s}</code>。"
+#: src/modules/displaymanager/main.py:525
+msgid "KDM config file {!s} does not exist"
+msgstr "KDM 設定檔 {!s} 不存在"
 
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd timer <code>{name!s}</code>."
-msgstr "無法啟用 systemd timer <code>{name!s}</code>。"
+#: src/modules/displaymanager/main.py:586
+msgid "Cannot write LXDM configuration file"
+msgstr "無法寫入 LXDM 設定檔"
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot disable systemd target <code>{name!s}</code>."
-msgstr "無法停用 systemd 目標 <code>{name!s}</code>。"
+#: src/modules/displaymanager/main.py:587
+msgid "LXDM config file {!s} does not exist"
+msgstr "LXDM 設定檔 {!s} 不存在"
 
-#: src/modules/services-systemd/main.py:73
-msgid "Cannot mask systemd unit <code>{name!s}</code>."
-msgstr "無法 mask systemd 單位 <code>{name!s}</code>。"
+#: src/modules/displaymanager/main.py:670
+msgid "Cannot write LightDM configuration file"
+msgstr "無法寫入 LightDM 設定檔"
 
-#: src/modules/services-systemd/main.py:75
-msgid ""
-"Unknown systemd commands <code>{command!s}</code> and "
-"<code>{suffix!s}</code> for unit {name!s}."
-msgstr ""
-"未知的 systemd 指令 <code>{command!s}</code> 與 <code>{suffix!s}</code> 給單位 "
-"{name!s}。"
+#: src/modules/displaymanager/main.py:671
+msgid "LightDM config file {!s} does not exist"
+msgstr "LightDM 設定檔 {!s} 不存在"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "假的 python 工作。"
+#: src/modules/displaymanager/main.py:745
+msgid "Cannot configure LightDM"
+msgstr "無法設定 LightDM"
 
-#: 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/displaymanager/main.py:746
+msgid "No LightDM greeter installed."
+msgstr "未安裝 LightDM greeter。"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "安裝開機載入程式。"
+#: src/modules/displaymanager/main.py:777
+msgid "Cannot write SLIM configuration file"
+msgstr "無法寫入 SLIM 設定檔"
 
-#: src/modules/bootloader/main.py:614
-msgid "Failed to install grub, no partitions defined in global storage"
-msgstr "安裝 grub 失敗,全域儲存空間中未定義分割區"
+#: src/modules/displaymanager/main.py:778
+msgid "SLIM config file {!s} does not exist"
+msgstr "SLIM 設定檔 {!s} 不存在"
 
-#: src/modules/bootloader/main.py:782
-msgid "Bootloader installation error"
-msgstr "開機載入程式安裝錯誤"
+#: src/modules/displaymanager/main.py:992
+msgid "No display managers selected for the displaymanager module."
+msgstr "未在顯示管理器模組中選取顯示管理器。"
 
-#: src/modules/bootloader/main.py:783
+#: src/modules/displaymanager/main.py:993
 msgid ""
-"The bootloader could not be installed. The installation command "
-"<pre>{!s}</pre> returned error code {!s}."
-msgstr "無法安裝開機載入程式。安裝指令 <pre>{!s}</pre> 回傳了錯誤碼 {!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 掛載點失敗"
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
+msgstr "顯示管理器清單為空或在 globalstorage 與 displaymanager.conf 中皆未定義。"
 
-#: src/modules/mount/main.py:253
-msgid "zfs mounting error"
-msgstr "zfs 掛載錯誤"
+#: src/modules/displaymanager/main.py:1075
+msgid "Display manager configuration was incomplete"
+msgstr "顯示管理器設定不完整"
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "設定 Plymouth 主題"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "正在設定 mkinitcpio。"
 
-#: src/modules/fstab/main.py:28
-msgid "Writing fstab."
-msgstr "正在寫入 fstab。"
+#: 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 <pre>{!s}</pre> to use."
+msgstr "沒有給定的根掛載點 <pre>{!s}</pre> 以供使用。"
 
-#: src/modules/fstab/main.py:429
-msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
-msgstr "無 <pre>{!s}</pre> 設定可供 <pre>{!s}</pre> 使用。"
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "正在安裝資料。"
 
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
@@ -330,80 +284,126 @@ msgid ""
 "exist."
 msgstr "服務 {name!s} 的路徑為 <code>{path!s}</code>,不存在。"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "正在使用 dracut 建立 initramfs。"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "設定 Plymouth 主題"
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "在目標上執行 dracut 失敗"
+#: 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/displaymanager/main.py:524
-msgid "Cannot write KDM configuration file"
-msgstr "無法寫入 KDM 設定檔"
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "正在安裝 %(num)d 軟體包。"
 
-#: src/modules/displaymanager/main.py:525
-msgid "KDM config file {!s} does not exist"
-msgstr "KDM 設定檔 {!s} 不存在"
+#: src/modules/packages/main.py:71
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "正在移除 %(num)d 軟體包。"
 
-#: src/modules/displaymanager/main.py:586
-msgid "Cannot write LXDM configuration file"
-msgstr "無法寫入 LXDM 設定檔"
+#: 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/displaymanager/main.py:587
-msgid "LXDM config file {!s} does not exist"
-msgstr "LXDM 設定檔 {!s} 不存在"
+#: src/modules/packages/main.py:726
+msgid ""
+"The package manager could not prepare updates. The command <pre>{!s}</pre> "
+"returned error code {!s}."
+msgstr "軟體包管理程式無法準備更新。指令 <pre>{!s}</pre> 回傳了錯誤碼 {!s}。"
 
-#: src/modules/displaymanager/main.py:670
-msgid "Cannot write LightDM configuration file"
-msgstr "無法寫入 LightDM 設定檔"
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command <pre>{!s}</pre>"
+" returned error code {!s}."
+msgstr "軟體包管理程式無法更新系統。指令 <pre>{!s}</pre> 回傳了錯誤碼 {!s}。"
 
-#: src/modules/displaymanager/main.py:671
-msgid "LightDM config file {!s} does not exist"
-msgstr "LightDM 設定檔 {!s} 不存在"
+#: src/modules/packages/main.py:766
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command <pre>{!s}</pre> returned error code {!s}."
+msgstr "軟體包管理程式無法對已安裝的系統做出變更。指令 <pre>{!s}</pre> 回傳了錯誤碼 {!s}。"
 
-#: src/modules/displaymanager/main.py:745
-msgid "Cannot configure LightDM"
-msgstr "無法設定 LightDM"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "安裝開機載入程式。"
 
-#: src/modules/displaymanager/main.py:746
-msgid "No LightDM greeter installed."
-msgstr "未安裝 LightDM greeter。"
+#: src/modules/bootloader/main.py:614
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr "安裝 grub 失敗,全域儲存空間中未定義分割區"
 
-#: src/modules/displaymanager/main.py:777
-msgid "Cannot write SLIM configuration file"
-msgstr "無法寫入 SLIM 設定檔"
+#: src/modules/bootloader/main.py:782
+msgid "Bootloader installation error"
+msgstr "開機載入程式安裝錯誤"
 
-#: src/modules/displaymanager/main.py:778
-msgid "SLIM config file {!s} does not exist"
-msgstr "SLIM 設定檔 {!s} 不存在"
+#: src/modules/bootloader/main.py:783
+msgid ""
+"The bootloader could not be installed. The installation command "
+"<pre>{!s}</pre> returned error code {!s}."
+msgstr "無法安裝開機載入程式。安裝指令 <pre>{!s}</pre> 回傳了錯誤碼 {!s}。"
 
-#: src/modules/displaymanager/main.py:992
-msgid "No display managers selected for the displaymanager module."
-msgstr "未在顯示管理器模組中選取顯示管理器。"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "正在設定硬體時鐘。"
 
-#: src/modules/displaymanager/main.py:993
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
-msgstr "顯示管理器清單為空或在 globalstorage 與 displaymanager.conf 中皆未定義。"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "正在使用 mkinitfs 建立 initramfs。"
 
-#: src/modules/displaymanager/main.py:1075
-msgid "Display manager configuration was incomplete"
-msgstr "顯示管理器設定不完整"
+#: 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/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "正在設定硬體時鐘。"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "正在設定 OpenRC dmcrypt 服務。"
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "正在安裝資料。"
+#: src/modules/fstab/main.py:28
+msgid "Writing fstab."
+msgstr "正在寫入 fstab。"
+
+#: src/modules/fstab/main.py:429
+msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
+msgstr "無 <pre>{!s}</pre> 設定可供 <pre>{!s}</pre> 使用。"
+
+#: 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 "正在儲存網路設定。"
diff --git a/src/calamares/CalamaresWindow.cpp b/src/calamares/CalamaresWindow.cpp
index 50abb776e75dbeb604e66e1abcc4ecbfea195c82..c79e17d580adc788093676ae00623d5100a93c7a 100644
--- a/src/calamares/CalamaresWindow.cpp
+++ b/src/calamares/CalamaresWindow.cpp
@@ -138,12 +138,14 @@ 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 ) ) );
         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 );
diff --git a/src/libcalamares/PythonJobApi.cpp b/src/libcalamares/PythonJobApi.cpp
index 3532d8f32530cd954e29f3b3b3af55b14668f29a..93297436d65f0569814cc5e61700a0f3718c1bed 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/libcalamares/locale/Global.cpp b/src/libcalamares/locale/Global.cpp
index a23a10478423ed0c16cba4c8bfe552479e122eb1..c9fb27fbce5dffd7e815f6cf0e3261827323524f 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 abcf43dcd43f8a4512bb2bacde5bdd7a405d8360..cf23ef7df7f59be1b0b9953ddf68ae4fd40c7d3c 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
 
diff --git a/src/libcalamares/locale/Translation.cpp b/src/libcalamares/locale/Translation.cpp
index 213d2b9a725441e53cb432310798f9ced48d4281..279949d3ff2207e91f801b0a34b8118281719511 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,
diff --git a/src/modules/fstab/main.py b/src/modules/fstab/main.py
index fc0649e2a200a1f72c76d41135b2c91da0ae6e1f..1fd1d695a432eec99ede18988d8939a28eb1efb0 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 <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use.")
                 .format("mountOptions", "fstab"))
diff --git a/src/modules/keyboard/Config.cpp b/src/modules/keyboard/Config.cpp
index 9afaef5f31888fa77d0e39e4ecfedfb0b542ed63..e7ffc65554a571ae3c38e7dc70c63f4934dd49ef 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() )
diff --git a/src/modules/locale/Config.cpp b/src/modules/locale/Config.cpp
index 5888fd07177a6d513c47c294de86ee2bd33bbaff..2357019a7c4eacb1fc7c178aa2f63f7d2f8d483c 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;
 }
@@ -305,8 +313,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
diff --git a/src/modules/locale/LocaleConfiguration.cpp b/src/modules/locale/LocaleConfiguration.cpp
index b7b895290e3f19b9dd0973ae853143d88a382fc6..17953f079aa3d1fe871a107a27405f382276184f 100644
--- a/src/modules/locale/LocaleConfiguration.cpp
+++ b/src/modules/locale/LocaleConfiguration.cpp
@@ -46,14 +46,23 @@ LocaleConfiguration::fromLanguageAndLocation( const QString& languageLocale,
                                               const QStringList& availableLocales,
                                               const QString& countryCode )
 {
+    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 .<encoding> or _<country>
     QStringList linesForLanguage = availableLocales.filter( QRegularExpression( language + "[._]" ) );
+    cDebug() << Logger::SubEntry << "Matching" << linesForLanguage;
 
     QString lang;
-    if ( linesForLanguage.length() == 0 || languageLocale.isEmpty() )
+    if ( linesForLanguage.isEmpty() || languageLocale.isEmpty() )
     {
         lang = "en_US.UTF-8";
     }
@@ -63,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.
@@ -73,17 +92,34 @@ 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.
     if ( lang.isEmpty() )
@@ -152,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() )
+    {
+        cDebug() << Logger::SubEntry << "Looking up formats for" << combinedLanguageAndCountry;
+        // We look up if it's a supported locale.
+        for ( const QString& line : availableLocales )
+        {
+            if ( line.startsWith( combinedLanguageAndCountry ) )
+            {
+                lang = line;
+                lc_formats = line;
+                break;
+            }
+        }
+    }
+    else
     {
-        if ( line.startsWith( combined ) )
+        if ( availableLocales.contains( lang ) )
+        {
+            cDebug() << Logger::SubEntry << "Exact formats match for language tag" << lang;
+            lc_formats = lang;
+        }
+        else if ( availableLocales.contains( combinedLanguageAndCountry ) )
         {
-            lang = line;
-            lc_formats = line;
-            break;
+            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 6fe9d5662a214588445ed09392f8dce2702f197b..23f9b5b3e10b9c1632aaedbcdc866ff7eefd74ad 100644
--- a/src/modules/locale/Tests.cpp
+++ b/src/modules/locale/Tests.cpp
@@ -40,6 +40,9 @@ private Q_SLOTS:
 
     // Check the Config loading
     void testConfigInitialization();
+    void testLanguageDetection_data();
+    void testLanguageDetection();
+    void testLanguageDetectionValencia();
 };
 
 QTEST_MAIN( LocaleTests )
@@ -267,6 +270,89 @@ 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.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_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_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_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()
+{
+    QFETCH( QString, locale );
+    QFETCH( QString, country );
+    QFETCH( QString, expected );
+
+    auto r = LocaleConfiguration::fromLanguageAndLocation( locale, availableLocales, country );
+    QCOMPARE( r.language(), expected );
+}
+
+void
+LocaleTests::testLanguageDetectionValencia()
+{
+    Logger::setupLogLevel( Logger::LOGDEBUG );
+
+    {
+        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_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" );
+    }
+}
+
 
 #include "utils/moc-warnings.h"