From e0cd90cab1624796ed12abb424422e726113185c Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 11 Sep 2018 10:05:37 -0400
Subject: [PATCH 02/74] Update the documentation and implementation of swap
 calculation.

Make the ramps consistent between suspend-to-disk and not,
and don't do the weird drop from 8GiB swap down to 4GiB for
large-memory systems.
---
 .../partition/core/PartitionActions.cpp       | 55 ++++++-------------
 src/modules/partition/partition.conf          | 16 ++++--
 2 files changed, 28 insertions(+), 43 deletions(-)

diff --git a/src/modules/partition/core/PartitionActions.cpp b/src/modules/partition/core/PartitionActions.cpp
index d35345424..99c231b1b 100644
--- a/src/modules/partition/core/PartitionActions.cpp
+++ b/src/modules/partition/core/PartitionActions.cpp
@@ -45,17 +45,7 @@ using CalamaresUtils::operator""_MiB;
 qint64
 swapSuggestion( const qint64 availableSpaceB )
 {
-    /* If suspend-to-disk is demanded, then we always need enough
-     * swap to write the whole memory to disk -- between 2GB and 8GB
-     * RAM give proportionally more swap, and from 8GB RAM keep
-     * swap = RAM.
-     *
-     * If suspend-to-disk is not demanded, then ramp up more slowly,
-     * to 8GB swap at 16GB memory, and then drop to 4GB for "large
-     * memory" machines, on the assumption that those don't need swap
-     * because they have tons of memory (or whatever they are doing,
-     * had better not run into swap).
-     */
+    // See partition.conf for explanation
     qint64 suggestedSwapSizeB = 0;
     auto memory = CalamaresUtils::System::instance()->getTotalMemoryB();
     qint64 availableRamB = memory.first;
@@ -65,36 +55,25 @@ swapSuggestion( const qint64 availableSpaceB )
         Calamares::JobQueue::instance()->globalStorage()->
             value( "ensureSuspendToDisk" ).toBool();
 
-    if ( ensureSuspendToDisk )
-    {
-        if ( availableRamB < 4_GiB )
-            suggestedSwapSizeB = qMax( 2_GiB, availableRamB * 2 );
-        else if ( availableRamB >= 4_GiB && availableRamB < 8_GiB )
-            suggestedSwapSizeB = 8_GiB;
-        else
-            suggestedSwapSizeB = availableRamB;
+    // Ramp up quickly to 8GiB, then follow memory size
+    if ( availableRamB <= 4_GiB )
+        suggestedSwapSizeB = availableRamB * 2;
+    else if ( availableRamB <= 8_GiB )
+        suggestedSwapSizeB = 8_GiB;
+    else
+        suggestedSwapSizeB = availableRamB;
 
-        suggestedSwapSizeB *= overestimationFactor;
-    }
-    else //if we don't care about suspend to disk
-    {
-        if ( availableRamB < 2_GiB )
-            suggestedSwapSizeB = qMax( 2_GiB, availableRamB * 2 );
-        else if ( availableRamB >= 2_GiB && availableRamB < 8_GiB )
-            suggestedSwapSizeB = availableRamB;
-        else if ( availableRamB >= 8_GiB && availableRamB < 16_GiB )
-            suggestedSwapSizeB = 8_GiB;
-        else
-            suggestedSwapSizeB = 4_GiB;
+    // .. top out at 8GiB if we don't care about suspend
+    if ( !ensureSuspendToDisk )
+        suggestedSwapSizeB = qMin( 8_GiB, suggestedSwapSizeB );
 
-        suggestedSwapSizeB *= overestimationFactor;
 
-        // don't use more than 10% of available space
-        qreal maxSwapDiskRatio = 0.10;
-        qint64 maxSwapSizeB = availableSpaceB * maxSwapDiskRatio;
-        if ( suggestedSwapSizeB > maxSwapSizeB )
-            suggestedSwapSizeB = maxSwapSizeB;
-    }
+    // Allow for a fudge factor
+    suggestedSwapSizeB *= overestimationFactor;
+
+    // don't use more than 10% of available space
+    if ( !ensureSuspendToDisk )
+        suggestedSwapSizeB = qMin( suggestedSwapSizeB, qint64( 0.10 * availableSpaceB ) );
 
     cDebug() << "Suggested swap size:" << suggestedSwapSizeB / 1024. / 1024. / 1024. << "GiB";
 
diff --git a/src/modules/partition/partition.conf b/src/modules/partition/partition.conf
index 78ad82f10..3e0ce5950 100644
--- a/src/modules/partition/partition.conf
+++ b/src/modules/partition/partition.conf
@@ -6,11 +6,17 @@ efiSystemPartition:     "/boot/efi"
 # Make sure an autogenerated swap partition is big enough for hibernation in
 # automated partitioning modes. Swap can be disabled through *neverCreateSwap*.
 #
-# When *ensureSuspendToDisk* is true, swap is never smaller than physical
-# memory, follows the guideline 2 * memory until swap reaches 8GiB.
-# When *ensureSuspendToDisk* is false, swap size scales up with memory
-# size until 8GiB, then at roughly half of memory size.
-#
+#  - *neverCreateSwap* is true: no swap is created
+#  - *neverCreateSwap* is false (the default): swap is created, as follows:
+#    - *ensureSuspendToDisk* is true (default): Swap is always at least total
+#      memory size, and up to 4GiB RAM follows the rule-of-thumb 2 * memory;
+#      from 4GiB to 8 GiB it stays steady at 8GiB, and over 8 GiB memory
+#      swap is the size of main memory.
+#    - *ensureSuspendToDisk* is false: Follows the rules above, but Swap is at
+#      most 8GiB, and no more than 10% of available disk.
+#    In both cases, a fudge factor (usually 10% extra) is applied so that there
+#    is some space for administrative overhead (e.g. 8 GiB swap will allocate
+#    8.8GiB on disk in the end).
 #
 # Default is true.
 ensureSuspendToDisk:    true

From c8133759081ed4cf1e8e50eaa7d3de03a508620f Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Wed, 12 Sep 2018 08:09:01 -0400
Subject: [PATCH 03/74] [partition] Prepare for swap options

 - Extend PrettyRadioButton with options (combo-boxes which may
   be added later).
---
 .../partition/gui/PrettyRadioButton.cpp       | 21 +++++++++++++------
 src/modules/partition/gui/PrettyRadioButton.h | 13 ++++++++++++
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/src/modules/partition/gui/PrettyRadioButton.cpp b/src/modules/partition/gui/PrettyRadioButton.cpp
index a697ed270..be09f5753 100644
--- a/src/modules/partition/gui/PrettyRadioButton.cpp
+++ b/src/modules/partition/gui/PrettyRadioButton.cpp
@@ -21,15 +21,16 @@
 #include "utils/CalamaresUtilsGui.h"
 #include "widgets/ClickableLabel.h"
 
+#include <QComboBox>
+#include <QGridLayout>
 #include <QLabel>
-#include <QBoxLayout>
 
 
 PrettyRadioButton::PrettyRadioButton( QWidget* parent )
     : QWidget( parent )
 {
-    QHBoxLayout* mainLayout = new QHBoxLayout;
-    setLayout( mainLayout );
+    m_mainLayout = new QGridLayout;
+    setLayout( m_mainLayout );
 
     m_radio = new QRadioButton;
     m_label = new ClickableLabel;
@@ -41,9 +42,9 @@ PrettyRadioButton::PrettyRadioButton( QWidget* parent )
     m_label->setWordWrap( true );
     m_label->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Preferred );
 
-    mainLayout->addWidget( m_radio );
-    mainLayout->addWidget( m_label );
-    mainLayout->setContentsMargins( 0, 0, 0, 0 );
+    m_mainLayout->addWidget( m_radio, 0, 0 );
+    m_mainLayout->addWidget( m_label, 0, 1, -1, 1 );  // Row span to right edge
+    m_mainLayout->setContentsMargins( 0, 0, 0, 0 );
 }
 
 
@@ -80,3 +81,11 @@ PrettyRadioButton::buttonWidget() const
 {
     return m_radio;
 }
+
+void
+PrettyRadioButton::addOptionsComboBox( const QString& label, QComboBox* box )
+{
+    int row = m_mainLayout->rowCount();  // Rows index from 0, count from 1
+    m_mainLayout->addWidget( new QLabel( label ), row, 1 );
+    m_mainLayout->addWidget( box, row, 2 );
+}
diff --git a/src/modules/partition/gui/PrettyRadioButton.h b/src/modules/partition/gui/PrettyRadioButton.h
index f475ce528..c5ed6b336 100644
--- a/src/modules/partition/gui/PrettyRadioButton.h
+++ b/src/modules/partition/gui/PrettyRadioButton.h
@@ -22,7 +22,16 @@
 #include <QRadioButton>
 
 class ClickableLabel;
+class QComboBox;
+class QGridLayout;
 
+/** @brief A radio button with fancy label next to it.
+ *
+ * The radio button itself can be retrieved with buttonWidget(),
+ * and the whole behaves a lot like a label. Extra options can be
+ * added to the display (options are hidden when the button is
+ * not selected) with addOptionsComboBox().
+ */
 class PrettyRadioButton : public QWidget
 {
     Q_OBJECT
@@ -40,9 +49,13 @@ public:
 
     virtual QRadioButton* buttonWidget() const;
 
+    /** @brief Add an options drop-down to this button. */
+    void addOptionsComboBox( const QString& label, QComboBox* );
+
 protected:
     ClickableLabel* m_label;
     QRadioButton* m_radio;
+    QGridLayout* m_mainLayout;
 };
 
 #endif // PRETTYRADIOBUTTON_H

From a791818a65de0281b12aedbf9178933ad94d472c Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Wed, 12 Sep 2018 08:18:45 -0400
Subject: [PATCH 04/74] [partition] Add swap drop-down

 - This is WIP; the drop-down contents should be customised,
   depending on configuration and the state of the device being
   installed-to.
---
 src/modules/partition/gui/ChoicePage.cpp | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/modules/partition/gui/ChoicePage.cpp b/src/modules/partition/gui/ChoicePage.cpp
index bef6e4966..b921941c2 100644
--- a/src/modules/partition/gui/ChoicePage.cpp
+++ b/src/modules/partition/gui/ChoicePage.cpp
@@ -172,6 +172,18 @@ ChoicePage::init( PartitionCoreModule* core )
     ChoicePage::applyDeviceChoice();
 }
 
+static QComboBox*
+swapSelectionCombo()
+{
+    QComboBox* box = new QComboBox;
+    box->addItem( box->tr( "No swap" ), 0 );
+    box->addItem( box->tr( "Re-use swap" ), 1 );
+    box->addItem( box->tr( "Limited swap" ), 2 );
+    box->addItem( box->tr( "Full swap" ), 3 );
+    box->addItem( box->tr( "Swap file" ), 4 );
+
+    return box;
+}
 
 /**
  * @brief ChoicePage::setupChoices creates PrettyRadioButton objects for the action
@@ -216,6 +228,7 @@ ChoicePage::setupChoices()
     m_eraseButton->setIcon( CalamaresUtils::defaultPixmap( CalamaresUtils::PartitionEraseAuto,
                                                            CalamaresUtils::Original,
                                                            iconSize ) );
+    m_eraseButton->addOptionsComboBox( tr( "Swap" ), swapSelectionCombo() );
     m_grp->addButton( m_eraseButton->buttonWidget(), Erase );
 
     m_replaceButton = new PrettyRadioButton;

From dc492b301ce48e7cf0d28073debce7bc3056a9f9 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Wed, 12 Sep 2018 08:42:21 -0400
Subject: [PATCH 05/74] [partition] Drop label on swap-options box

---
 src/modules/partition/gui/ChoicePage.cpp        | 2 +-
 src/modules/partition/gui/PrettyRadioButton.cpp | 5 ++---
 src/modules/partition/gui/PrettyRadioButton.h   | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/modules/partition/gui/ChoicePage.cpp b/src/modules/partition/gui/ChoicePage.cpp
index b921941c2..4dd214382 100644
--- a/src/modules/partition/gui/ChoicePage.cpp
+++ b/src/modules/partition/gui/ChoicePage.cpp
@@ -228,7 +228,7 @@ ChoicePage::setupChoices()
     m_eraseButton->setIcon( CalamaresUtils::defaultPixmap( CalamaresUtils::PartitionEraseAuto,
                                                            CalamaresUtils::Original,
                                                            iconSize ) );
-    m_eraseButton->addOptionsComboBox( tr( "Swap" ), swapSelectionCombo() );
+    m_eraseButton->addOptionsComboBox( swapSelectionCombo() );
     m_grp->addButton( m_eraseButton->buttonWidget(), Erase );
 
     m_replaceButton = new PrettyRadioButton;
diff --git a/src/modules/partition/gui/PrettyRadioButton.cpp b/src/modules/partition/gui/PrettyRadioButton.cpp
index be09f5753..9be49fb82 100644
--- a/src/modules/partition/gui/PrettyRadioButton.cpp
+++ b/src/modules/partition/gui/PrettyRadioButton.cpp
@@ -83,9 +83,8 @@ PrettyRadioButton::buttonWidget() const
 }
 
 void
-PrettyRadioButton::addOptionsComboBox( const QString& label, QComboBox* box )
+PrettyRadioButton::addOptionsComboBox( QComboBox* box )
 {
     int row = m_mainLayout->rowCount();  // Rows index from 0, count from 1
-    m_mainLayout->addWidget( new QLabel( label ), row, 1 );
-    m_mainLayout->addWidget( box, row, 2 );
+    m_mainLayout->addWidget( box, row, 1 );
 }
diff --git a/src/modules/partition/gui/PrettyRadioButton.h b/src/modules/partition/gui/PrettyRadioButton.h
index c5ed6b336..1cb94c1a0 100644
--- a/src/modules/partition/gui/PrettyRadioButton.h
+++ b/src/modules/partition/gui/PrettyRadioButton.h
@@ -50,7 +50,7 @@ public:
     virtual QRadioButton* buttonWidget() const;
 
     /** @brief Add an options drop-down to this button. */
-    void addOptionsComboBox( const QString& label, QComboBox* );
+    void addOptionsComboBox( QComboBox* );
 
 protected:
     ClickableLabel* m_label;

From c3f3276188978f25b1e63c32ca639bacc2586fbe Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Wed, 12 Sep 2018 09:20:44 -0400
Subject: [PATCH 06/74] [partition] Improve presentation of swap options

---
 .../partition/gui/PrettyRadioButton.cpp       | 44 +++++++++++++++----
 src/modules/partition/gui/PrettyRadioButton.h |  6 +++
 2 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/src/modules/partition/gui/PrettyRadioButton.cpp b/src/modules/partition/gui/PrettyRadioButton.cpp
index 9be49fb82..cd3c6dd3b 100644
--- a/src/modules/partition/gui/PrettyRadioButton.cpp
+++ b/src/modules/partition/gui/PrettyRadioButton.cpp
@@ -23,28 +23,32 @@
 
 #include <QComboBox>
 #include <QGridLayout>
+#include <QHBoxLayout>
 #include <QLabel>
 
 
 PrettyRadioButton::PrettyRadioButton( QWidget* parent )
     : QWidget( parent )
+    , m_radio( new QRadioButton )
+    , m_label( new ClickableLabel )
+    , m_mainLayout( new QGridLayout )
+    , m_optionsLayout( nullptr )
 {
-    m_mainLayout = new QGridLayout;
     setLayout( m_mainLayout );
 
-    m_radio = new QRadioButton;
-    m_label = new ClickableLabel;
-
-    connect( m_label, &ClickableLabel::clicked,
-             m_radio, &QRadioButton::click );
     m_label->setBuddy( m_radio );
 
     m_label->setWordWrap( true );
     m_label->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Preferred );
 
     m_mainLayout->addWidget( m_radio, 0, 0 );
-    m_mainLayout->addWidget( m_label, 0, 1, -1, 1 );  // Row span to right edge
+    m_mainLayout->addWidget( m_label, 0, 1 );
     m_mainLayout->setContentsMargins( 0, 0, 0, 0 );
+
+    connect( m_label, &ClickableLabel::clicked,
+             m_radio, &QRadioButton::click );
+    connect( m_radio, &QRadioButton::toggled,
+             this, &PrettyRadioButton::toggleOptions );
 }
 
 
@@ -85,6 +89,28 @@ PrettyRadioButton::buttonWidget() const
 void
 PrettyRadioButton::addOptionsComboBox( QComboBox* box )
 {
-    int row = m_mainLayout->rowCount();  // Rows index from 0, count from 1
-    m_mainLayout->addWidget( box, row, 1 );
+    if ( !box )
+        return;
+
+    if ( !m_optionsLayout )
+    {
+        QWidget* w = new QWidget;
+        m_optionsLayout = new QHBoxLayout;
+        m_optionsLayout->setAlignment( Qt::AlignmentFlag::AlignLeft );
+        m_optionsLayout->addStretch( 1 );
+
+        w->setLayout( m_optionsLayout );
+        m_mainLayout->addWidget( w, 1, 1 );
+
+        toggleOptions( m_radio->isChecked() );
+    }
+
+    m_optionsLayout->insertWidget( m_optionsLayout->count()-1, box );
+}
+
+void
+PrettyRadioButton::toggleOptions( bool toggle )
+{
+    if ( m_optionsLayout )
+        m_optionsLayout->parentWidget()->setVisible( toggle );
 }
diff --git a/src/modules/partition/gui/PrettyRadioButton.h b/src/modules/partition/gui/PrettyRadioButton.h
index 1cb94c1a0..c88c00728 100644
--- a/src/modules/partition/gui/PrettyRadioButton.h
+++ b/src/modules/partition/gui/PrettyRadioButton.h
@@ -24,6 +24,7 @@
 class ClickableLabel;
 class QComboBox;
 class QGridLayout;
+class QHBoxLayout;
 
 /** @brief A radio button with fancy label next to it.
  *
@@ -52,10 +53,15 @@ public:
     /** @brief Add an options drop-down to this button. */
     void addOptionsComboBox( QComboBox* );
 
+protected slots:
+    /// Options are hidden when the radio button is off
+    void toggleOptions( bool checked );
+
 protected:
     ClickableLabel* m_label;
     QRadioButton* m_radio;
     QGridLayout* m_mainLayout;
+    QHBoxLayout* m_optionsLayout;
 };
 
 #endif // PRETTYRADIOBUTTON_H

From 10f7bac2df3e650d097b5701f07d93828db933f6 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Wed, 12 Sep 2018 10:05:14 -0400
Subject: [PATCH 07/74] [partition] Reorder initialization

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

diff --git a/src/modules/partition/gui/PrettyRadioButton.cpp b/src/modules/partition/gui/PrettyRadioButton.cpp
index cd3c6dd3b..18627f41c 100644
--- a/src/modules/partition/gui/PrettyRadioButton.cpp
+++ b/src/modules/partition/gui/PrettyRadioButton.cpp
@@ -29,8 +29,8 @@
 
 PrettyRadioButton::PrettyRadioButton( QWidget* parent )
     : QWidget( parent )
-    , m_radio( new QRadioButton )
     , m_label( new ClickableLabel )
+    , m_radio( new QRadioButton )
     , m_mainLayout( new QGridLayout )
     , m_optionsLayout( nullptr )
 {

From 7d0451fe6924affe41d371b20a21016d3b3aa992 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Wed, 12 Sep 2018 10:16:48 -0400
Subject: [PATCH 08/74] [partition] Rename Choice -> InstallChoice

 - There are more choices to be made (or to come) when partitioning,
   so don't take the most generic term for one enum.
---
 src/modules/partition/gui/ChoicePage.cpp        |  8 ++++----
 src/modules/partition/gui/ChoicePage.h          | 10 +++++-----
 src/modules/partition/gui/PartitionViewStep.cpp |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/modules/partition/gui/ChoicePage.cpp b/src/modules/partition/gui/ChoicePage.cpp
index 4dd214382..62ee27a7e 100644
--- a/src/modules/partition/gui/ChoicePage.cpp
+++ b/src/modules/partition/gui/ChoicePage.cpp
@@ -262,7 +262,7 @@ ChoicePage::setupChoices()
     {
         if ( checked )  // An action was picked.
         {
-            m_choice = static_cast< Choice >( id );
+            m_choice = static_cast< InstallChoice >( id );
             updateNextEnabled();
 
             emit actionChosen();
@@ -386,7 +386,7 @@ ChoicePage::continueApplyDeviceChoice()
 
 
 void
-ChoicePage::applyActionChoice( ChoicePage::Choice choice )
+ChoicePage::applyActionChoice( ChoicePage::InstallChoice choice )
 {
     m_beforePartitionBarsView->selectionModel()->
             disconnect( SIGNAL( currentRowChanged( QModelIndex, QModelIndex ) ) );
@@ -901,7 +901,7 @@ ChoicePage::updateDeviceStatePreview()
  * @param choice the chosen partitioning action.
  */
 void
-ChoicePage::updateActionChoicePreview( ChoicePage::Choice choice )
+ChoicePage::updateActionChoicePreview( ChoicePage::InstallChoice choice )
 {
     Device* currentDevice = selectedDevice();
     Q_ASSERT( currentDevice );
@@ -1356,7 +1356,7 @@ ChoicePage::isNextEnabled() const
 }
 
 
-ChoicePage::Choice
+ChoicePage::InstallChoice
 ChoicePage::currentChoice() const
 {
     return m_choice;
diff --git a/src/modules/partition/gui/ChoicePage.h b/src/modules/partition/gui/ChoicePage.h
index c36747e93..d991e513a 100644
--- a/src/modules/partition/gui/ChoicePage.h
+++ b/src/modules/partition/gui/ChoicePage.h
@@ -53,7 +53,7 @@ class ChoicePage : public QWidget, private Ui::ChoicePage
 {
     Q_OBJECT
 public:
-    enum Choice
+    enum InstallChoice
     {
         NoChoice,
         Alongside,
@@ -84,7 +84,7 @@ public:
      * currently selected partitioning mode (with a PrettyRadioButton).
      * @return the enum Choice value.
      */
-    Choice currentChoice() const;
+    InstallChoice currentChoice() const;
 
     /**
      * @brief onLeave runs when control passes from this page to another one.
@@ -95,7 +95,7 @@ public:
      * @brief applyActionChoice reacts to a choice of partitioning mode.
      * @param choice the partitioning action choice.
      */
-    void applyActionChoice( ChoicePage::Choice choice );
+    void applyActionChoice( ChoicePage::InstallChoice choice );
 
 signals:
     void nextStatusChanged( bool );
@@ -121,7 +121,7 @@ private:
     void continueApplyDeviceChoice();  // .. called after scan
 
     void updateDeviceStatePreview();
-    void updateActionChoicePreview( ChoicePage::Choice choice );
+    void updateActionChoicePreview( ChoicePage::InstallChoice choice );
     void setupActions();
     OsproberEntryList getOsproberEntriesForDevice( Device* device ) const;
     void doAlongsideApply();
@@ -132,7 +132,7 @@ private:
 
     QMutex m_previewsMutex;
 
-    Choice m_choice;
+    InstallChoice m_choice;
 
     bool m_isEfi;
     QComboBox* m_drivesCombo;
diff --git a/src/modules/partition/gui/PartitionViewStep.cpp b/src/modules/partition/gui/PartitionViewStep.cpp
index b49b6c93b..6ad1a6c77 100644
--- a/src/modules/partition/gui/PartitionViewStep.cpp
+++ b/src/modules/partition/gui/PartitionViewStep.cpp
@@ -138,7 +138,7 @@ PartitionViewStep::createSummaryWidget() const
     widget->setLayout( mainLayout );
     mainLayout->setMargin( 0 );
 
-    ChoicePage::Choice choice = m_choicePage->currentChoice();
+    ChoicePage::InstallChoice choice = m_choicePage->currentChoice();
 
     QFormLayout* formLayout = new QFormLayout( widget );
     const int MARGIN = CalamaresUtils::defaultFontHeight() / 2;

From cfa940b35c8b09d9f7c491418cda9b6330466496 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Wed, 12 Sep 2018 11:18:17 -0400
Subject: [PATCH 09/74] [partition] Support translations of swap choices

 - Introduce enum to indicate what is selected
 - Support translations
 - Fill selections for erase
---
 src/modules/partition/gui/ChoicePage.cpp | 69 +++++++++++++++++++-----
 src/modules/partition/gui/ChoicePage.h   | 15 ++++++
 2 files changed, 70 insertions(+), 14 deletions(-)

diff --git a/src/modules/partition/gui/ChoicePage.cpp b/src/modules/partition/gui/ChoicePage.cpp
index 62ee27a7e..ab5a9316a 100644
--- a/src/modules/partition/gui/ChoicePage.cpp
+++ b/src/modules/partition/gui/ChoicePage.cpp
@@ -78,6 +78,9 @@ ChoicePage::ChoicePage( QWidget* parent )
     , m_eraseButton( nullptr )
     , m_replaceButton( nullptr )
     , m_somethingElseButton( nullptr )
+    , m_eraseSwapChoices( nullptr )
+    , m_replaceSwapChoices( nullptr )
+    , m_alongsideSwapChoices( nullptr )
     , m_deviceInfoWidget( nullptr )
     , m_beforePartitionBarsView( nullptr )
     , m_beforePartitionLabelsView( nullptr )
@@ -172,19 +175,6 @@ ChoicePage::init( PartitionCoreModule* core )
     ChoicePage::applyDeviceChoice();
 }
 
-static QComboBox*
-swapSelectionCombo()
-{
-    QComboBox* box = new QComboBox;
-    box->addItem( box->tr( "No swap" ), 0 );
-    box->addItem( box->tr( "Re-use swap" ), 1 );
-    box->addItem( box->tr( "Limited swap" ), 2 );
-    box->addItem( box->tr( "Full swap" ), 3 );
-    box->addItem( box->tr( "Swap file" ), 4 );
-
-    return box;
-}
-
 /**
  * @brief ChoicePage::setupChoices creates PrettyRadioButton objects for the action
  *      choices.
@@ -228,7 +218,6 @@ ChoicePage::setupChoices()
     m_eraseButton->setIcon( CalamaresUtils::defaultPixmap( CalamaresUtils::PartitionEraseAuto,
                                                            CalamaresUtils::Original,
                                                            iconSize ) );
-    m_eraseButton->addOptionsComboBox( swapSelectionCombo() );
     m_grp->addButton( m_eraseButton->buttonWidget(), Erase );
 
     m_replaceButton = new PrettyRadioButton;
@@ -239,6 +228,13 @@ ChoicePage::setupChoices()
                                                              iconSize ) );
     m_grp->addButton( m_replaceButton->buttonWidget(), Replace );
 
+    // Fill up swap options
+    // .. TODO: only if enabled in the config
+    m_eraseSwapChoices = new QComboBox;
+    for ( SwapChoice c : { NoSwap, SmallSwap, FullSwap } )
+        m_eraseSwapChoices->addItem( QString(), c );
+    m_eraseButton->addOptionsComboBox( m_eraseSwapChoices );
+
     m_itemsLayout->addWidget( m_alongsideButton );
     m_itemsLayout->addWidget( m_replaceButton );
     m_itemsLayout->addWidget( m_eraseButton );
@@ -292,6 +288,12 @@ ChoicePage::setupChoices()
             applyActionChoice( currentChoice() );
         }
     } );
+
+    CALAMARES_RETRANSLATE(
+        updateSwapChoicesTr( m_eraseSwapChoices );
+        updateSwapChoicesTr( m_alongsideSwapChoices );
+        updateSwapChoicesTr( m_replaceSwapChoices );
+    )
 }
 
 
@@ -1404,3 +1406,42 @@ ChoicePage::updateNextEnabled()
     emit nextStatusChanged( enabled );
 }
 
+void
+ChoicePage::updateSwapChoicesTr(QComboBox* box)
+{
+    if ( !box )
+        return;
+
+    static_assert(NoSwap == 0, "Enum values out-of-sync");
+    for ( int index = 0; index < box->count(); ++index )
+    {
+        bool ok = false;
+        int value = 0;
+
+        switch ( value = box->itemData( index ).toInt( &ok ) )
+        {
+            // case 0:
+            case NoSwap:
+                // toInt() returns 0 on failure, so check for ok
+                if ( ok )  // It was explicitly set to 0
+                    box->setItemText( index, tr( "No Swap" ) );
+                else
+                    cWarning() << "Box item" << index << box->itemText( index ) << "has non-integer role.";
+                break;
+            case ReuseSwap:
+                box->setItemText( index, tr( "Reuse Swap" ) );
+                break;
+            case SmallSwap:
+                box->setItemText( index, tr( "Swap (no Hibernate)" ) );
+                break;
+            case FullSwap:
+                box->setItemText( index, tr( "Swap (with Hibernate)" ) );
+                break;
+            case SwapFile:
+                box->setItemText( index, tr( "Swap to file" ) );
+                break;
+            default:
+                cWarning() << "Box item" << index << box->itemText( index ) << "has role" << value;
+        }
+    }
+}
diff --git a/src/modules/partition/gui/ChoicePage.h b/src/modules/partition/gui/ChoicePage.h
index d991e513a..a8ff3a330 100644
--- a/src/modules/partition/gui/ChoicePage.h
+++ b/src/modules/partition/gui/ChoicePage.h
@@ -62,6 +62,15 @@ public:
         Manual
     };
 
+    enum SwapChoice
+    {
+        NoSwap,     // don't create any swap, don't use any
+        ReuseSwap,  // don't create, but do use existing
+        SmallSwap,  // up to 8GiB of swap
+        FullSwap,   // ensureSuspendToDisk -- at least RAM size
+        SwapFile    // use a file (if supported)
+    };
+
     explicit ChoicePage( QWidget* parent = nullptr );
     virtual ~ChoicePage();
 
@@ -127,6 +136,9 @@ private:
     void doAlongsideApply();
     void setupEfiSystemPartitionSelector();
 
+    // Translations support
+    void updateSwapChoicesTr( QComboBox* box );
+
     bool m_nextEnabled;
     PartitionCoreModule* m_core;
 
@@ -142,6 +154,9 @@ private:
     PrettyRadioButton* m_eraseButton;
     PrettyRadioButton* m_replaceButton;
     PrettyRadioButton* m_somethingElseButton;
+    QComboBox* m_eraseSwapChoices;
+    QComboBox* m_replaceSwapChoices;
+    QComboBox* m_alongsideSwapChoices;
 
     DeviceInfoWidget* m_deviceInfoWidget;
 

From 959cd7b224585d67b4506f6b210987ffdbf5ff84 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Thu, 13 Sep 2018 04:44:36 -0400
Subject: [PATCH 10/74] [partition] Simplify creation of comboboxes for swap
 choices

---
 src/modules/partition/gui/ChoicePage.cpp | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/modules/partition/gui/ChoicePage.cpp b/src/modules/partition/gui/ChoicePage.cpp
index ab5a9316a..ccdc6920e 100644
--- a/src/modules/partition/gui/ChoicePage.cpp
+++ b/src/modules/partition/gui/ChoicePage.cpp
@@ -175,6 +175,20 @@ ChoicePage::init( PartitionCoreModule* core )
     ChoicePage::applyDeviceChoice();
 }
 
+
+/** @brief Creates a combobox with the given choices in it.
+ *
+ * No texts are set -- that happens later by the translator functions.
+ */
+static inline QComboBox*
+createCombo( std::initializer_list< ChoicePage::SwapChoice > l )
+{
+    QComboBox* box = new QComboBox;
+    for ( ChoicePage::SwapChoice c : l )
+        box->addItem( QString(), c );
+    return box;
+}
+
 /**
  * @brief ChoicePage::setupChoices creates PrettyRadioButton objects for the action
  *      choices.
@@ -230,11 +244,15 @@ ChoicePage::setupChoices()
 
     // Fill up swap options
     // .. TODO: only if enabled in the config
-    m_eraseSwapChoices = new QComboBox;
-    for ( SwapChoice c : { NoSwap, SmallSwap, FullSwap } )
-        m_eraseSwapChoices->addItem( QString(), c );
+    m_eraseSwapChoices = createCombo( { NoSwap, SmallSwap, FullSwap } );
     m_eraseButton->addOptionsComboBox( m_eraseSwapChoices );
 
+    m_replaceSwapChoices = createCombo( { NoSwap, ReuseSwap, SmallSwap, FullSwap } );
+    m_replaceButton->addOptionsComboBox( m_replaceSwapChoices );
+
+    m_alongsideSwapChoices = createCombo( { NoSwap, ReuseSwap, SmallSwap, FullSwap } );
+    m_alongsideButton->addOptionsComboBox( m_alongsideSwapChoices );
+
     m_itemsLayout->addWidget( m_alongsideButton );
     m_itemsLayout->addWidget( m_replaceButton );
     m_itemsLayout->addWidget( m_eraseButton );

From 8c79c981b112a53b58775e92a2d79e6d0bfd5b9a Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Thu, 13 Sep 2018 05:33:39 -0400
Subject: [PATCH 11/74] [partition] Simplify space calculations

 - Q_ASSERT doesn't work in constexpr functions because it's not
 - May as well calculate bytes at compile-time, no need to give
   the runaround via number-of-MiB
---
 src/modules/partition/core/PartitionActions.cpp | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/modules/partition/core/PartitionActions.cpp b/src/modules/partition/core/PartitionActions.cpp
index 99c231b1b..7e488367f 100644
--- a/src/modules/partition/core/PartitionActions.cpp
+++ b/src/modules/partition/core/PartitionActions.cpp
@@ -83,10 +83,7 @@ swapSuggestion( const qint64 availableSpaceB )
 constexpr qint64
 alignBytesToBlockSize( qint64 bytes, qint64 blocksize )
 {
-    Q_ASSERT( bytes >= 0 );
-    Q_ASSERT( blocksize > 0 );
     qint64 blocks = bytes / blocksize;
-    Q_ASSERT( blocks >= 0 );
 
     if ( blocks * blocksize != bytes )
         ++blocks;
@@ -114,17 +111,17 @@ doAutopartition( PartitionCoreModule* core, Device* dev, const QString& luksPass
     // the logical sector size (usually 512B). EFI starts with 2MiB
     // empty and a 300MiB EFI boot partition, while BIOS starts at
     // the 1MiB boundary (usually sector 2048).
-    int uefisys_part_size = isEfi ? 300 : 0;
-    int empty_space_size = isEfi ? 2 : 1;
+    int uefisys_part_sizeB = isEfi ? 300_MiB : 0_MiB;
+    int empty_space_sizeB = isEfi ? 2_MiB : 1_MiB;
 
     // Since sectors count from 0, if the space is 2048 sectors in size,
     // the first free sector has number 2048 (and there are 2048 sectors
     // before that one, numbered 0..2047).
-    qint64 firstFreeSector = bytesToSectors( MiBtoBytes(empty_space_size), dev->logicalSize() );
+    qint64 firstFreeSector = bytesToSectors( empty_space_sizeB, dev->logicalSize() );
 
     if ( isEfi )
     {
-        qint64 efiSectorCount = bytesToSectors( MiBtoBytes(uefisys_part_size), dev->logicalSize() );
+        qint64 efiSectorCount = bytesToSectors( uefisys_part_sizeB, dev->logicalSize() );
         Q_ASSERT( efiSectorCount > 0 );
 
         // Since sectors count from 0, and this partition is created starting

From 846e496d7666682d40d102a064e0cc8d24cdcfcb Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Thu, 13 Sep 2018 05:50:46 -0400
Subject: [PATCH 12/74] [partition] Tidy includes

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

diff --git a/src/modules/partition/gui/ChoicePage.cpp b/src/modules/partition/gui/ChoicePage.cpp
index ccdc6920e..4c5f7ff65 100644
--- a/src/modules/partition/gui/ChoicePage.cpp
+++ b/src/modules/partition/gui/ChoicePage.cpp
@@ -20,31 +20,32 @@
 #include "ChoicePage.h"
 
 #include "core/BootLoaderModel.h"
-#include "core/PartitionActions.h"
-#include "core/PartitionCoreModule.h"
 #include "core/DeviceModel.h"
-#include "core/PartitionModel.h"
+#include "core/KPMHelpers.h"
 #include "core/OsproberEntry.h"
 #include "core/PartUtils.h"
+#include "core/PartitionActions.h"
+#include "core/PartitionCoreModule.h"
+#include "core/PartitionInfo.h"
 #include "core/PartitionIterator.h"
+#include "core/PartitionModel.h"
 
-#include "ReplaceWidget.h"
-#include "PrettyRadioButton.h"
+#include "BootInfoWidget.h"
+#include "DeviceInfoWidget.h"
 #include "PartitionBarsView.h"
 #include "PartitionLabelsView.h"
 #include "PartitionSplitterWidget.h"
-#include "BootInfoWidget.h"
-#include "DeviceInfoWidget.h"
+#include "PrettyRadioButton.h"
+#include "ReplaceWidget.h"
 #include "ScanningDialog.h"
 
 #include "utils/CalamaresUtilsGui.h"
 #include "utils/Logger.h"
 #include "utils/Retranslator.h"
+
 #include "Branding.h"
-#include "core/KPMHelpers.h"
-#include "JobQueue.h"
 #include "GlobalStorage.h"
-#include "core/PartitionInfo.h"
+#include "JobQueue.h"
 
 #include <kpmcore/core/device.h>
 #include <kpmcore/core/partition.h>

From 513602141660deab76b228e7d6a741461e9d920f Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Thu, 13 Sep 2018 06:23:33 -0400
Subject: [PATCH 13/74] [partition] Move SwapChoice to another namespace

 - The choice of swap needs to be handled in more places,
   so make the enum available in the partition module core instead
   of just inside the choice page.
---
 src/modules/partition/core/PartitionActions.h | 19 ++++++++++++++-
 src/modules/partition/gui/ChoicePage.cpp      | 24 +++++++++----------
 src/modules/partition/gui/ChoicePage.h        |  9 -------
 3 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/src/modules/partition/core/PartitionActions.h b/src/modules/partition/core/PartitionActions.h
index bb624552f..8312d582b 100644
--- a/src/modules/partition/core/PartitionActions.h
+++ b/src/modules/partition/core/PartitionActions.h
@@ -50,6 +50,23 @@ void doReplacePartition( PartitionCoreModule* core,
                          Device* dev,
                          Partition* partition,
                          const QString& luksPassphrase = QString() );
-}
+
+/** @brief Namespace for enums
+ *
+ * This namespace houses non-class enums.....
+ */
+namespace Choices
+{
+    /** @brief Ccchoice of swap (size and type) */
+    enum SwapChoice
+    {
+        NoSwap,     // don't create any swap, don't use any
+        ReuseSwap,  // don't create, but do use existing
+        SmallSwap,  // up to 8GiB of swap
+        FullSwap,   // ensureSuspendToDisk -- at least RAM size
+        SwapFile    // use a file (if supported)
+    };
+}  // namespace Choices
+}  // namespace PartitionActions
 
 #endif // PARTITIONACTIONS_H
diff --git a/src/modules/partition/gui/ChoicePage.cpp b/src/modules/partition/gui/ChoicePage.cpp
index 4c5f7ff65..82302ac4c 100644
--- a/src/modules/partition/gui/ChoicePage.cpp
+++ b/src/modules/partition/gui/ChoicePage.cpp
@@ -59,7 +59,7 @@
 #include <QFutureWatcher>
 #include <QtConcurrent/QtConcurrent>
 
-
+using PartitionActions::Choices::SwapChoice;
 
 /**
  * @brief ChoicePage::ChoicePage is the default constructor. Called on startup as part of
@@ -182,10 +182,10 @@ ChoicePage::init( PartitionCoreModule* core )
  * No texts are set -- that happens later by the translator functions.
  */
 static inline QComboBox*
-createCombo( std::initializer_list< ChoicePage::SwapChoice > l )
+createCombo( std::initializer_list< SwapChoice > l )
 {
     QComboBox* box = new QComboBox;
-    for ( ChoicePage::SwapChoice c : l )
+    for ( SwapChoice c : l )
         box->addItem( QString(), c );
     return box;
 }
@@ -245,13 +245,13 @@ ChoicePage::setupChoices()
 
     // Fill up swap options
     // .. TODO: only if enabled in the config
-    m_eraseSwapChoices = createCombo( { NoSwap, SmallSwap, FullSwap } );
+    m_eraseSwapChoices = createCombo( { SwapChoice::NoSwap, SwapChoice::SmallSwap, SwapChoice:: FullSwap } );
     m_eraseButton->addOptionsComboBox( m_eraseSwapChoices );
 
-    m_replaceSwapChoices = createCombo( { NoSwap, ReuseSwap, SmallSwap, FullSwap } );
+    m_replaceSwapChoices = createCombo( { SwapChoice::NoSwap, SwapChoice::ReuseSwap, SwapChoice::SmallSwap, SwapChoice::FullSwap } );
     m_replaceButton->addOptionsComboBox( m_replaceSwapChoices );
 
-    m_alongsideSwapChoices = createCombo( { NoSwap, ReuseSwap, SmallSwap, FullSwap } );
+    m_alongsideSwapChoices = createCombo( { SwapChoice::NoSwap, SwapChoice::ReuseSwap, SwapChoice::SmallSwap, SwapChoice::FullSwap } );
     m_alongsideButton->addOptionsComboBox( m_alongsideSwapChoices );
 
     m_itemsLayout->addWidget( m_alongsideButton );
@@ -1431,7 +1431,7 @@ ChoicePage::updateSwapChoicesTr(QComboBox* box)
     if ( !box )
         return;
 
-    static_assert(NoSwap == 0, "Enum values out-of-sync");
+    static_assert(SwapChoice::NoSwap == 0, "Enum values out-of-sync");
     for ( int index = 0; index < box->count(); ++index )
     {
         bool ok = false;
@@ -1440,23 +1440,23 @@ ChoicePage::updateSwapChoicesTr(QComboBox* box)
         switch ( value = box->itemData( index ).toInt( &ok ) )
         {
             // case 0:
-            case NoSwap:
+            case SwapChoice::NoSwap:
                 // toInt() returns 0 on failure, so check for ok
                 if ( ok )  // It was explicitly set to 0
                     box->setItemText( index, tr( "No Swap" ) );
                 else
                     cWarning() << "Box item" << index << box->itemText( index ) << "has non-integer role.";
                 break;
-            case ReuseSwap:
+            case SwapChoice::ReuseSwap:
                 box->setItemText( index, tr( "Reuse Swap" ) );
                 break;
-            case SmallSwap:
+            case SwapChoice::SmallSwap:
                 box->setItemText( index, tr( "Swap (no Hibernate)" ) );
                 break;
-            case FullSwap:
+            case SwapChoice::FullSwap:
                 box->setItemText( index, tr( "Swap (with Hibernate)" ) );
                 break;
-            case SwapFile:
+            case SwapChoice::SwapFile:
                 box->setItemText( index, tr( "Swap to file" ) );
                 break;
             default:
diff --git a/src/modules/partition/gui/ChoicePage.h b/src/modules/partition/gui/ChoicePage.h
index a8ff3a330..07d052c2d 100644
--- a/src/modules/partition/gui/ChoicePage.h
+++ b/src/modules/partition/gui/ChoicePage.h
@@ -62,15 +62,6 @@ public:
         Manual
     };
 
-    enum SwapChoice
-    {
-        NoSwap,     // don't create any swap, don't use any
-        ReuseSwap,  // don't create, but do use existing
-        SmallSwap,  // up to 8GiB of swap
-        FullSwap,   // ensureSuspendToDisk -- at least RAM size
-        SwapFile    // use a file (if supported)
-    };
-
     explicit ChoicePage( QWidget* parent = nullptr );
     virtual ~ChoicePage();
 

From d2f4079a18476adcf82aff0c8055fb72c1fc206b Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Mon, 17 Sep 2018 06:42:14 -0400
Subject: [PATCH 14/74] [partition] Move partitioning options into a class

 - As (auto) partitioning grows more options, the parameter
   list becomes more unwieldy. Add some structure to it.
---
 .../partition/core/PartitionActions.cpp       | 49 +++++-------
 src/modules/partition/core/PartitionActions.h | 76 +++++++++++++------
 src/modules/partition/gui/ChoicePage.cpp      | 68 ++++++++++-------
 src/modules/partition/gui/ReplaceWidget.cpp   | 14 ++--
 4 files changed, 121 insertions(+), 86 deletions(-)

diff --git a/src/modules/partition/core/PartitionActions.cpp b/src/modules/partition/core/PartitionActions.cpp
index 7e488367f..e06ff6c36 100644
--- a/src/modules/partition/core/PartitionActions.cpp
+++ b/src/modules/partition/core/PartitionActions.cpp
@@ -28,7 +28,6 @@
 #include "utils/Units.h"
 #include "JobQueue.h"
 #include "utils/Logger.h"
-#include "GlobalStorage.h"
 
 #include <kpmcore/core/device.h>
 #include <kpmcore/core/partition.h>
@@ -43,17 +42,18 @@ using CalamaresUtils::operator""_GiB;
 using CalamaresUtils::operator""_MiB;
 
 qint64
-swapSuggestion( const qint64 availableSpaceB )
+swapSuggestion( const qint64 availableSpaceB, Choices::SwapChoice swap )
 {
+    if ( ( swap != Choices::SmallSwap ) && ( swap != Choices::FullSwap ) )
+        return 0;
+
     // See partition.conf for explanation
     qint64 suggestedSwapSizeB = 0;
     auto memory = CalamaresUtils::System::instance()->getTotalMemoryB();
     qint64 availableRamB = memory.first;
     qreal overestimationFactor = memory.second;
 
-    bool ensureSuspendToDisk =
-        Calamares::JobQueue::instance()->globalStorage()->
-            value( "ensureSuspendToDisk" ).toBool();
+    bool ensureSuspendToDisk = swap == Choices::FullSwap;
 
     // Ramp up quickly to 8GiB, then follow memory size
     if ( availableRamB <= 4_GiB )
@@ -97,16 +97,14 @@ bytesToSectors( qint64 bytes, qint64 blocksize )
 }
 
 void
-doAutopartition( PartitionCoreModule* core, Device* dev, const QString& luksPassphrase )
+doAutopartition( PartitionCoreModule* core, Device* dev, Choices::AutoPartitionOptions o )
 {
-    Calamares::GlobalStorage* gs = Calamares::JobQueue::instance()->globalStorage();
-
-    bool isEfi = PartUtils::isEfiSystem();
-
-    QString defaultFsType = gs->value( "defaultFileSystemType" ).toString();
+    QString defaultFsType = o.defaultFsType;
     if ( FileSystem::typeForName( defaultFsType ) == FileSystem::Unknown )
         defaultFsType = "ext4";
 
+    bool isEfi = PartUtils::isEfiSystem();
+
     // Partition sizes are expressed in MiB, should be multiples of
     // the logical sector size (usually 512B). EFI starts with 2MiB
     // empty and a 300MiB EFI boot partition, while BIOS starts at
@@ -139,8 +137,7 @@ doAutopartition( PartitionCoreModule* core, Device* dev, const QString& luksPass
             PartitionTable::FlagNone
         );
         PartitionInfo::setFormat( efiPartition, true );
-        PartitionInfo::setMountPoint( efiPartition, gs->value( "efiSystemPartition" )
-                                                        .toString() );
+        PartitionInfo::setMountPoint( efiPartition, o.efiPartitionMountPoint );
         core->createPartition( dev, efiPartition, PartitionTable::FlagEsp );
         firstFreeSector = lastSector + 1;
     }
@@ -149,20 +146,18 @@ doAutopartition( PartitionCoreModule* core, Device* dev, const QString& luksPass
         core->createPartitionTable( dev, PartitionTable::msdos );
     }
 
-    const bool mayCreateSwap = !gs->value( "neverCreateSwap" ).toBool();
+    const bool mayCreateSwap = ( o.swap == Choices::SmallSwap ) || ( o.swap == Choices::FullSwap );
     bool shouldCreateSwap = false;
     qint64 suggestedSwapSizeB = 0;
 
     if ( mayCreateSwap )
     {
         qint64 availableSpaceB = ( dev->totalLogical() - firstFreeSector ) * dev->logicalSize();
-        suggestedSwapSizeB = swapSuggestion( availableSpaceB );
+        suggestedSwapSizeB = swapSuggestion( availableSpaceB, o.swap );
         // Space required by this installation is what the distro claims is needed
         // (via global configuration) plus the swap size plus a fudge factor of
         // 0.6GiB (this was 2.1GiB up to Calamares 3.2.2).
-        qint64 requiredSpaceB =
-                GiBtoBytes( gs->value( "requiredStorageGB" ).toDouble() + 0.6 ) +
-                suggestedSwapSizeB;
+        qint64 requiredSpaceB = o.requiredSpaceB + 600_MiB + suggestedSwapSizeB;
 
         // If there is enough room for ESP + root + swap, create swap, otherwise don't.
         shouldCreateSwap = availableSpaceB > requiredSpaceB;
@@ -175,7 +170,7 @@ doAutopartition( PartitionCoreModule* core, Device* dev, const QString& luksPass
     }
 
     Partition* rootPartition = nullptr;
-    if ( luksPassphrase.isEmpty() )
+    if ( o.luksPassphrase.isEmpty() )
     {
         rootPartition = KPMHelpers::createNewPartition(
             dev->partitionTable(),
@@ -195,7 +190,7 @@ doAutopartition( PartitionCoreModule* core, Device* dev, const QString& luksPass
             FileSystem::typeForName( defaultFsType ),
             firstFreeSector,
             lastSectorForRoot,
-            luksPassphrase
+            o.luksPassphrase
        );
     }
     PartitionInfo::setFormat( rootPartition, true );
@@ -205,7 +200,7 @@ doAutopartition( PartitionCoreModule* core, Device* dev, const QString& luksPass
     if ( shouldCreateSwap )
     {
         Partition* swapPartition = nullptr;
-        if ( luksPassphrase.isEmpty() )
+        if ( o.luksPassphrase.isEmpty() )
         {
             swapPartition = KPMHelpers::createNewPartition(
                 dev->partitionTable(),
@@ -225,7 +220,7 @@ doAutopartition( PartitionCoreModule* core, Device* dev, const QString& luksPass
                 FileSystem::LinuxSwap,
                 lastSectorForRoot + 1,
                 dev->totalLogical() - 1,
-                luksPassphrase
+                o.luksPassphrase
             );
         }
         PartitionInfo::setFormat( swapPartition, true );
@@ -240,13 +235,11 @@ void
 doReplacePartition( PartitionCoreModule* core,
                     Device* dev,
                     Partition* partition,
-                    const QString& luksPassphrase )
+                    Choices::ReplacePartitionOptions o )
 {
     cDebug() << "doReplacePartition for device" << partition->partitionPath();
 
-    QString defaultFsType = Calamares::JobQueue::instance()->
-                                globalStorage()->
-                                value( "defaultFileSystemType" ).toString();
+    QString defaultFsType = o.defaultFsType;
     if ( FileSystem::typeForName( defaultFsType ) == FileSystem::Unknown )
         defaultFsType = "ext4";
 
@@ -267,7 +260,7 @@ doReplacePartition( PartitionCoreModule* core,
     }
 
     Partition* newPartition = nullptr;
-    if ( luksPassphrase.isEmpty() )
+    if ( o.luksPassphrase.isEmpty() )
     {
         newPartition = KPMHelpers::createNewPartition(
             partition->parent(),
@@ -287,7 +280,7 @@ doReplacePartition( PartitionCoreModule* core,
             FileSystem::typeForName( defaultFsType ),
             partition->firstSector(),
             partition->lastSector(),
-            luksPassphrase
+            o.luksPassphrase
         );
     }
     PartitionInfo::setMountPoint( newPartition, "/" );
diff --git a/src/modules/partition/core/PartitionActions.h b/src/modules/partition/core/PartitionActions.h
index 8312d582b..5acf444fa 100644
--- a/src/modules/partition/core/PartitionActions.h
+++ b/src/modules/partition/core/PartitionActions.h
@@ -27,30 +27,6 @@ class Partition;
 
 namespace PartitionActions
 {
-
-/**
- * @brief doAutopartition sets up an autopartitioning operation on the given Device.
- * @param core a pointer to the PartitionCoreModule instance.
- * @param dev the device to wipe.
- * @param luksPassphrase the passphrase for LUKS encryption (optional, default is empty).
- */
-void doAutopartition( PartitionCoreModule* core,
-                      Device* dev,
-                      const QString& luksPassphrase = QString() );
-
-/**
- * @brief doReplacePartition sets up replace-partitioning with the given partition.
- * @param core a pointer to the PartitionCoreModule instance.
- * @param dev a pointer to the Device on which to replace a partition.
- * @param partition a pointer to the Partition to be replaced.
- * @param luksPassphrase the passphrase for LUKS encryption (optional, default is empty).
- * @note this function also takes care of requesting PCM to delete the partition.
- */
-void doReplacePartition( PartitionCoreModule* core,
-                         Device* dev,
-                         Partition* partition,
-                         const QString& luksPassphrase = QString() );
-
 /** @brief Namespace for enums
  *
  * This namespace houses non-class enums.....
@@ -66,7 +42,59 @@ namespace Choices
         FullSwap,   // ensureSuspendToDisk -- at least RAM size
         SwapFile    // use a file (if supported)
     };
+
+    struct ReplacePartitionOptions
+    {
+        QString defaultFsType;  // e.g. "ext4" or "btrfs"
+        QString luksPassphrase;  // optional
+
+        ReplacePartitionOptions( const QString& fs, const QString& luks )
+            : defaultFsType( fs )
+            , luksPassphrase( luks )
+        {
+        }
+    };
+
+    struct AutoPartitionOptions : ReplacePartitionOptions
+    {
+        QString efiPartitionMountPoint;  // optional, e.g. "/boot"
+        quint64 requiredSpaceB;  // estimated required space for root partition
+        SwapChoice swap;
+
+        AutoPartitionOptions( const QString& fs, const QString& luks, const QString& efi, qint64 r, SwapChoice s )
+            : ReplacePartitionOptions( fs, luks )
+            , efiPartitionMountPoint( efi )
+            , requiredSpaceB( r > 0 ? r : 0 )
+            , swap( s )
+        {
+        }
+    };
+
 }  // namespace Choices
+
+/**
+ * @brief doAutopartition sets up an autopartitioning operation on the given Device.
+ * @param core a pointer to the PartitionCoreModule instance.
+ * @param dev the device to wipe.
+ * @param options settings for autopartitioning.
+ */
+void doAutopartition( PartitionCoreModule* core,
+                      Device* dev,
+                      Choices::AutoPartitionOptions options );
+
+/**
+ * @brief doReplacePartition sets up replace-partitioning with the given partition.
+ * @param core a pointer to the PartitionCoreModule instance.
+ * @param dev a pointer to the Device on which to replace a partition.
+ * @param partition a pointer to the Partition to be replaced.
+ * @param options settings for partitioning (not all fields apply)
+ *
+ * @note this function also takes care of requesting PCM to delete the partition.
+ */
+void doReplacePartition( PartitionCoreModule* core,
+                         Device* dev,
+                         Partition* partition,
+                         Choices::ReplacePartitionOptions options );
 }  // namespace PartitionActions
 
 #endif // PARTITIONACTIONS_H
diff --git a/src/modules/partition/gui/ChoicePage.cpp b/src/modules/partition/gui/ChoicePage.cpp
index 82302ac4c..b5a2ce529 100644
--- a/src/modules/partition/gui/ChoicePage.cpp
+++ b/src/modules/partition/gui/ChoicePage.cpp
@@ -42,6 +42,7 @@
 #include "utils/CalamaresUtilsGui.h"
 #include "utils/Logger.h"
 #include "utils/Retranslator.h"
+#include "utils/Units.h"
 
 #include "Branding.h"
 #include "GlobalStorage.h"
@@ -417,30 +418,37 @@ ChoicePage::applyActionChoice( ChoicePage::InstallChoice choice )
     switch ( choice )
     {
     case Erase:
-        if ( m_core->isDirty() )
         {
-            ScanningDialog::run( QtConcurrent::run( [ = ]
-            {
-                QMutexLocker locker( &m_coreMutex );
-                m_core->revertDevice( selectedDevice() );
-            } ),
-            [ = ]
-            {
-                PartitionActions::doAutopartition( m_core,
-                                                   selectedDevice(),
-                                                   m_encryptWidget->passphrase() );
-                emit deviceChosen();
-            },
-            this );
-        }
-        else
-        {
-            PartitionActions::doAutopartition( m_core,
-                                               selectedDevice(),
-                                               m_encryptWidget->passphrase() );
-            emit deviceChosen();
-        }
+            auto gs = Calamares::JobQueue::instance()->globalStorage();
 
+            PartitionActions::Choices::AutoPartitionOptions options {
+                gs->value( "defaultFileSystemType" ).toString(),
+                m_encryptWidget->passphrase(),
+                gs->value( "efiSystemPartition" ).toString(),
+                CalamaresUtils::GiBtoBytes( gs->value( "requiredStorageGB" ).toDouble() ),
+                static_cast<PartitionActions::Choices::SwapChoice>( m_eraseSwapChoices->currentData().toInt() )
+            };
+
+            if ( m_core->isDirty() )
+            {
+                ScanningDialog::run( QtConcurrent::run( [ = ]
+                {
+                    QMutexLocker locker( &m_coreMutex );
+                    m_core->revertDevice( selectedDevice() );
+                } ),
+                [ = ]
+                {
+                    PartitionActions::doAutopartition( m_core, selectedDevice(), options );
+                    emit deviceChosen();
+                },
+                this );
+            }
+            else
+            {
+                PartitionActions::doAutopartition( m_core, selectedDevice(), options );
+                emit deviceChosen();
+            }
+        }
         break;
     case Replace:
         if ( m_core->isDirty() )
@@ -518,6 +526,7 @@ ChoicePage::doAlongsideSetupSplitter( const QModelIndex& current,
                                     ->value( "requiredStorageGB" )
                                     .toDouble();
 
+    // TODO: make this consistent
     qint64 requiredStorageB = qRound64( requiredStorageGB + 0.1 + 2.0 ) * 1024 * 1024 * 1024;
 
     m_afterPartitionSplitterWidget->setSplitPartition(
@@ -802,14 +811,19 @@ ChoicePage::doReplaceSelectedPartition( const QModelIndex& current )
                 if ( homePartitionPath->isEmpty() )
                     doReuseHomePartition = false;
 
-                PartitionActions::doReplacePartition( m_core,
-                                                      selectedDevice(),
-                                                      selectedPartition,
-                                                      m_encryptWidget->passphrase() );
+                Calamares::GlobalStorage* gs = Calamares::JobQueue::instance()->globalStorage();
+
+                PartitionActions::doReplacePartition(
+                    m_core,
+                    selectedDevice(),
+                    selectedPartition,
+                    {
+                        gs->value( "defaultFileSystemType" ).toString(),
+                        m_encryptWidget->passphrase()
+                    } );
                 Partition* homePartition = KPMHelpers::findPartitionByPath( { selectedDevice() },
                                                                             *homePartitionPath );
 
-                Calamares::GlobalStorage* gs = Calamares::JobQueue::instance()->globalStorage();
                 if ( homePartition && doReuseHomePartition )
                 {
                     PartitionInfo::setMountPoint( homePartition, "/home" );
diff --git a/src/modules/partition/gui/ReplaceWidget.cpp b/src/modules/partition/gui/ReplaceWidget.cpp
index 524932057..faedc03d4 100644
--- a/src/modules/partition/gui/ReplaceWidget.cpp
+++ b/src/modules/partition/gui/ReplaceWidget.cpp
@@ -85,6 +85,8 @@ ReplaceWidget::reset()
 void
 ReplaceWidget::applyChanges()
 {
+    auto gs = Calamares::JobQueue::instance()->globalStorage();
+
     PartitionModel* model = qobject_cast< PartitionModel* >( m_ui->partitionTreeView->model() );
     if ( model )
     {
@@ -93,7 +95,9 @@ ReplaceWidget::applyChanges()
         {
             Device* dev = model->device();
 
-            PartitionActions::doReplacePartition( m_core, dev, partition );
+            PartitionActions::doReplacePartition(
+                m_core, dev, partition,
+                { gs->value( "defaultFileSystemType" ).toString(), QString() } );
 
             if ( m_isEfi )
             {
@@ -102,17 +106,13 @@ ReplaceWidget::applyChanges()
                 {
                     PartitionInfo::setMountPoint(
                             efiSystemPartitions.first(),
-                            Calamares::JobQueue::instance()->
-                                globalStorage()->
-                                    value( "efiSystemPartition" ).toString() );
+                            gs->value( "efiSystemPartition" ).toString() );
                 }
                 else if ( efiSystemPartitions.count() > 1 )
                 {
                     PartitionInfo::setMountPoint(
                             efiSystemPartitions.at( m_ui->bootComboBox->currentIndex() ),
-                            Calamares::JobQueue::instance()->
-                                globalStorage()->
-                                    value( "efiSystemPartition" ).toString() );
+                            gs->value( "efiSystemPartition" ).toString() );
                 }
             }
 

From 2a61116b3ca7cfa558e65b366ccf8f121385d1af Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Mon, 8 Oct 2018 15:32:02 -0400
Subject: [PATCH 15/74] [partition] Disable swap choice for replace & alongside

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

diff --git a/src/modules/partition/gui/ChoicePage.cpp b/src/modules/partition/gui/ChoicePage.cpp
index 5b1577369..cc7819778 100644
--- a/src/modules/partition/gui/ChoicePage.cpp
+++ b/src/modules/partition/gui/ChoicePage.cpp
@@ -252,11 +252,13 @@ ChoicePage::setupChoices()
     m_eraseSwapChoices = createCombo( { SwapChoice::NoSwap, SwapChoice::SmallSwap, SwapChoice:: FullSwap } );
     m_eraseButton->addOptionsComboBox( m_eraseSwapChoices );
 
+#if 0
     m_replaceSwapChoices = createCombo( { SwapChoice::NoSwap, SwapChoice::ReuseSwap, SwapChoice::SmallSwap, SwapChoice::FullSwap } );
     m_replaceButton->addOptionsComboBox( m_replaceSwapChoices );
 
     m_alongsideSwapChoices = createCombo( { SwapChoice::NoSwap, SwapChoice::ReuseSwap, SwapChoice::SmallSwap, SwapChoice::FullSwap } );
     m_alongsideButton->addOptionsComboBox( m_alongsideSwapChoices );
+#endif
 
     m_itemsLayout->addWidget( m_alongsideButton );
     m_itemsLayout->addWidget( m_replaceButton );

From caa4b8ab53c8f26d8506d59b357b8fb7773ca147 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 9 Oct 2018 05:30:14 -0400
Subject: [PATCH 16/74] [partition] Document intention of new-style swap config

---
 .../partition/gui/PartitionViewStep.cpp       | 35 +++++++++------
 src/modules/partition/partition.conf          | 43 +++++++++++--------
 2 files changed, 49 insertions(+), 29 deletions(-)

diff --git a/src/modules/partition/gui/PartitionViewStep.cpp b/src/modules/partition/gui/PartitionViewStep.cpp
index 6ad1a6c77..608ca0d22 100644
--- a/src/modules/partition/gui/PartitionViewStep.cpp
+++ b/src/modules/partition/gui/PartitionViewStep.cpp
@@ -487,25 +487,36 @@ PartitionViewStep::setConfigurationMap( const QVariantMap& configurationMap )
         gs->insert( "efiSystemPartition", QStringLiteral( "/boot/efi" ) );
     }
 
+    // SWAP SETTINGS
+    //
+    // This is a bit convoluted because there's legacy settings to handle as well
+    // as the new-style list of choices, with mapping back-and-forth.
+    if ( configurationMap.contains( "userSwapChoices" ) &&
+        ( configurationMap.contains( "ensureSuspendToDisk" ) || configurationMap.contains( "neverCreateSwap" ) ) )
+        cError() << "Partition-module configuration mixes old- and new-style swap settings.";
+
+    bool ensureSuspendToDisk = true;
+    if ( configurationMap.contains( "ensureSuspendToDisk" ) )
+        cWarning() << "Partition-module setting *ensureSuspendToDisk* is deprecated.";
     if ( configurationMap.contains( "ensureSuspendToDisk" ) &&
          configurationMap.value( "ensureSuspendToDisk" ).type() == QVariant::Bool )
-    {
-        gs->insert( "ensureSuspendToDisk", configurationMap.value( "ensureSuspendToDisk" ).toBool() );
-    }
+        ensureSuspendToDisk = configurationMap.value( "ensureSuspendToDisk" ).toBool();
     else
-    {
-        gs->insert( "ensureSuspendToDisk", true );
-    }
+        ensureSuspendToDisk = true;
 
+    bool neverCreateSwap = false;
+    if ( configurationMap.contains( "neverCreateSwap" ) )
+        cWarning() << "Partition-module setting *neverCreateSwap* is deprecated.";
     if ( configurationMap.contains( "neverCreateSwap" ) &&
          configurationMap.value( "neverCreateSwap" ).type() == QVariant::Bool )
-    {
-        gs->insert( "neverCreateSwap", configurationMap.value( "neverCreateSwap" ).toBool() );
-    }
+        neverCreateSwap = configurationMap.value( "neverCreateSwap" ).toBool();
     else
-    {
-        gs->insert( "neverCreateSwap", false );
-    }
+        neverCreateSwap = false;
+
+    // These gs settings seem to be unused (in upstream Calamares) outside of
+    // the partition module itself.
+    gs->insert( "ensureSuspendToDisk", ensureSuspendToDisk );
+    gs->insert( "neverCreateSwap", neverCreateSwap );
 
     if ( configurationMap.contains( "drawNestedPartitions" ) &&
          configurationMap.value( "drawNestedPartitions" ).type() == QVariant::Bool )
diff --git a/src/modules/partition/partition.conf b/src/modules/partition/partition.conf
index 3e0ce5950..70d0ea17f 100644
--- a/src/modules/partition/partition.conf
+++ b/src/modules/partition/partition.conf
@@ -3,28 +3,37 @@
 # etc.) use just /boot.
 efiSystemPartition:     "/boot/efi"
 
-# Make sure an autogenerated swap partition is big enough for hibernation in
-# automated partitioning modes. Swap can be disabled through *neverCreateSwap*.
+# In autogenerated partitioning, allow the user to select a swap size?
+# If there is exactly one choice, no UI is presented, and the user
+# cannot make a choice -- this setting is used. If there is more than
+# one choice, a UI is presented.
 #
-#  - *neverCreateSwap* is true: no swap is created
-#  - *neverCreateSwap* is false (the default): swap is created, as follows:
-#    - *ensureSuspendToDisk* is true (default): Swap is always at least total
-#      memory size, and up to 4GiB RAM follows the rule-of-thumb 2 * memory;
+# Legacy settings *neverCreateSwap* and *ensureSuspendToDisk* correspond
+# to values of *userSwapChoices* as follows:
+#    - *neverCreateSwap* is true, means [none]
+#    - *neverCreateSwap* is false, *ensureSuspendToDisk* is false, [small]
+#    - *neverCreateSwap* is false, *ensureSuspendToDisk* is true, [suspend]
+#
+# Autogenerated swap sizes are as follows:
+#    - *suspend*: Swap is always at least total memory size,
+#      and up to 4GiB RAM follows the rule-of-thumb 2 * memory;
 #      from 4GiB to 8 GiB it stays steady at 8GiB, and over 8 GiB memory
 #      swap is the size of main memory.
-#    - *ensureSuspendToDisk* is false: Follows the rules above, but Swap is at
+#    - *small*: Follows the rules above, but Swap is at
 #      most 8GiB, and no more than 10% of available disk.
-#    In both cases, a fudge factor (usually 10% extra) is applied so that there
-#    is some space for administrative overhead (e.g. 8 GiB swap will allocate
-#    8.8GiB on disk in the end).
-#
-# Default is true.
-ensureSuspendToDisk:    true
+# In both cases, a fudge factor (usually 10% extra) is applied so that there
+# is some space for administrative overhead (e.g. 8 GiB swap will allocate
+# 8.8GiB on disk in the end).
+userSwapChoices:
+    - none      # Create no swap, use no swap
+    # - reuse     # Re-use existing swap, but don't create any
+    - small     # Up to 4GB
+    - suspend   # At least main memory size
+    # - file      # To swap file instead of partition (unsupported right now)
 
-# Never create swap partitions in automated partitioning modes.
-# If this is true, ensureSuspendToDisk is ignored.
-# Default is false.
-neverCreateSwap:        false
+# LEGACY SETTINGS (these will generate a warning)
+# ensureSuspendToDisk:    true
+# neverCreateSwap:        false
 
 # Correctly draw nested (e.g. logical) partitions as such.
 drawNestedPartitions:   false

From 3d543e9063000e4e40ccd2d01a2f008c58162dfb Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 9 Oct 2018 05:46:12 -0400
Subject: [PATCH 17/74] [partition] Refactor to use current config-reading
 methods

---
 .../partition/gui/PartitionViewStep.cpp       | 86 ++++---------------
 1 file changed, 18 insertions(+), 68 deletions(-)

diff --git a/src/modules/partition/gui/PartitionViewStep.cpp b/src/modules/partition/gui/PartitionViewStep.cpp
index 608ca0d22..9e8a120a7 100644
--- a/src/modules/partition/gui/PartitionViewStep.cpp
+++ b/src/modules/partition/gui/PartitionViewStep.cpp
@@ -476,16 +476,10 @@ PartitionViewStep::setConfigurationMap( const QVariantMap& configurationMap )
     // Copy the efiSystemPartition setting to the global storage. It is needed not only in
     // the EraseDiskPage, but also in the bootloader configuration modules (grub, bootloader).
     Calamares::GlobalStorage* gs = Calamares::JobQueue::instance()->globalStorage();
-    if ( configurationMap.contains( "efiSystemPartition" ) &&
-         configurationMap.value( "efiSystemPartition" ).type() == QVariant::String &&
-         !configurationMap.value( "efiSystemPartition" ).toString().isEmpty() )
-    {
-        gs->insert( "efiSystemPartition", configurationMap.value( "efiSystemPartition" ).toString() );
-    }
-    else
-    {
-        gs->insert( "efiSystemPartition", QStringLiteral( "/boot/efi" ) );
-    }
+    QString efiSP = CalamaresUtils::getString( configurationMap, "efiSystemPartition" );
+    if ( efiSP.isEmpty() )
+        efiSP = QStringLiteral( "/boot/efi" );
+    gs->insert( "efiSystemPartition", efiSP );
 
     // SWAP SETTINGS
     //
@@ -495,78 +489,34 @@ PartitionViewStep::setConfigurationMap( const QVariantMap& configurationMap )
         ( configurationMap.contains( "ensureSuspendToDisk" ) || configurationMap.contains( "neverCreateSwap" ) ) )
         cError() << "Partition-module configuration mixes old- and new-style swap settings.";
 
-    bool ensureSuspendToDisk = true;
     if ( configurationMap.contains( "ensureSuspendToDisk" ) )
         cWarning() << "Partition-module setting *ensureSuspendToDisk* is deprecated.";
-    if ( configurationMap.contains( "ensureSuspendToDisk" ) &&
-         configurationMap.value( "ensureSuspendToDisk" ).type() == QVariant::Bool )
-        ensureSuspendToDisk = configurationMap.value( "ensureSuspendToDisk" ).toBool();
-    else
-        ensureSuspendToDisk = true;
+    bool ensureSuspendToDisk = CalamaresUtils::getBool( configurationMap, "ensureSuspendToDisk", true );
 
-    bool neverCreateSwap = false;
     if ( configurationMap.contains( "neverCreateSwap" ) )
         cWarning() << "Partition-module setting *neverCreateSwap* is deprecated.";
-    if ( configurationMap.contains( "neverCreateSwap" ) &&
-         configurationMap.value( "neverCreateSwap" ).type() == QVariant::Bool )
-        neverCreateSwap = configurationMap.value( "neverCreateSwap" ).toBool();
-    else
-        neverCreateSwap = false;
+    bool neverCreateSwap = CalamaresUtils::getBool( configurationMap, "neverCreateSwap", false );
 
     // These gs settings seem to be unused (in upstream Calamares) outside of
     // the partition module itself.
     gs->insert( "ensureSuspendToDisk", ensureSuspendToDisk );
     gs->insert( "neverCreateSwap", neverCreateSwap );
 
-    if ( configurationMap.contains( "drawNestedPartitions" ) &&
-         configurationMap.value( "drawNestedPartitions" ).type() == QVariant::Bool )
-    {
-        gs->insert( "drawNestedPartitions",
-                    configurationMap.value( "drawNestedPartitions", false ).toBool() );
-    }
-    else
-    {
-        gs->insert( "drawNestedPartitions", false );
-    }
+    // OTHER SETTINGS
+    //
+    gs->insert( "drawNestedPartitions", CalamaresUtils::getBool( configurationMap, "drawNestedPartitions", false ) );
+    gs->insert( "alwaysShowPartitionLabels", CalamaresUtils::getBool( configurationMap, "alwaysShowPartitionLabels", true ) );
+    gs->insert( "enableLuksAutomatedPartitioning", CalamaresUtils::getBool( configurationMap, "enableLuksAutomatedPartitioning", true ) );
 
-    if ( configurationMap.contains( "alwaysShowPartitionLabels" ) &&
-         configurationMap.value( "alwaysShowPartitionLabels" ).type() == QVariant::Bool )
+    QString defaultFS = CalamaresUtils::getString( configurationMap, "defaultFileSystemType" );
+    if ( defaultFS.isEmpty() )
+        defaultFS = QStringLiteral( "ext4" );
+    if ( FileSystem::typeForName( defaultFS ) == FileSystem::Unknown )
     {
-        gs->insert( "alwaysShowPartitionLabels",
-                    configurationMap.value( "alwaysShowPartitionLabels", true ).toBool() );
-    }
-    else
-    {
-        gs->insert( "alwaysShowPartitionLabels", true );
-    }
-
-    if ( configurationMap.contains( "defaultFileSystemType" ) &&
-         configurationMap.value( "defaultFileSystemType" ).type() == QVariant::String &&
-         !configurationMap.value( "defaultFileSystemType" ).toString().isEmpty() )
-    {
-        QString typeString = configurationMap.value( "defaultFileSystemType" ).toString();
-        gs->insert( "defaultFileSystemType", typeString );
-        if ( FileSystem::typeForName( typeString ) == FileSystem::Unknown )
-        {
-            cWarning() << "bad default filesystem configuration for partition module. Reverting to ext4 as default.";
-            gs->insert( "defaultFileSystemType", "ext4" );
-        }
-    }
-    else
-    {
-        gs->insert( "defaultFileSystemType", QStringLiteral( "ext4" ) );
-    }
-
-    if ( configurationMap.contains( "enableLuksAutomatedPartitioning" ) &&
-         configurationMap.value( "enableLuksAutomatedPartitioning" ).type() == QVariant::Bool )
-    {
-        gs->insert( "enableLuksAutomatedPartitioning",
-                    configurationMap.value( "enableLuksAutomatedPartitioning" ).toBool() );
-    }
-    else
-    {
-        gs->insert( "enableLuksAutomatedPartitioning", true );
+        cWarning() << "Partition-module setting *defaultFileSystemType* is bad (" << defaultFS << ") using ext4.";
+        defaultFS = QStringLiteral( "ext4" );
     }
+    gs->insert( "defaultFileSystemType", defaultFS );
 
 
     // Now that we have the config, we load the PartitionCoreModule in the background

From c7645af358b548597def0d676e0a38b4b8dd4309 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Thu, 11 Oct 2018 06:27:39 -0400
Subject: [PATCH 18/74] [partition] Translate swap-choice-strings to enum

 - Handle legacy and modern config, mixed-configs,
 - Translate strings to enum values,
 - Default and warn as appropriate.
 - Doesn't **do** anything with the config, though.
---
 .../partition/gui/PartitionViewStep.cpp       | 65 ++++++++++++++++++-
 1 file changed, 64 insertions(+), 1 deletion(-)

diff --git a/src/modules/partition/gui/PartitionViewStep.cpp b/src/modules/partition/gui/PartitionViewStep.cpp
index 9e8a120a7..bfd52b35e 100644
--- a/src/modules/partition/gui/PartitionViewStep.cpp
+++ b/src/modules/partition/gui/PartitionViewStep.cpp
@@ -21,6 +21,7 @@
 #include "gui/PartitionViewStep.h"
 
 #include "core/DeviceModel.h"
+#include "core/PartitionActions.h"
 #include "core/PartitionCoreModule.h"
 #include "core/PartitionModel.h"
 #include "core/KPMHelpers.h"
@@ -470,6 +471,31 @@ PartitionViewStep::onLeave()
 }
 
 
+static PartitionActions::Choices::SwapChoice
+nameToChoice( QString name, bool& ok )
+{
+    ok = false;
+    name = name.toLower();
+
+    using namespace PartitionActions::Choices;
+
+    // Each return here first sets ok to true, returns enum value
+    if ( name == QStringLiteral( "none" ) )
+        return( ok=true, SwapChoice::NoSwap );
+    else if ( name == QStringLiteral( "small" ) )
+        return( ok=true, SwapChoice::SmallSwap);
+    else if ( name == QStringLiteral( "suspend" ) )
+        return( ok=true, SwapChoice::FullSwap );
+    else if ( name == QStringLiteral( "reuse" ) )
+        return( ok=true, SwapChoice::ReuseSwap );
+    else if ( name == QStringLiteral( "file" ) )
+        return( ok=true, SwapChoice::SwapFile );
+
+    ok = false;
+    return SwapChoice::NoSwap;
+}
+
+
 void
 PartitionViewStep::setConfigurationMap( const QVariantMap& configurationMap )
 {
@@ -497,6 +523,43 @@ PartitionViewStep::setConfigurationMap( const QVariantMap& configurationMap )
         cWarning() << "Partition-module setting *neverCreateSwap* is deprecated.";
     bool neverCreateSwap = CalamaresUtils::getBool( configurationMap, "neverCreateSwap", false );
 
+    QSet< PartitionActions::Choices::SwapChoice > choices;  // Available swap choices
+    if ( configurationMap.contains( "userSwapChoices" ) )
+    {
+        // We've already warned about overlapping settings with the
+        // legacy *ensureSuspendToDisk* and *neverCreateSwap*.
+        QStringList l = configurationMap[ "userSwapChoices" ].toStringList();
+
+        for ( const auto& item : l )
+        {
+            bool ok = false;
+            auto v = nameToChoice( item, ok );
+            if ( ok )
+                choices.insert( v );
+        }
+
+        if ( choices.isEmpty() )
+        {
+            cWarning() << "Partition-module configuration for *userSwapChoices* is empty:" << l;
+            choices.insert( PartitionActions::Choices::SwapChoice::FullSwap );
+        }
+
+        // suspend if it's one of the possible choices; suppress swap only if it's
+        // the **only** choice available.
+        ensureSuspendToDisk = choices.contains( PartitionActions::Choices::SwapChoice::FullSwap );
+        neverCreateSwap = ( choices.count() == 1 ) && choices.contains( PartitionActions::Choices::SwapChoice::NoSwap );
+    }
+    else
+    {
+        // Convert the legacy settings into a single setting for now.
+        if ( neverCreateSwap )
+            choices.insert( PartitionActions::Choices::SwapChoice::NoSwap );
+        else if ( ensureSuspendToDisk )
+            choices.insert( PartitionActions::Choices::SwapChoice::FullSwap );
+        else
+            choices.insert( PartitionActions::Choices::SwapChoice::SmallSwap );
+    }
+
     // These gs settings seem to be unused (in upstream Calamares) outside of
     // the partition module itself.
     gs->insert( "ensureSuspendToDisk", ensureSuspendToDisk );
@@ -524,7 +587,7 @@ PartitionViewStep::setConfigurationMap( const QVariantMap& configurationMap )
     // and remove the spinner.
     QFutureWatcher< void >* watcher = new QFutureWatcher< void >();
     connect( watcher, &QFutureWatcher< void >::finished,
-             this, [ this, watcher ]
+             this, [ this, watcher, choices ]
     {
         continueLoading();
         watcher->deleteLater();

From 417eeedd9f05c23c4817a904b243dc3d655a4c13 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Thu, 11 Oct 2018 06:35:45 -0400
Subject: [PATCH 19/74] [partition] Calamares is spaced-out enough without
 extra's

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

diff --git a/src/modules/partition/gui/ChoicePage.cpp b/src/modules/partition/gui/ChoicePage.cpp
index cc7819778..63bc9ea43 100644
--- a/src/modules/partition/gui/ChoicePage.cpp
+++ b/src/modules/partition/gui/ChoicePage.cpp
@@ -249,7 +249,7 @@ ChoicePage::setupChoices()
 
     // Fill up swap options
     // .. TODO: only if enabled in the config
-    m_eraseSwapChoices = createCombo( { SwapChoice::NoSwap, SwapChoice::SmallSwap, SwapChoice:: FullSwap } );
+    m_eraseSwapChoices = createCombo( { SwapChoice::NoSwap, SwapChoice::SmallSwap, SwapChoice::FullSwap } );
     m_eraseButton->addOptionsComboBox( m_eraseSwapChoices );
 
 #if 0

From 463b1441a58c5189b70702ab96721c57dcf50e87 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 6 Nov 2018 05:54:45 -0500
Subject: [PATCH 20/74] [partition] Be more verbose about default file-system
 settings

 - Log the type that is configured
 - Document that this is a delicate setting, case-sensitive and
   dependent on KPMCore.
---
 src/modules/partition/gui/PartitionViewStep.cpp | 2 ++
 src/modules/partition/partition.conf            | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/modules/partition/gui/PartitionViewStep.cpp b/src/modules/partition/gui/PartitionViewStep.cpp
index bfd52b35e..0fdc4480b 100644
--- a/src/modules/partition/gui/PartitionViewStep.cpp
+++ b/src/modules/partition/gui/PartitionViewStep.cpp
@@ -574,6 +574,8 @@ PartitionViewStep::setConfigurationMap( const QVariantMap& configurationMap )
     QString defaultFS = CalamaresUtils::getString( configurationMap, "defaultFileSystemType" );
     if ( defaultFS.isEmpty() )
         defaultFS = QStringLiteral( "ext4" );
+    else
+        cDebug() << "Partition-module setting *defaultFileSystemType*" << defaultFS;
     if ( FileSystem::typeForName( defaultFS ) == FileSystem::Unknown )
     {
         cWarning() << "Partition-module setting *defaultFileSystemType* is bad (" << defaultFS << ") using ext4.";
diff --git a/src/modules/partition/partition.conf b/src/modules/partition/partition.conf
index 70d0ea17f..229ffc32c 100644
--- a/src/modules/partition/partition.conf
+++ b/src/modules/partition/partition.conf
@@ -53,6 +53,8 @@ alwaysShowPartitionLabels: true
 #
 # Suggested values: ext2, ext3, ext4, reiser, xfs, jfs, btrfs
 # If nothing is specified, Calamares defaults to "ext4".
+#
+# Names are case-sensitive and defined by KPMCore.
 defaultFileSystemType:  "ext4"
 
 # Show/hide LUKS related functionality in automated partitioning modes.

From 97c9e5bdcd95166efbcc9a22045adc57b375394f Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 6 Nov 2018 06:22:02 -0500
Subject: [PATCH 21/74] [partition] Debug-log available file-system types

---
 src/modules/partition/gui/PartitionViewStep.cpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/modules/partition/gui/PartitionViewStep.cpp b/src/modules/partition/gui/PartitionViewStep.cpp
index 0fdc4480b..0152f8bec 100644
--- a/src/modules/partition/gui/PartitionViewStep.cpp
+++ b/src/modules/partition/gui/PartitionViewStep.cpp
@@ -580,6 +580,18 @@ PartitionViewStep::setConfigurationMap( const QVariantMap& configurationMap )
     {
         cWarning() << "Partition-module setting *defaultFileSystemType* is bad (" << defaultFS << ") using ext4.";
         defaultFS = QStringLiteral( "ext4" );
+#ifdef DEBUG_FILESYSTEMS
+        // This bit is for distro's debugging their settings, and shows
+        // all the strings that KPMCore is matching against for FS type.
+        {
+            Logger::CLog d( Logger::LOGDEBUG );
+            using TR = Logger::DebugRow< int, QString >;
+            const auto fstypes = FileSystem::types();
+            d << "Available types (" << fstypes.count() << ')';
+            for ( FileSystem::Type t : fstypes )
+                d << TR( static_cast<int>( t ), FileSystem::nameForType( t ) );
+        }
+#endif
     }
     gs->insert( "defaultFileSystemType", defaultFS );
 

From 9816b6951f5dc8cdcf2971e27a6e89c01363ccfc Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 6 Nov 2018 06:36:51 -0500
Subject: [PATCH 22/74] CMake: add debugging flags to compile in debug mode

---
 CMakeLists.txt | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4fb88420b..c4458c133 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -46,6 +46,7 @@ option( WITH_PYTHON "Enable Python modules API (requires Boost.Python)." ON )
 option( WITH_PYTHONQT "Enable next generation Python modules API (experimental, requires PythonQt)." ON )
 option( WITH_KF5Crash "Enable crash reporting with KCrash." ON )
 
+
 ### USE_*
 #
 # By convention, when there are multiple modules that implement similar
@@ -77,6 +78,7 @@ set( CALAMARES_VERSION_MINOR 2 )
 set( CALAMARES_VERSION_PATCH 3 )
 set( CALAMARES_VERSION_RC 1 )
 
+
 ### Transifex (languages) info
 #
 # complete = 100% translated,
@@ -142,6 +144,11 @@ set( CMAKE_CXX_STANDARD_REQUIRED ON )
 set( CMAKE_C_STANDARD 99 )
 set( CMAKE_C_STANDARD_REQUIRED ON )
 
+# Debugging flags
+set( CMAKE_CXX_FLAGS_DEBUG
+    "-DDEBUG_TIMEZONES -DDEBUG_FILESYSTEMS"
+    )
+
 set( CMAKE_C_FLAGS                  "${CMAKE_C_FLAGS} -Wall" )
 if( CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
     message( STATUS "Found Clang ${CMAKE_CXX_COMPILER_VERSION}, setting up Clang-specific compiler flags." )
@@ -175,7 +182,7 @@ if( CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
     set( SUPPRESS_3RDPARTY_WARNINGS "-Wno-everything" )
     set( SUPPRESS_BOOST_WARNINGS " -Wno-zero-as-null-pointer-constant -Wno-disabled-macro-expansion" )
 
-    set( CMAKE_CXX_FLAGS_DEBUG          "-g" )
+    set( CMAKE_CXX_FLAGS_DEBUG          "-g ${CMAKE_CXX_FLAGS_DEBUG}" )
     set( CMAKE_CXX_FLAGS_MINSIZEREL     "-Os -DNDEBUG" )
     set( CMAKE_CXX_FLAGS_RELEASE        "-O4 -DNDEBUG" )
     set( CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g" )

From 33540749b244cb741c3e890771b2363e5a6d5f99 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 6 Nov 2018 06:37:55 -0500
Subject: [PATCH 23/74] CI: switch to debug builds

---
 ci/travis-config.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ci/travis-config.sh b/ci/travis-config.sh
index 85e6a9790..260c4b78c 100644
--- a/ci/travis-config.sh
+++ b/ci/travis-config.sh
@@ -5,6 +5,7 @@
 # This file is sourced by travis.sh, and exports the variables
 # to the environment.
 CMAKE_ARGS="\
+  -DCMAKE_BUILD_TYPE=Debug \
   -DWEBVIEW_FORCE_WEBKIT=1 \
   -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
   -DWITH_PYTHONQT=OFF"

From b798c27bc43454f083b77c6cd312208be7c4de46 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Mon, 3 Dec 2018 16:28:40 +0100
Subject: [PATCH 24/74] [partition] Be more verbose while looking for fstab
 entries

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

diff --git a/src/modules/partition/core/PartUtils.cpp b/src/modules/partition/core/PartUtils.cpp
index 7dddec414..3ac17067b 100644
--- a/src/modules/partition/core/PartUtils.cpp
+++ b/src/modules/partition/core/PartUtils.cpp
@@ -177,6 +177,9 @@ lookForFstabEntries( const QString& partitionPath )
             mountOptions.append( "noload" );
     }
 
+    cDebug() << "Checking device" << partitionPath 
+        << "for fstab (fs=" << r.getOutput() << ')';
+
     FstabEntryList fstabEntries;
     QTemporaryDir mountsDir;
     mountsDir.setAutoRemove( false );
@@ -185,6 +188,9 @@ lookForFstabEntries( const QString& partitionPath )
     if ( !exit ) // if all is well
     {
         QFile fstabFile( mountsDir.path() + "/etc/fstab" );
+        
+        cDebug() << "  .. reading" << fstabFile.fileName();
+        
         if ( fstabFile.open( QIODevice::ReadOnly | QIODevice::Text ) )
         {
             const QStringList fstabLines = QString::fromLocal8Bit( fstabFile.readAll() )
@@ -193,12 +199,18 @@ lookForFstabEntries( const QString& partitionPath )
             for ( const QString& rawLine : fstabLines )
                 fstabEntries.append( FstabEntry::fromEtcFstab( rawLine ) );
             fstabFile.close();
+            cDebug() << "  .. got" << fstabEntries.count() << "lines.";
             std::remove_if( fstabEntries.begin(), fstabEntries.end(), [](const FstabEntry& x) { return !x.isValid(); } );
+            cDebug() << "  .. got" << fstabEntries.count() << "fstab entries.";
         }
+        else
+            cWarning() << "Could not read fstab from mounted fs";
 
         if ( QProcess::execute( "umount", { "-R", mountsDir.path() } ) )
             cWarning() << "Could not unmount" << mountsDir.path();
     }
+    else
+        cWarning() << "Could not mount existing fs";
 
     return fstabEntries;
 }

From 14c72824f030982363be7b076acb2b0fb1fc707e Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Mon, 3 Dec 2018 16:42:40 +0100
Subject: [PATCH 25/74] [partition] Be chatty when deciding a partition isn't
 resizable

---
 src/modules/partition/core/PartUtils.cpp | 27 +++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/src/modules/partition/core/PartUtils.cpp b/src/modules/partition/core/PartUtils.cpp
index 3ac17067b..d61064041 100644
--- a/src/modules/partition/core/PartUtils.cpp
+++ b/src/modules/partition/core/PartUtils.cpp
@@ -80,26 +80,47 @@ bool
 canBeResized( Partition* candidate )
 {
     if ( !candidate )
+    {
+        cDebug() << "Partition* is NULL";
         return false;
+    }
 
+    cDebug() << "Checking if" << candidate->partitionPath() << "can be resized.";
     if ( !candidate->fileSystem().supportGrow() ||
          !candidate->fileSystem().supportShrink() )
+    {
+        cDebug() << "  .. filesystem" << candidate->fileSystem().name()
+            << "does not support resize.";
         return false;
+    }
 
     if ( KPMHelpers::isPartitionFreeSpace( candidate ) )
+    {
+        cDebug() << "  .. partition is free space";
         return false;
+    }
 
     if ( candidate->isMounted() )
+    {
+        cDebug() << "  .. partition is mounted";
         return false;
+    }
 
     if ( candidate->roles().has( PartitionRole::Primary ) )
     {
         PartitionTable* table = dynamic_cast< PartitionTable* >( candidate->parent() );
         if ( !table )
+        {
+            cDebug() << "  .. no partition table found";
             return false;
+        }
 
         if ( table->numPrimaries() >= table->maxPrimaries() )
+        {
+            cDebug() << "  .. partition table already has" 
+                << table->maxPrimaries() << "primary partitions.";
             return false;
+        }
     }
 
     bool ok = false;
@@ -136,11 +157,10 @@ bool
 canBeResized( PartitionCoreModule* core, const QString& partitionPath )
 {
     //FIXME: check for max partitions count on DOS MBR
-    cDebug() << "checking if" << partitionPath << "can be resized.";
+    cDebug() << "Checking if" << partitionPath << "can be resized.";
     QString partitionWithOs = partitionPath;
     if ( partitionWithOs.startsWith( "/dev/" ) )
     {
-        cDebug() << partitionWithOs << "seems like a good path";
         DeviceModel* dm = core->deviceModel();
         for ( int i = 0; i < dm->rowCount(); ++i )
         {
@@ -148,10 +168,11 @@ canBeResized( PartitionCoreModule* core, const QString& partitionPath )
             Partition* candidate = KPMHelpers::findPartitionByPath( { dev }, partitionWithOs );
             if ( candidate )
             {
-                cDebug() << "found Partition* for" << partitionWithOs;
+                cDebug() << "  .. found Partition* for" << partitionWithOs;
                 return canBeResized( candidate );
             }
         }
+        cDebug() << "  .. no Partition* found for" << partitionWithOs;
     }
 
     cDebug() << "Partition" << partitionWithOs << "CANNOT BE RESIZED FOR AUTOINSTALL.";

From a0766a6895658f33b8bd9c0a710f9cf0bad0a71f Mon Sep 17 00:00:00 2001
From: Calamares CI <groot@kde.org>
Date: Mon, 3 Dec 2018 21:09:29 +0100
Subject: [PATCH 26/74] i18n: [calamares] Automatic merge of Transifex
 translations

---
 lang/calamares_de.ts | 2 +-
 lang/calamares_ru.ts | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lang/calamares_de.ts b/lang/calamares_de.ts
index dde1796be..ea9421a7b 100644
--- a/lang/calamares_de.ts
+++ b/lang/calamares_de.ts
@@ -2746,7 +2746,7 @@ Ausgabe:
     <message>
         <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="56"/>
         <source>Physical Extent Size:</source>
-        <translation type="unfinished"/>
+        <translation>Größe der Körpergröße:</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="66"/>
diff --git a/lang/calamares_ru.ts b/lang/calamares_ru.ts
index 18740e526..6862e400d 100644
--- a/lang/calamares_ru.ts
+++ b/lang/calamares_ru.ts
@@ -821,7 +821,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/modules/partition/core/DeviceModel.cpp" line="89"/>
         <source>%1 - (%2)</source>
-        <translation type="unfinished"/>
+        <translation>%1 - (%2)</translation>
     </message>
 </context>
 <context>
@@ -1724,7 +1724,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/modules/partition/gui/PartitionPage.ui" line="132"/>
         <source>New Volume Group</source>
-        <translation type="unfinished"/>
+        <translation>Новая группа томов</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/PartitionPage.ui" line="139"/>

From e485f057d52279b1eb95a911629f27e3856c6d3a Mon Sep 17 00:00:00 2001
From: Calamares CI <groot@kde.org>
Date: Mon, 3 Dec 2018 21:09:29 +0100
Subject: [PATCH 27/74] i18n: [desktop] Automatic merge of Transifex
 translations

---
 calamares.desktop | 158 +++++++++++++++++++++++-----------------------
 1 file changed, 79 insertions(+), 79 deletions(-)

diff --git a/calamares.desktop b/calamares.desktop
index ca766ec81..b4c3a2693 100644
--- a/calamares.desktop
+++ b/calamares.desktop
@@ -14,168 +14,168 @@ Categories=Qt;System;
 X-AppStream-Ignore=true
 
 Name[ar]=نظام التثبيت
-Comment[be]=Calamares — усталёўшчык сістэмы
-Icon[be]=calamares
 Name[be]=Усталяваць сістэму
+Icon[be]=calamares
 GenericName[be]=Усталёўшчык сістэмы
-Comment[bg]=Calamares — Системен Инсталатор
-Icon[bg]=calamares
+Comment[be]=Calamares — усталёўшчык сістэмы
 Name[bg]=Инсталирай системата
+Icon[bg]=calamares
 GenericName[bg]=Системен Инсталатор
-Comment[ca]=Calamares — Instal·lador de sistema
-Icon[ca]=calamares
+Comment[bg]=Calamares — Системен Инсталатор
 Name[ca]=Instal·la el sistema
+Icon[ca]=calamares
 GenericName[ca]=Instal·lador de sistema
-Comment[da]=Calamares — Systeminstallationsprogram
-Icon[da]=calamares
+Comment[ca]=Calamares — Instal·lador de sistema
 Name[da]=Installér system
+Icon[da]=calamares
 GenericName[da]=Systeminstallationsprogram
-Comment[de]=Calamares - Installation des Betriebssystems
-Icon[de]=calamares
+Comment[da]=Calamares — Systeminstallationsprogram
 Name[de]=System installieren
+Icon[de]=calamares
 GenericName[de]=Installation des Betriebssystems
-Comment[el]=Calamares — Εγκατάσταση συστήματος
-Icon[el]=calamares
+Comment[de]=Calamares - Installation des Betriebssystems
 Name[el]=Εγκατάσταση συστήματος
+Icon[el]=calamares
 GenericName[el]=Εγκατάσταση συστήματος
-Comment[en_GB]=Calamares — System Installer
-Icon[en_GB]=calamares
+Comment[el]=Calamares — Εγκατάσταση συστήματος
 Name[en_GB]=Install System
+Icon[en_GB]=calamares
 GenericName[en_GB]=System Installer
-Comment[es]=Calamares — Instalador del Sistema
-Icon[es]=calamares
+Comment[en_GB]=Calamares — System Installer
 Name[es]=Instalar Sistema
+Icon[es]=calamares
 GenericName[es]=Instalador del Sistema
-Comment[et]=Calamares — süsteemipaigaldaja
-Icon[et]=calamares
+Comment[es]=Calamares — Instalador del Sistema
 Name[et]=Paigalda süsteem
+Icon[et]=calamares
 GenericName[et]=Süsteemipaigaldaja
+Comment[et]=Calamares — süsteemipaigaldaja
 Name[eu]=Sistema instalatu
 Name[es_PR]=Instalar el sistema
-Comment[fr]=Calamares - Installateur système
-Icon[fr]=calamares
 Name[fr]=Installer le système
+Icon[fr]=calamares
 GenericName[fr]=Installateur système
-Comment[gl]=Calamares — Instalador de sistemas
-Icon[gl]=calamares
+Comment[fr]=Calamares - Installateur système
 Name[gl]=Instalación do Sistema
+Icon[gl]=calamares
 GenericName[gl]=Instalador de sistemas
-Comment[he]=Calamares - אשף התקנה
-Icon[he]=calamares
+Comment[gl]=Calamares — Instalador de sistemas
 Name[he]=התקנת מערכת
+Icon[he]=calamares
 GenericName[he]=אשף התקנה
-Comment[hi]=Calamares — सिस्टम इंस्टॉलर
-Icon[hi]=calamares
+Comment[he]=Calamares - אשף התקנה
 Name[hi]=सिस्टम इंस्टॉल करें
+Icon[hi]=calamares
 GenericName[hi]=सिस्टम इंस्टॉलर
-Comment[hr]=Calamares — Instalacija sustava
-Icon[hr]=calamares
+Comment[hi]=Calamares — सिस्टम इंस्टॉलर
 Name[hr]=Instaliraj sustav
+Icon[hr]=calamares
 GenericName[hr]=Instalacija sustava
-Comment[hu]=Calamares – Rendszertelepítő
-Icon[hu]=calamares
+Comment[hr]=Calamares — Instalacija sustava
 Name[hu]=Rendszer telepítése
+Icon[hu]=calamares
 GenericName[hu]=Rendszertelepítő
-Comment[id]=Calamares — Pemasang Sistem
-Icon[id]=calamares
+Comment[hu]=Calamares – Rendszertelepítő
 Name[id]=Instal Sistem
+Icon[id]=calamares
 GenericName[id]=Pemasang
-Comment[is]=Calamares — Kerfis uppsetning
-Icon[is]=calamares
+Comment[id]=Calamares — Pemasang Sistem
 Name[is]=Setja upp kerfið
+Icon[is]=calamares
 GenericName[is]=Kerfis uppsetning
-Comment[cs_CZ]=Calamares – instalátor operačních systémů
-Icon[cs_CZ]=calamares
+Comment[is]=Calamares — Kerfis uppsetning
 Name[cs_CZ]=Nainstalovat
+Icon[cs_CZ]=calamares
 GenericName[cs_CZ]=Instalátor systému
-Comment[ja]=Calamares — システムインストーラー
-Icon[ja]=calamares
+Comment[cs_CZ]=Calamares – instalátor operačních systémů
 Name[ja]=システムをインストール
+Icon[ja]=calamares
 GenericName[ja]=システムインストーラー
-Comment[ko]=깔라마레스 — 시스템 설치 관리자
-Icon[ko]=깔라마레스
+Comment[ja]=Calamares — システムインストーラー
 Name[ko]=시스템 설치
+Icon[ko]=깔라마레스
 GenericName[ko]=시스템 설치 관리자
-Comment[lt]=Calamares — Sistemos diegimo programa
-Icon[lt]=calamares
+Comment[ko]=깔라마레스 — 시스템 설치 관리자
 Name[lt]=Įdiegti Sistemą
+Icon[lt]=calamares
 GenericName[lt]=Sistemos diegimas į kompiuterį
-Comment[it_IT]=Calamares — Programma d'installazione del sistema
-Icon[it_IT]=calamares
+Comment[lt]=Calamares — Sistemos diegimo programa
 Name[it_IT]=Installa il sistema
+Icon[it_IT]=calamares
 GenericName[it_IT]=Programma d'installazione del sistema
-Comment[nb]=Calamares-systeminstallatør
-Icon[nb]=calamares
+Comment[it_IT]=Calamares — Programma d'installazione del sistema
 Name[nb]=Installer System
+Icon[nb]=calamares
 GenericName[nb]=Systeminstallatør
-Comment[nl]=Calamares — Installatieprogramma
-Icon[nl]=calamares
+Comment[nb]=Calamares-systeminstallatør
 Name[nl]=Installeer systeem
+Icon[nl]=calamares
 GenericName[nl]=Installatieprogramma
-Comment[pl]=Calamares — Instalator systemu
-Icon[pl]=calamares
+Comment[nl]=Calamares — Installatieprogramma
 Name[pl]=Zainstaluj system
+Icon[pl]=calamares
 GenericName[pl]=Instalator systemu
-Comment[pt_BR]=Calamares — Instalador de Sistema
-Icon[pt_BR]=calamares
+Comment[pl]=Calamares — Instalator systemu
 Name[pt_BR]=Sistema de Instalação
+Icon[pt_BR]=calamares
 GenericName[pt_BR]=Instalador de Sistema
-Comment[ro]=Calamares — Instalator de sistem
-Icon[ro]=calamares
+Comment[pt_BR]=Calamares — Instalador de Sistema
 Name[ro]=Instalează sistemul
+Icon[ro]=calamares
 GenericName[ro]=Instalator de sistem
-Comment[ru]=Calamares - Установщик системы
-Icon[ru]=calamares
+Comment[ro]=Calamares — Instalator de sistem
 Name[ru]=Установить систему
+Icon[ru]=calamares
 GenericName[ru]=Установщик системы
-Comment[sk]=Calamares — Inštalátor systému
-Icon[sk]=calamares
+Comment[ru]=Calamares - Установщик системы
 Name[sk]=Inštalovať systém
+Icon[sk]=calamares
 GenericName[sk]=Inštalátor systému
+Comment[sk]=Calamares — Inštalátor systému
 Name[sl]=Namesti sistem
-Comment[sq]=Calamares — Instalues Sistemi
-Icon[sq]=calamares
 Name[sq]=Instalo Sistemin
+Icon[sq]=calamares
 GenericName[sq]=Instalues Sistemi
-Comment[fi_FI]=Calamares — Järjestelmän Asentaja
-Icon[fi_FI]=calamares
+Comment[sq]=Calamares — Instalues Sistemi
 Name[fi_FI]=Asenna Järjestelmä
+Icon[fi_FI]=calamares
 GenericName[fi_FI]=Järjestelmän Asennusohjelma
+Comment[fi_FI]=Calamares — Järjestelmän Asentaja
 Name[sr@latin]=Instaliraj sistem
 Name[sr]=Инсталирај систем
-Comment[sv]=Calamares — Systeminstallerare
-Icon[sv]=calamares
 Name[sv]=Installera system
+Icon[sv]=calamares
 GenericName[sv]=Systeminstallerare
+Comment[sv]=Calamares — Systeminstallerare
 Name[th]=ติดตั้งระบบ
-Comment[uk]=Calamares - Встановлювач системи
 Name[uk]=Встановити Систему
 GenericName[uk]=Встановлювач системи
-Comment[zh_CN]=Calamares — 系统安装程序
-Icon[zh_CN]=calamares
+Comment[uk]=Calamares - Встановлювач системи
 Name[zh_CN]=安装系统
+Icon[zh_CN]=calamares
 GenericName[zh_CN]=系统安装程序
-Comment[zh_TW]=Calamares ── 系統安裝程式
-Icon[zh_TW]=calamares
+Comment[zh_CN]=Calamares — 系统安装程序
 Name[zh_TW]=安裝系統
+Icon[zh_TW]=calamares
 GenericName[zh_TW]=系統安裝程式
-Comment[ast]=Calamares — Instalador del sistema
-Icon[ast]=calamares
+Comment[zh_TW]=Calamares ── 系統安裝程式
 Name[ast]=Instalar sistema
+Icon[ast]=calamares
 GenericName[ast]=Instalador del sistema
-Comment[eo]=Calamares — Sistema Instalilo
-Icon[eo]=calamares
+Comment[ast]=Calamares — Instalador del sistema
 Name[eo]=Instali Sistemo
+Icon[eo]=calamares
 GenericName[eo]=Sistema Instalilo
-Comment[es_MX]=Calamares - Instalador del sistema
-Icon[es_MX]=calamares
+Comment[eo]=Calamares — Sistema Instalilo
 Name[es_MX]=Instalar el Sistema
+Icon[es_MX]=calamares
 GenericName[es_MX]=Instalador del sistema
-Comment[pt_PT]=Calamares - Instalador de Sistema
-Icon[pt_PT]=calamares
+Comment[es_MX]=Calamares - Instalador del sistema
 Name[pt_PT]=Instalar Sistema
+Icon[pt_PT]=calamares
 GenericName[pt_PT]=Instalador de Sistema
-Comment[tr_TR]=Calamares — Sistem Yükleyici
-Icon[tr_TR]=calamares
+Comment[pt_PT]=Calamares - Instalador de Sistema
 Name[tr_TR]=Sistemi Yükle
+Icon[tr_TR]=calamares
 GenericName[tr_TR]=Sistem Yükleyici
+Comment[tr_TR]=Calamares — Sistem Yükleyici

From 6ac872e7240dbe64411171865d2074b3b6ca4861 Mon Sep 17 00:00:00 2001
From: Calamares CI <groot@kde.org>
Date: Mon, 3 Dec 2018 21:09:30 +0100
Subject: [PATCH 28/74] i18n: [dummypythonqt] Automatic merge of Transifex
 translations

---
 .../lang/fr/LC_MESSAGES/dummypythonqt.mo        | Bin 972 -> 977 bytes
 .../lang/fr/LC_MESSAGES/dummypythonqt.po        |   4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/modules/dummypythonqt/lang/fr/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/fr/LC_MESSAGES/dummypythonqt.mo
index 45d8fc355cbf8ecdbff4d714acd3680e51a8a761..c309c24d636d241917cb95391d0ede31cff84c73 100644
GIT binary patch
delta 76
zcmX@Zevy4bi0LXu28IM67Ghvv;AUoEFb2|cK$-_g2LWkGARP~+#esAskhTZX6E}AD
SF|rjD<(K5=ZI)o#!UzDK`wVvg

delta 71
zcmcb}eujNQi0M*B28IM67GhvvU}I)rFb2|+K$-_g`vPf6ARPsy#esAQkhTZXJsUgw
N7#Y(y%Q9_Y1OQxF3K;+Z

diff --git a/src/modules/dummypythonqt/lang/fr/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/fr/LC_MESSAGES/dummypythonqt.po
index 082109871..fe75d0c55 100644
--- a/src/modules/dummypythonqt/lang/fr/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/fr/LC_MESSAGES/dummypythonqt.po
@@ -5,7 +5,7 @@
 # 
 # Translators:
 # Paul Combal <abonnementspaul@gmail.com>, 2017
-# Aestan <anthony.margerand@gmail.com>, 2018
+# Aestan <anthony.margerand@protonmail.com>, 2018
 # 
 #, fuzzy
 msgid ""
@@ -14,7 +14,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-10-05 11:34-0400\n"
 "PO-Revision-Date: 2016-12-16 12:18+0000\n"
-"Last-Translator: Aestan <anthony.margerand@gmail.com>, 2018\n"
+"Last-Translator: Aestan <anthony.margerand@protonmail.com>, 2018\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"

From dc92415ae0724321049863d7ac5ec42f7ae7350c Mon Sep 17 00:00:00 2001
From: Calamares CI <groot@kde.org>
Date: Mon, 3 Dec 2018 21:09:30 +0100
Subject: [PATCH 29/74] i18n: [python] Automatic merge of Transifex
 translations

---
 lang/python/fr/LC_MESSAGES/python.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lang/python/fr/LC_MESSAGES/python.po b/lang/python/fr/LC_MESSAGES/python.po
index c1c4af1ef..d869f977d 100644
--- a/lang/python/fr/LC_MESSAGES/python.po
+++ b/lang/python/fr/LC_MESSAGES/python.po
@@ -6,7 +6,7 @@
 # Translators:
 # Paul Combal <abonnementspaul@gmail.com>, 2017
 # Abdallah B <bahassinea@gmail.com>, 2017
-# Aestan <anthony.margerand@gmail.com>, 2018
+# Aestan <anthony.margerand@protonmail.com>, 2018
 # Jeremy Gourmel <jgourmel@free.fr>, 2018
 # 
 #, fuzzy

From b8595a1323b7826744b99ad6d2e94f682bd16794 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Mon, 3 Dec 2018 21:44:29 +0100
Subject: [PATCH 30/74] CMake: relax debugging flags again

---
 CMakeLists.txt | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c4458c133..faaab2283 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -145,9 +145,24 @@ set( CMAKE_C_STANDARD 99 )
 set( CMAKE_C_STANDARD_REQUIRED ON )
 
 # Debugging flags
-set( CMAKE_CXX_FLAGS_DEBUG
-    "-DDEBUG_TIMEZONES -DDEBUG_FILESYSTEMS"
-    )
+#
+# Possible debugging flags are:
+#  - DEBUG_TIMEZONES draws latitude and longitude lines on the timezone
+#    widget and enables chatty debug logging, for dealing with the timezone
+#    location database.
+#  - DEBUG_FILESYSTEMS does extra logging and checking when looking at
+#    partition configuration. Lists known KPMCore FS types.
+# 
+# The flags listed here are enabled in Debug builds. By default, none
+# are **actually** listed, because they're for such specific scenarios.
+set( _enable_debug_flags
+    # DEBUG_TIMEZONES
+    # DEBUG_FILESYSTEMS
+)
+# Add those flags to the CXX flags in a suitable format.
+foreach( _edf ${_enable_debug_flags} )
+    string( APPEND CMAKE_CXX_FLAGS_DEBUG " -D${_edf}" )
+endforeach()
 
 set( CMAKE_C_FLAGS                  "${CMAKE_C_FLAGS} -Wall" )
 if( CMAKE_CXX_COMPILER_ID MATCHES "Clang" )

From d7f0a1b93781fa77bcec0ea9dd1c3f90512c072b Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 11 Dec 2018 13:55:31 +0100
Subject: [PATCH 31/74] [lang] Xml could be option, this is developer tooling
 after all

---
 lang/CMakeLists.txt | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/lang/CMakeLists.txt b/lang/CMakeLists.txt
index 65c0c4ca2..37ea8356c 100644
--- a/lang/CMakeLists.txt
+++ b/lang/CMakeLists.txt
@@ -18,7 +18,8 @@
 #
 ###
 
-find_package( Qt5 ${QT_VERSION} CONFIG REQUIRED Xml )
-
-add_executable(txload txload.cpp)
-target_link_libraries(txload Qt5::Xml)
+find_package(Qt5 COMPONENTS Xml)
+if( Qt5Xml_FOUND )
+    add_executable(txload txload.cpp)
+    target_link_libraries(txload Qt5::Xml)
+endif()

From 33c5baa9f31bef11ac62ccf230ad410b17c509b9 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 11 Dec 2018 14:03:18 +0100
Subject: [PATCH 32/74] [lang] Add usage information

 - This developer tool was originally committed with a not-useful
   commit message, no usage info, and no documentation. Bad [ade].
---
 lang/txload.cpp | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/lang/txload.cpp b/lang/txload.cpp
index 51b9dacb1..36e0f71a2 100644
--- a/lang/txload.cpp
+++ b/lang/txload.cpp
@@ -16,6 +16,11 @@
  *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
  */
 
+/*
+ * Tool to find differences between translations (can be used to help
+ * merging them into one). See usage string, below, for details.
+ */
+
 #include <QCoreApplication>
 #include <QDebug>
 #include <QFile>
@@ -23,6 +28,16 @@
 
 #include <QDomDocument>
 
+static const char usage[] = "Usage: txload <master> [<subsidiary> ...]\n"
+    "\n"
+    "Reads a .ts source file <master> and zero or more .ts <subsidiary>\n"
+    "files, and does a comparison between the translations. Source (English)\n"
+    "strings that are untranslated are flagged in each of the translation\n"
+    "files, while differences in the translations are themselves also shown.\n"
+    "\n"
+    "Outputs to stdout a human-readable list of differences between the\n"
+    "translations.\n";
+
 bool load_file(const char* filename, QDomDocument& doc)
 {
     QFile file(filename);
@@ -158,7 +173,10 @@ int main(int argc, char** argv)
     QCoreApplication a(argc, argv);
 
     if (argc < 2)
+    {
+        qWarning() << usage;
         return 1;
+    }
 
     QDomDocument doc("master");
     if ( !load_file(argv[1], doc) )

From 19617fc42dbfd0fb43efada69470bd6a8c4a4750 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 11 Dec 2018 14:23:23 +0100
Subject: [PATCH 33/74] CI: more debugging due to disk-space problems

---
 ci/travis-continuous.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ci/travis-continuous.sh b/ci/travis-continuous.sh
index 1b3841e54..afa46e16c 100755
--- a/ci/travis-continuous.sh
+++ b/ci/travis-continuous.sh
@@ -15,9 +15,11 @@ cd $BUILDDIR || exit 1
 echo "###"
 echo "### cmake $CMAKE_ARGS $SRCDIR"
 echo "###"
+df -h
 cmake $CMAKE_ARGS $SRCDIR || { echo "! CMake failed" ; exit 1 ; }
 
 echo -e "###\n### make\n###"
+df -h
 make -j2 || { make -j1 VERBOSE=1 ; echo "! Make failed" ; exit 1 ; }
 
 echo -e "###\n### make install\n###"

From c4b5360d911e30adabe4c259c4629d2c1fae1b08 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 11 Dec 2018 14:53:06 +0100
Subject: [PATCH 34/74] CI: more debugging due to disk-space problems

---
 ci/travis-continuous.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ci/travis-continuous.sh b/ci/travis-continuous.sh
index afa46e16c..4ecd7159b 100755
--- a/ci/travis-continuous.sh
+++ b/ci/travis-continuous.sh
@@ -15,12 +15,13 @@ cd $BUILDDIR || exit 1
 echo "###"
 echo "### cmake $CMAKE_ARGS $SRCDIR"
 echo "###"
+pwd -P
 df -h
 cmake $CMAKE_ARGS $SRCDIR || { echo "! CMake failed" ; exit 1 ; }
 
 echo -e "###\n### make\n###"
 df -h
-make -j2 || { make -j1 VERBOSE=1 ; echo "! Make failed" ; exit 1 ; }
+make -j2 || { pwd -P ; df -h ; make -j1 VERBOSE=1 ; echo "! Make failed" ; exit 1 ; }
 
 echo -e "###\n### make install\n###"
 

From 59e30e3cdb964bca617e53bff4b94e44c49f38aa Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 11 Dec 2018 15:25:39 +0100
Subject: [PATCH 35/74] CI: yet another attempt to debug the disk-space
 failures

---
 ci/travis-continuous.sh | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/ci/travis-continuous.sh b/ci/travis-continuous.sh
index 4ecd7159b..aefaca6f8 100755
--- a/ci/travis-continuous.sh
+++ b/ci/travis-continuous.sh
@@ -12,26 +12,26 @@ test -f $SRCDIR/CMakeLists.txt || { echo "! Missing $SRCDIR/CMakeLists.txt" ; ex
 
 cd $BUILDDIR || exit 1
 
+section() {
 echo "###"
-echo "### cmake $CMAKE_ARGS $SRCDIR"
+echo "### $1"
 echo "###"
 pwd -P
 df -h
+}
+
+section "cmake $CMAKE_ARGS $SRCDIR"
 cmake $CMAKE_ARGS $SRCDIR || { echo "! CMake failed" ; exit 1 ; }
 
-echo -e "###\n### make\n###"
-df -h
-make -j2 || { pwd -P ; df -h ; make -j1 VERBOSE=1 ; echo "! Make failed" ; exit 1 ; }
+section "make"
+make -j2 || { echo "! Make recheck" ; pwd -P ; df -h ; make -j1 VERBOSE=1 ; echo "! Make failed" ; exit 1 ; }
 
-echo -e "###\n### make install\n###"
+section "make install"
 
 install_debugging() {
 	ls -la $( find "$1" -type f -name '*.so' )
 }
 
-echo "# System status"
-df -h
-
 echo "# Build results"
 install_debugging "$BUILDDIR"
 
@@ -48,10 +48,8 @@ else
 	result=false
 fi
 
-echo "# System status"
-df -h
 
-echo "# Install results"
+section "Install results"
 install_debugging "$DESTDIR"
 
 $result || { echo "! Install failed" ; exit 1 ; } # Result of make install, above

From 6798d613d87536d216e2e13752ebc9413d8a813e Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 11 Dec 2018 15:40:02 +0100
Subject: [PATCH 36/74] CI: guess that debug builds are way too big for Travis

---
 ci/travis-config.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/travis-config.sh b/ci/travis-config.sh
index 260c4b78c..565b3deba 100644
--- a/ci/travis-config.sh
+++ b/ci/travis-config.sh
@@ -5,7 +5,7 @@
 # This file is sourced by travis.sh, and exports the variables
 # to the environment.
 CMAKE_ARGS="\
-  -DCMAKE_BUILD_TYPE=Debug \
+  -DCMAKE_BUILD_TYPE=Release \
   -DWEBVIEW_FORCE_WEBKIT=1 \
   -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
   -DWITH_PYTHONQT=OFF"

From 1321ba15252a6304e504b901cacc98feb38e898d Mon Sep 17 00:00:00 2001
From: Calamares CI <groot@kde.org>
Date: Tue, 11 Dec 2018 19:31:21 +0100
Subject: [PATCH 37/74] i18n: [calamares] Automatic merge of Transifex
 translations

---
 lang/calamares_bg.ts |    2 +-
 lang/calamares_es.ts |   38 +-
 lang/calamares_id.ts |  206 +--
 lang/calamares_is.ts |   30 +-
 lang/calamares_ja.ts |    2 +-
 lang/calamares_mk.ts | 2847 ++++++++++++++++++++++++++++++++++++++++++
 lang/calamares_ru.ts |   41 +-
 7 files changed, 3007 insertions(+), 159 deletions(-)
 create mode 100644 lang/calamares_mk.ts

diff --git a/lang/calamares_bg.ts b/lang/calamares_bg.ts
index 2a69a9ef6..55a48e1a8 100644
--- a/lang/calamares_bg.ts
+++ b/lang/calamares_bg.ts
@@ -2774,7 +2774,7 @@ Output:
     <message>
         <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="122"/>
         <source>Total Sectors:</source>
-        <translation type="unfinished"/>
+        <translation>Общо сектори:</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="142"/>
diff --git a/lang/calamares_es.ts b/lang/calamares_es.ts
index 17c5cbde8..42c359fef 100644
--- a/lang/calamares_es.ts
+++ b/lang/calamares_es.ts
@@ -720,22 +720,22 @@ Saldrá del instalador y se perderán todos los cambios.</translation>
     <message>
         <location filename="../src/modules/partition/jobs/CreateVolumeGroupJob.cpp" line="38"/>
         <source>Create new volume group named %1.</source>
-        <translation type="unfinished"/>
+        <translation>Crear un nuevo grupo de volúmenes llamado %1.</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/jobs/CreateVolumeGroupJob.cpp" line="45"/>
         <source>Create new volume group named &lt;strong&gt;%1&lt;/strong&gt;.</source>
-        <translation type="unfinished"/>
+        <translation>Crear un nuevo grupo de volúmenes llamado &lt;strong&gt;%1&lt;/strong&gt;.</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/jobs/CreateVolumeGroupJob.cpp" line="52"/>
         <source>Creating new volume group named %1.</source>
-        <translation type="unfinished"/>
+        <translation>Creando un nuevo grupo de volúmenes llamado %1.</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/jobs/CreateVolumeGroupJob.cpp" line="65"/>
         <source>The installer failed to create a volume group named &apos;%1&apos;.</source>
-        <translation type="unfinished"/>
+        <translation>El instalador falló en crear un grupo de volúmenes llamado &apos;%1&apos;.</translation>
     </message>
 </context>
 <context>
@@ -744,17 +744,17 @@ Saldrá del instalador y se perderán todos los cambios.</translation>
         <location filename="../src/modules/partition/jobs/DeactivateVolumeGroupJob.cpp" line="34"/>
         <location filename="../src/modules/partition/jobs/DeactivateVolumeGroupJob.cpp" line="48"/>
         <source>Deactivate volume group named %1.</source>
-        <translation type="unfinished"/>
+        <translation>Desactivar grupo de volúmenes llamado %1.</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/jobs/DeactivateVolumeGroupJob.cpp" line="41"/>
         <source>Deactivate volume group named &lt;strong&gt;%1&lt;/strong&gt;.</source>
-        <translation type="unfinished"/>
+        <translation>Desactivar grupo de volúmenes llamado &lt;strong&gt;%1&lt;/strong&gt;.</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/jobs/DeactivateVolumeGroupJob.cpp" line="61"/>
         <source>The installer failed to deactivate a volume group named %1.</source>
-        <translation type="unfinished"/>
+        <translation>El instalador falló en desactivar el grupo de volúmenes llamado %1.</translation>
     </message>
 </context>
 <context>
@@ -823,7 +823,7 @@ Saldrá del instalador y se perderán todos los cambios.</translation>
     <message>
         <location filename="../src/modules/partition/core/DeviceModel.cpp" line="89"/>
         <source>%1 - (%2)</source>
-        <translation type="unfinished"/>
+        <translation>%1-(%2)</translation>
     </message>
 </context>
 <context>
@@ -1726,27 +1726,27 @@ Saldrá del instalador y se perderán todos los cambios.</translation>
     <message>
         <location filename="../src/modules/partition/gui/PartitionPage.ui" line="132"/>
         <source>New Volume Group</source>
-        <translation type="unfinished"/>
+        <translation>Nuevo grupo de volúmenes </translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/PartitionPage.ui" line="139"/>
         <source>Resize Volume Group</source>
-        <translation type="unfinished"/>
+        <translation>Cambiar el tamaño del grupo de volúmenes</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/PartitionPage.ui" line="146"/>
         <source>Deactivate Volume Group</source>
-        <translation type="unfinished"/>
+        <translation>Desactivar grupo de volúmenes</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/PartitionPage.ui" line="153"/>
         <source>Remove Volume Group</source>
-        <translation type="unfinished"/>
+        <translation>Remover grupo de volúmenes</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/PartitionPage.ui" line="180"/>
         <source>I&amp;nstall boot loader on:</source>
-        <translation type="unfinished"/>
+        <translation>Instalar gestor de arranque en:</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="217"/>
@@ -2034,12 +2034,12 @@ Salida:
         <location filename="../src/modules/partition/jobs/RemoveVolumeGroupJob.cpp" line="34"/>
         <location filename="../src/modules/partition/jobs/RemoveVolumeGroupJob.cpp" line="48"/>
         <source>Remove Volume Group named %1.</source>
-        <translation type="unfinished"/>
+        <translation>Remover grupo de volúmenes llamado %1.</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/jobs/RemoveVolumeGroupJob.cpp" line="41"/>
         <source>Remove Volume Group named &lt;strong&gt;%1&lt;/strong&gt;.</source>
-        <translation type="unfinished"/>
+        <translation>Remover grupo de volúmenes llamado &lt;strong&gt;%1&lt;/strong&gt;.</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/jobs/RemoveVolumeGroupJob.cpp" line="61"/>
@@ -2280,12 +2280,12 @@ Salida:
         <location filename="../src/modules/partition/jobs/ResizeVolumeGroupJob.cpp" line="37"/>
         <location filename="../src/modules/partition/jobs/ResizeVolumeGroupJob.cpp" line="55"/>
         <source>Resize volume group named %1 from %2 to %3.</source>
-        <translation type="unfinished"/>
+        <translation>Cambiar el tamaño del grupo de volúmenes llamado %1 de %2 a %3.</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/jobs/ResizeVolumeGroupJob.cpp" line="46"/>
         <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"/>
+        <translation>Cambiar el tamaño del grupo de volúmenes llamado &lt;strong&gt;%1&lt;/strong&gt; de &lt;strong&gt;%2&lt;/strong&gt; a &lt;strong&gt;%3&lt;/strong&gt;.</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/jobs/ResizeVolumeGroupJob.cpp" line="70"/>
@@ -2747,7 +2747,7 @@ Salida:
     <message>
         <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="56"/>
         <source>Physical Extent Size:</source>
-        <translation type="unfinished"/>
+        <translation>Tamaño de sector físico:</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="66"/>
@@ -2780,7 +2780,7 @@ Salida:
     <message>
         <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="142"/>
         <source>Quantity of LVs:</source>
-        <translation type="unfinished"/>
+        <translation>Cantidad de LVs:</translation>
     </message>
 </context>
 <context>
diff --git a/lang/calamares_id.ts b/lang/calamares_id.ts
index 3fd711dd1..0e59d2c45 100644
--- a/lang/calamares_id.ts
+++ b/lang/calamares_id.ts
@@ -9,12 +9,12 @@
     <message>
         <location filename="../src/modules/partition/gui/BootInfoWidget.cpp" line="79"/>
         <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>Sistem ini telah dimulai dengan lingkungan boot &lt;strong&gt;EFI&lt;/strong&gt;.&lt;br&gt;&lt;br&gt;Untuk mengkonfigurasi startup dari lingkungan EFI, pemasang ini seharusnya memaparkan sebuah aplikasi boot loader, seperti &lt;strong&gt;GRUB&lt;/strong&gt; atau &lt;strong&gt;systemd-boot&lt;/strong&gt; pada sebuah &lt;strong&gt;EFI System Partition&lt;/strong&gt;. Ini adalah otomatis, kecuali kalau kamu memilih pemartisian manual, dalam beberapa kasus kamu harus memilihnya atau menciptakannya pada milikmu.</translation>
+        <translation>Sistem ini telah dimulai dengan lingkungan boot &lt;strong&gt;EFI&lt;/strong&gt;.&lt;br&gt;&lt;br&gt;Untuk mengkonfigurasi startup dari lingkungan EFI, installer ini seharusnya memaparkan sebuah aplikasi boot loader, seperti &lt;strong&gt;GRUB&lt;/strong&gt; atau &lt;strong&gt;systemd-boot&lt;/strong&gt; pada sebuah &lt;strong&gt;EFI System Partition&lt;/strong&gt;. Ini adalah otomatis, kecuali kalau kamu memilih pemartisian manual, dalam beberapa kasus kamu harus memilihnya atau menciptakannya pada milikmu.</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/BootInfoWidget.cpp" line="91"/>
         <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>Sistem ini dimulai dengan sebuah lingkungan boot &lt;strong&gt;BIOS&lt;/strong&gt;.&lt;br&gt;&lt;br&gt;Untuk mengkonfigurasi startup dari sebuah lingkungan BIOS, pemasang ini seharusnya memasang sebuah boot loader, seperti &lt;strong&gt;GRUB&lt;/strong&gt;, baik di awal partisi atau pada &lt;strong&gt;Master Boot Record&lt;/strong&gt; di dekat awalan tabel partisi (yang disukai). Ini adalah otomatis, kecuali kalau kamu memilih pemartisian manual, dalam beberapa kasus kamu harus menyetelnya pada milikmu.</translation>
+        <translation>Sistem ini dimulai dengan sebuah lingkungan boot &lt;strong&gt;BIOS&lt;/strong&gt;.&lt;br&gt;&lt;br&gt;Untuk mengkonfigurasi startup dari sebuah lingkungan BIOS, installer ini seharusnya memasang sebuah boot loader, seperti &lt;strong&gt;GRUB&lt;/strong&gt;, baik di awal partisi atau pada &lt;strong&gt;Master Boot Record&lt;/strong&gt; di dekat awalan tabel partisi (yang disukai). Ini adalah otomatis, kecuali kalau kamu memilih pemartisian manual, dalam beberapa kasus kamu harus menyetelnya pada milikmu.</translation>
     </message>
 </context>
 <context>
@@ -37,7 +37,7 @@
     <message>
         <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="111"/>
         <source>Do not install a boot loader</source>
-        <translation>Jangan pasang boot loader</translation>
+        <translation>Jangan instal boot loader</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="125"/>
@@ -107,7 +107,7 @@
     <message>
         <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="79"/>
         <source>Install</source>
-        <translation>Pasang</translation>
+        <translation>Instal</translation>
     </message>
 </context>
 <context>
@@ -187,7 +187,7 @@
         <location filename="../src/libcalamaresui/ViewManager.cpp" line="77"/>
         <location filename="../src/libcalamaresui/ViewManager.cpp" line="289"/>
         <source>Cancel installation without changing the system.</source>
-        <translation>Batal pemasangan tanpa mengubah sistem yang ada.</translation>
+        <translation>Batalkan instalasi tanpa mengubah sistem yang ada.</translation>
     </message>
     <message>
         <location filename="../src/libcalamaresui/ViewManager.cpp" line="179"/>
@@ -197,7 +197,7 @@
     <message>
         <location filename="../src/libcalamaresui/ViewManager.cpp" line="180"/>
         <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>%1 tidak dapat terpasang. Calamares tidak dapat memuat seluruh modul konfigurasi. Terdapat masalah dengan Calamares karena sedang digunakan oleh distribusi.</translation>
+        <translation>%1 tidak dapat terinstal. Calamares tidak dapat memuat seluruh modul konfigurasi. Terdapat masalah dengan Calamares karena sedang digunakan oleh distribusi.</translation>
     </message>
     <message>
         <location filename="../src/libcalamaresui/ViewManager.cpp" line="185"/>
@@ -207,19 +207,19 @@
     <message>
         <location filename="../src/libcalamaresui/ViewManager.cpp" line="277"/>
         <source>&amp;Install</source>
-        <translation>&amp;Pasang</translation>
+        <translation>&amp;Instal</translation>
     </message>
     <message>
         <location filename="../src/libcalamaresui/ViewManager.cpp" line="325"/>
         <source>Cancel installation?</source>
-        <translation>Batalkan pemasangan?</translation>
+        <translation>Batalkan instalasi?</translation>
     </message>
     <message>
         <location filename="../src/libcalamaresui/ViewManager.cpp" line="326"/>
         <source>Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.</source>
-        <translation>Apakah Anda benar-benar ingin membatalkan proses pemasangan ini?
-Pemasangan akan ditutup dan semua perubahan akan hilang.</translation>
+        <translation>Apakah Anda benar-benar ingin membatalkan proses instalasi ini?
+Instalasi akan ditutup dan semua perubahan akan hilang.</translation>
     </message>
     <message>
         <location filename="../src/libcalamaresui/ViewManager.cpp" line="331"/>
@@ -244,12 +244,12 @@ Pemasangan akan ditutup dan semua perubahan akan hilang.</translation>
     <message>
         <location filename="../src/libcalamaresui/ViewManager.cpp" line="238"/>
         <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>Pemasang %1 akan membuat perubahan ke disk Anda untuk memasang %2.&lt;br/&gt;&lt;strong&gt;Anda tidak dapat membatalkan perubahan tersebut.&lt;/strong&gt;</translation>
+        <translation>Installer %1 akan membuat perubahan ke disk Anda untuk memasang %2.&lt;br/&gt;&lt;strong&gt;Anda tidak dapat membatalkan perubahan tersebut.&lt;/strong&gt;</translation>
     </message>
     <message>
         <location filename="../src/libcalamaresui/ViewManager.cpp" line="243"/>
         <source>&amp;Install now</source>
-        <translation>&amp;Pasang sekarang</translation>
+        <translation>&amp;Instal sekarang</translation>
     </message>
     <message>
         <location filename="../src/libcalamaresui/ViewManager.cpp" line="244"/>
@@ -264,7 +264,7 @@ Pemasangan akan ditutup dan semua perubahan akan hilang.</translation>
     <message>
         <location filename="../src/libcalamaresui/ViewManager.cpp" line="284"/>
         <source>The installation is complete. Close the installer.</source>
-        <translation>Pemasangan sudah lengkap. Tutup pemasang.</translation>
+        <translation>Instalasi sudah lengkap. Tutup installer.</translation>
     </message>
     <message>
         <location filename="../src/libcalamaresui/ViewManager.cpp" line="160"/>
@@ -274,7 +274,7 @@ Pemasangan akan ditutup dan semua perubahan akan hilang.</translation>
     <message>
         <location filename="../src/libcalamaresui/ViewManager.cpp" line="161"/>
         <source>Installation Failed</source>
-        <translation>Pemasangan Gagal</translation>
+        <translation>Instalasi Gagal</translation>
     </message>
 </context>
 <context>
@@ -305,7 +305,7 @@ Pemasangan akan ditutup dan semua perubahan akan hilang.</translation>
     <message>
         <location filename="../src/calamares/CalamaresWindow.cpp" line="44"/>
         <source>%1 Installer</source>
-        <translation>Pemasang %1</translation>
+        <translation>Installer %1</translation>
     </message>
     <message>
         <location filename="../src/calamares/CalamaresWindow.cpp" line="111"/>
@@ -319,13 +319,13 @@ Pemasangan akan ditutup dan semua perubahan akan hilang.</translation>
         <location filename="../src/modules/welcome/checker/CheckerWidget.cpp" line="96"/>
         <source>This computer does not satisfy the minimum requirements for installing %1.&lt;br/&gt;Installation cannot continue. &lt;a href=&quot;#details&quot;&gt;Details...&lt;/a&gt;</source>
         <translation>Komputer ini tidak memenuhi syarat minimum untuk memasang %1.
-Pemasang tidak dapat dilanjutkan. &lt;a href=&quot;</translation>
+Installer tidak dapat dilanjutkan. &lt;a href=&quot;</translation>
     </message>
     <message>
         <location filename="../src/modules/welcome/checker/CheckerWidget.cpp" line="113"/>
         <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>Komputer ini tidak memenuhi beberapa syarat yang dianjurkan untuk memasang %1.
-Pemasangan dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.</translation>
+Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.</translation>
     </message>
     <message>
         <location filename="../src/modules/welcome/checker/CheckerWidget.cpp" line="151"/>
@@ -437,7 +437,7 @@ Pemasangan dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.</transla
         <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1292"/>
         <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1316"/>
         <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>&lt;strong&gt;Pasang berdampingan dengan&lt;/strong&gt;&lt;br/&gt;Pemasang akan mengiris sebuah partisi untuk memberi ruang bagi %1.</translation>
+        <translation>&lt;strong&gt;Instal berdampingan dengan&lt;/strong&gt;&lt;br/&gt;Installer akan mengiris sebuah partisi untuk memberi ruang bagi %1.</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1245"/>
@@ -624,7 +624,7 @@ Pemasangan dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.</transla
     <message>
         <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="79"/>
         <source>The installer failed to create partition on disk &apos;%1&apos;.</source>
-        <translation>Pemasang gagal untuk membuat partisi di disk &apos;%1&apos;.</translation>
+        <translation>Installer gagal untuk membuat partisi di disk &apos;%1&apos;.</translation>
     </message>
 </context>
 <context>
@@ -675,7 +675,7 @@ Pemasangan dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.</transla
     <message>
         <location filename="../src/modules/partition/jobs/CreatePartitionTableJob.cpp" line="82"/>
         <source>The installer failed to create a partition table on %1.</source>
-        <translation>Pemasang gagal membuat tabel partisi pada %1.</translation>
+        <translation>Installer gagal membuat tabel partisi pada %1.</translation>
     </message>
 </context>
 <context>
@@ -721,22 +721,22 @@ Pemasangan dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.</transla
     <message>
         <location filename="../src/modules/partition/jobs/CreateVolumeGroupJob.cpp" line="38"/>
         <source>Create new volume group named %1.</source>
-        <translation type="unfinished"/>
+        <translation>Ciptakan grup volume baru bernama %1.</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/jobs/CreateVolumeGroupJob.cpp" line="45"/>
         <source>Create new volume group named &lt;strong&gt;%1&lt;/strong&gt;.</source>
-        <translation type="unfinished"/>
+        <translation>Ciptakan grup volume baru bernama &lt;strong&gt;%1&lt;/strong&gt;.</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/jobs/CreateVolumeGroupJob.cpp" line="52"/>
         <source>Creating new volume group named %1.</source>
-        <translation type="unfinished"/>
+        <translation>Menciptakan grup volume baru bernama %1.</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/jobs/CreateVolumeGroupJob.cpp" line="65"/>
         <source>The installer failed to create a volume group named &apos;%1&apos;.</source>
-        <translation type="unfinished"/>
+        <translation>Installer gagal menciptakan sebuah grup volume bernama &apos;%1&apos;.</translation>
     </message>
 </context>
 <context>
@@ -745,17 +745,17 @@ Pemasangan dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.</transla
         <location filename="../src/modules/partition/jobs/DeactivateVolumeGroupJob.cpp" line="34"/>
         <location filename="../src/modules/partition/jobs/DeactivateVolumeGroupJob.cpp" line="48"/>
         <source>Deactivate volume group named %1.</source>
-        <translation type="unfinished"/>
+        <translation>Nonaktifkan grup volume bernama %1.</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/jobs/DeactivateVolumeGroupJob.cpp" line="41"/>
         <source>Deactivate volume group named &lt;strong&gt;%1&lt;/strong&gt;.</source>
-        <translation type="unfinished"/>
+        <translation>Nonaktifkan grup volume bernama &lt;strong&gt;%1&lt;/strong&gt;.</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/jobs/DeactivateVolumeGroupJob.cpp" line="61"/>
         <source>The installer failed to deactivate a volume group named %1.</source>
-        <translation type="unfinished"/>
+        <translation>Installer gagal menonaktifkan sebuah grup volume bernama %1.</translation>
     </message>
 </context>
 <context>
@@ -778,7 +778,7 @@ Pemasangan dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.</transla
     <message>
         <location filename="../src/modules/partition/jobs/DeletePartitionJob.cpp" line="68"/>
         <source>The installer failed to delete partition %1.</source>
-        <translation>Pemasang gagal untuk menghapus partisi %1.</translation>
+        <translation>Installer gagal untuk menghapus partisi %1.</translation>
     </message>
 </context>
 <context>
@@ -786,7 +786,7 @@ Pemasangan dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.</transla
     <message>
         <location filename="../src/modules/partition/gui/DeviceInfoWidget.cpp" line="150"/>
         <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>Tipe dari &lt;strong&gt;tabel partisi&lt;/strong&gt; pada perangkat penyimpanan terpilih.&lt;br&gt;&lt;br&gt;Satu-satunya cara untuk mengubah tabel partisi adalah dengan menyetip dan menciptakan ulang tabel partisi dari awal, yang melenyapkan semua data pada perangkat penyimpanan.&lt;br&gt;Pemasang ini akan menjaga tabel partisi saat ini kecuali kamu secara gamblang memilih sebaliknya.&lt;br&gt;Jika tidak yakin, pada sistem GPT modern lebih disukai.</translation>
+        <translation>Tipe dari &lt;strong&gt;tabel partisi&lt;/strong&gt; pada perangkat penyimpanan terpilih.&lt;br&gt;&lt;br&gt;Satu-satunya cara untuk mengubah tabel partisi adalah dengan menyetip dan menciptakan ulang tabel partisi dari awal, yang melenyapkan semua data pada perangkat penyimpanan.&lt;br&gt;Installer ini akan menjaga tabel partisi saat ini kecuali kamu secara gamblang memilih sebaliknya.&lt;br&gt;Jika tidak yakin, pada sistem GPT modern lebih disukai.</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/DeviceInfoWidget.cpp" line="107"/>
@@ -801,7 +801,7 @@ Pemasangan dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.</transla
     <message>
         <location filename="../src/modules/partition/gui/DeviceInfoWidget.cpp" line="121"/>
         <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>Pemasang &lt;strong&gt;tidak bisa mendeteksi tabel partisi apapun&lt;/strong&gt; pada media penyimpanan terpilih.&lt;br&gt;&lt;br&gt;Mungkin media ini tidak memiliki tabel partisi, atau tabel partisi yang ada telah korup atau tipenya tidak dikenal.&lt;br&gt;Pemasang dapat membuatkan partisi baru untuk Anda, baik secara otomatis atau melalui laman pemartisian manual.</translation>
+        <translation>Installer &lt;strong&gt;tidak bisa mendeteksi tabel partisi apapun&lt;/strong&gt; pada media penyimpanan terpilih.&lt;br&gt;&lt;br&gt;Mungkin media ini tidak memiliki tabel partisi, atau tabel partisi yang ada telah korup atau tipenya tidak dikenal.&lt;br&gt;Installer dapat membuatkan partisi baru untuk Anda, baik secara otomatis atau melalui laman pemartisian manual.</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/DeviceInfoWidget.cpp" line="131"/>
@@ -824,7 +824,7 @@ Pemasangan dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.</transla
     <message>
         <location filename="../src/modules/partition/core/DeviceModel.cpp" line="89"/>
         <source>%1 - (%2)</source>
-        <translation type="unfinished"/>
+        <translation>%1 - (%2)</translation>
     </message>
 </context>
 <context>
@@ -949,7 +949,7 @@ Pemasangan dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.</transla
     <message>
         <location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="156"/>
         <source>Install %1 on &lt;strong&gt;new&lt;/strong&gt; %2 system partition.</source>
-        <translation>Pasang %1 pada partisi sistem %2 &lt;strong&gt;baru&lt;/strong&gt;</translation>
+        <translation>Instal %1 pada partisi sistem %2 &lt;strong&gt;baru&lt;/strong&gt;</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="160"/>
@@ -959,7 +959,7 @@ Pemasangan dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.</transla
     <message>
         <location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="168"/>
         <source>Install %2 on %3 system partition &lt;strong&gt;%1&lt;/strong&gt;.</source>
-        <translation>Pasang %2 pada sistem partisi %3 &lt;strong&gt;%1&lt;/strong&gt;.</translation>
+        <translation>Instal %2 pada sistem partisi %3 &lt;strong&gt;%1&lt;/strong&gt;.</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="173"/>
@@ -969,7 +969,7 @@ Pemasangan dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.</transla
     <message>
         <location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="185"/>
         <source>Install boot loader on &lt;strong&gt;%1&lt;/strong&gt;.</source>
-        <translation>Pasang boot loader di &lt;strong&gt;%1&lt;/strong&gt;.</translation>
+        <translation>Instal boot loader di &lt;strong&gt;%1&lt;/strong&gt;.</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="195"/>
@@ -987,7 +987,7 @@ Pemasangan dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.</transla
     <message>
         <location filename="../src/modules/finished/FinishedPage.ui" line="95"/>
         <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=&quot; font-style:italic;&quot;&gt;Done&lt;/span&gt; or close the installer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>Ketika kotak ini dicentang, sistem kamu akan segera dimulai kembali saat mengklik Selesai atau menutup pemasang.</translation>
+        <translation>Ketika kotak ini dicentang, sistem kamu akan segera dimulai kembali saat mengklik Selesai atau menutup installer.</translation>
     </message>
     <message>
         <location filename="../src/modules/finished/FinishedPage.ui" line="98"/>
@@ -997,12 +997,12 @@ Pemasangan dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.</transla
     <message>
         <location filename="../src/modules/finished/FinishedPage.cpp" line="51"/>
         <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>&lt;h1&gt;Selesai.&lt;/h1&gt;&lt;br&gt;%1 sudah terpasang di komputer Anda.&lt;br/&gt;Anda dapat memulai ulang ke sistem baru atau lanjut menggunakan lingkungan Live %2.</translation>
+        <translation>&lt;h1&gt;Selesai.&lt;/h1&gt;&lt;br&gt;%1 sudah terinstal di komputer Anda.&lt;br/&gt;Anda dapat memulai ulang ke sistem baru atau lanjut menggunakan lingkungan Live %2.</translation>
     </message>
     <message>
         <location filename="../src/modules/finished/FinishedPage.cpp" line="109"/>
         <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>&lt;h1&gt;Pemasangan Gagal&lt;/h1&gt;&lt;br/&gt;%1 tidak bisa dipasang pada komputermu.&lt;br/&gt;Pesan galatnya adalah: %2.</translation>
+        <translation>&lt;h1&gt;Instalasi Gagal&lt;/h1&gt;&lt;br/&gt;%1 tidak bisa diinstal pada komputermu.&lt;br/&gt;Pesan galatnya adalah: %2.</translation>
     </message>
 </context>
 <context>
@@ -1015,12 +1015,12 @@ Pemasangan dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.</transla
     <message>
         <location filename="../src/modules/finished/FinishedViewStep.cpp" line="124"/>
         <source>Installation Complete</source>
-        <translation>Pemasangan Lengkap</translation>
+        <translation>Instalasi Lengkap</translation>
     </message>
     <message>
         <location filename="../src/modules/finished/FinishedViewStep.cpp" line="125"/>
         <source>The installation of %1 is complete.</source>
-        <translation>Pemasangan %1 telah lengkap.</translation>
+        <translation>Instalasi %1 telah lengkap.</translation>
     </message>
 </context>
 <context>
@@ -1043,7 +1043,7 @@ Pemasangan dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.</transla
     <message>
         <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="77"/>
         <source>The installer failed to format partition %1 on disk &apos;%2&apos;.</source>
-        <translation>Pemasang gagal memformat partisi %1 pada disk &apos;%2&apos;.&apos;%2&apos;.</translation>
+        <translation>Installer gagal memformat partisi %1 pada disk &apos;%2&apos;.&apos;%2&apos;.</translation>
     </message>
 </context>
 <context>
@@ -1051,12 +1051,12 @@ Pemasangan dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.</transla
     <message>
         <location filename="../src/modules/interactiveterminal/InteractiveTerminalPage.cpp" line="53"/>
         <source>Konsole not installed</source>
-        <translation>Konsole tidak terpasang</translation>
+        <translation>Konsole tidak terinstal</translation>
     </message>
     <message>
         <location filename="../src/modules/interactiveterminal/InteractiveTerminalPage.cpp" line="54"/>
         <source>Please install KDE Konsole and try again!</source>
-        <translation>Silahkan pasang KDE Konsole dan ulangi lagi!</translation>
+        <translation>Silahkan instal KDE Konsole dan ulangi lagi!</translation>
     </message>
     <message>
         <location filename="../src/modules/interactiveterminal/InteractiveTerminalPage.cpp" line="116"/>
@@ -1146,7 +1146,7 @@ Pemasangan dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.</transla
     <message>
         <location filename="../src/modules/license/LicensePage.cpp" line="130"/>
         <source>Please review the End User License Agreements (EULAs) above.&lt;br/&gt;If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.</source>
-        <translation>Mohon periksa End User License Agreements(EULA) di atas.&lt;br/&gt;Bila Anda tidak setuju, perangkat lunak proprietary tidak akan dipasang, dan alternatif open source akan dipasang sebagai gantinya </translation>
+        <translation>Mohon periksa End User License Agreements(EULA) di atas.&lt;br/&gt;Bila Anda tidak setuju, perangkat lunak proprietary tidak akan diinstal, dan alternatif open source akan diinstal sebagai gantinya </translation>
     </message>
     <message>
         <location filename="../src/modules/license/LicensePage.cpp" line="160"/>
@@ -1262,12 +1262,12 @@ Pemasangan dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.</transla
     <message>
         <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="86"/>
         <source>Network Installation. (Disabled: Unable to fetch package lists, check your network connection)</source>
-        <translation>Pemasangan Jaringan. (Dinonfungsikan: Tak mampu menarik daftar paket, periksa sambungan jaringanmu)</translation>
+        <translation>Instalasi Jaringan. (Dinonfungsikan: Tak mampu menarik daftar paket, periksa sambungan jaringanmu)</translation>
     </message>
     <message>
         <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="96"/>
         <source>Network Installation. (Disabled: Received invalid groups data)</source>
-        <translation>Pemasangan jaringan. (Menonaktifkan: Penerimaan kelompok data yang tidak sah)</translation>
+        <translation>Instalasi jaringan. (Menonaktifkan: Penerimaan kelompok data yang tidak sah)</translation>
     </message>
 </context>
 <context>
@@ -1566,7 +1566,7 @@ Pemasangan dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.</transla
     <message>
         <location filename="../src/modules/users/page_usersetup.ui" line="200"/>
         <source>&lt;small&gt;If more than one person will use this computer, you can set up multiple accounts after installation.&lt;/small&gt;</source>
-        <translation>&lt;small&gt;Jika lebih dari satu orang akan menggunakan komputer ini, Anda dapat mengatur beberapa akun setelah pemasangan.&lt;/small&gt;</translation>
+        <translation>&lt;small&gt;Jika lebih dari satu orang akan menggunakan komputer ini, Anda dapat mengatur beberapa akun setelah instalasi.&lt;/small&gt;</translation>
     </message>
     <message>
         <location filename="../src/modules/users/page_usersetup.ui" line="335"/>
@@ -1727,27 +1727,27 @@ Pemasangan dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.</transla
     <message>
         <location filename="../src/modules/partition/gui/PartitionPage.ui" line="132"/>
         <source>New Volume Group</source>
-        <translation type="unfinished"/>
+        <translation>Grup Volume Baru</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/PartitionPage.ui" line="139"/>
         <source>Resize Volume Group</source>
-        <translation type="unfinished"/>
+        <translation>Ubah-ukuran Grup Volume</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/PartitionPage.ui" line="146"/>
         <source>Deactivate Volume Group</source>
-        <translation type="unfinished"/>
+        <translation>Nonaktifkan Grup Volume</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/PartitionPage.ui" line="153"/>
         <source>Remove Volume Group</source>
-        <translation type="unfinished"/>
+        <translation>Hapus Grup Volume</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/PartitionPage.ui" line="180"/>
         <source>I&amp;nstall boot loader on:</source>
-        <translation type="unfinished"/>
+        <translation>I&amp;nstal boot loader di:</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="217"/>
@@ -1780,12 +1780,12 @@ Pemasangan dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.</transla
     <message>
         <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="159"/>
         <source>Install %1 &lt;strong&gt;alongside&lt;/strong&gt; another operating system.</source>
-        <translation>Pasang %1 &lt;strong&gt;berdampingan&lt;/strong&gt; dengan sistem operasi lain.</translation>
+        <translation>Instal %1 &lt;strong&gt;berdampingan&lt;/strong&gt; dengan sistem operasi lain.</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="163"/>
         <source>&lt;strong&gt;Erase&lt;/strong&gt; disk and install %1.</source>
-        <translation>&lt;strong&gt;Hapus&lt;/strong&gt; diska dan pasang %1.</translation>
+        <translation>&lt;strong&gt;Hapus&lt;/strong&gt; diska dan instal %1.</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="167"/>
@@ -1800,12 +1800,12 @@ Pemasangan dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.</transla
     <message>
         <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="185"/>
         <source>Install %1 &lt;strong&gt;alongside&lt;/strong&gt; another operating system on disk &lt;strong&gt;%2&lt;/strong&gt; (%3).</source>
-        <translation>Pasang %1 &lt;strong&gt;berdampingan&lt;/strong&gt; dengan sistem operasi lain di disk &lt;strong&gt;%2&lt;/strong&gt; (%3).</translation>
+        <translation>Instal %1 &lt;strong&gt;berdampingan&lt;/strong&gt; dengan sistem operasi lain di disk &lt;strong&gt;%2&lt;/strong&gt; (%3).</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="191"/>
         <source>&lt;strong&gt;Erase&lt;/strong&gt; disk &lt;strong&gt;%2&lt;/strong&gt; (%3) and install %1.</source>
-        <translation>&lt;strong&gt;Hapus&lt;/strong&gt; diska &lt;strong&gt;%2&lt;/strong&gt; (%3) dan pasang %1.</translation>
+        <translation>&lt;strong&gt;Hapus&lt;/strong&gt; diska &lt;strong&gt;%2&lt;/strong&gt; (%3) dan instal %1.</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="197"/>
@@ -1892,7 +1892,7 @@ Pemasangan dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.</transla
     <message>
         <location filename="../src/modules/plasmalnf/PlasmaLnfPage.cpp" line="67"/>
         <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>Silakan pilih sebuah look-and-feel untuk KDE Plasma Desktop. Anda juga dapat melewati langkah ini dan konfigurasi look-and-feel sekali ketika sistem terpasang. Mengeklik pilihan look-and-feel akan memberi Anda pratinjau langsung dari look-and-feel.</translation>
+        <translation>Silakan pilih sebuah look-and-feel untuk KDE Plasma Desktop. Anda juga dapat melewati langkah ini dan konfigurasi look-and-feel setelah  sistem terinstal. Mengeklik pilihan look-and-feel akan memberi Anda pratinjau langsung pada look-and-feel tersebut.</translation>
     </message>
 </context>
 <context>
@@ -2035,17 +2035,17 @@ Keluaran:
         <location filename="../src/modules/partition/jobs/RemoveVolumeGroupJob.cpp" line="34"/>
         <location filename="../src/modules/partition/jobs/RemoveVolumeGroupJob.cpp" line="48"/>
         <source>Remove Volume Group named %1.</source>
-        <translation type="unfinished"/>
+        <translation>Hapus Grup Volume bernama %1.</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/jobs/RemoveVolumeGroupJob.cpp" line="41"/>
         <source>Remove Volume Group named &lt;strong&gt;%1&lt;/strong&gt;.</source>
-        <translation type="unfinished"/>
+        <translation>Hapus Grup Volume bernama &lt;strong&gt;%1&lt;/strong&gt;.</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/jobs/RemoveVolumeGroupJob.cpp" line="61"/>
         <source>The installer failed to remove a volume group named &apos;%1&apos;.</source>
-        <translation type="unfinished"/>
+        <translation>Installer gagal menghapus sebuah grup volume bernama &apos;%1&apos;.</translation>
     </message>
 </context>
 <context>
@@ -2058,7 +2058,7 @@ Keluaran:
     <message>
         <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="134"/>
         <source>Select where to install %1.&lt;br/&gt;&lt;font color=&quot;red&quot;&gt;Warning: &lt;/font&gt;this will delete all files on the selected partition.</source>
-        <translation>Pilih tempat pemasangan %1.&lt;br/&gt;&lt;font color=&quot;red&quot;&gt;Peringatan: &lt;/font&gt;hal ini akan menghapus semua berkas di partisi terpilih.</translation>
+        <translation>Pilih tempat instalasi %1.&lt;br/&gt;&lt;font color=&quot;red&quot;&gt;Peringatan: &lt;/font&gt;hal ini akan menghapus semua berkas di partisi terpilih.</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="160"/>
@@ -2068,17 +2068,17 @@ Keluaran:
     <message>
         <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="168"/>
         <source>%1 cannot be installed on empty space. Please select an existing partition.</source>
-        <translation>%1 tidak dapat dipasang di ruang kosong. Mohon pilih partisi yang tersedia.</translation>
+        <translation>%1 tidak dapat diinstal di ruang kosong. Mohon pilih partisi yang tersedia.</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="178"/>
         <source>%1 cannot be installed on an extended partition. Please select an existing primary or logical partition.</source>
-        <translation>%1 tidak bisa dipasang pada Partisi Extended. Mohon pilih Partisi Primary atau Logical yang tersedia.</translation>
+        <translation>%1 tidak bisa diinstal pada Partisi Extended. Mohon pilih Partisi Primary atau Logical yang tersedia.</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="188"/>
         <source>%1 cannot be installed on this partition.</source>
-        <translation>%1 tidak dapat dipasang di partisi ini.</translation>
+        <translation>%1 tidak dapat diinstal di partisi ini.</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="194"/>
@@ -2110,7 +2110,7 @@ Keluaran:
         <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="278"/>
         <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="302"/>
         <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=&quot;red&quot;&gt;Warning: &lt;/font&gt;all data on partition %2 will be lost.</source>
-        <translation>&lt;strong&gt;%3&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;%1 akan dipasang pada %2.&lt;br/&gt;&lt;font color=&quot;red&quot;&gt;Peringatan: &lt;/font&gt;seluruh data %2 akan hilang.</translation>
+        <translation>&lt;strong&gt;%3&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;%1 akan diinstal pada %2.&lt;br/&gt;&lt;font color=&quot;red&quot;&gt;Peringatan: &lt;/font&gt;seluruh data %2 akan hilang.</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="270"/>
@@ -2173,12 +2173,12 @@ Keluaran:
     <message>
         <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="155"/>
         <source>The installer is not running with administrator rights.</source>
-        <translation>Pemasang tidak dijalankan dengan kewenangan administrator.</translation>
+        <translation>Installer tidak dijalankan dengan kewenangan administrator.</translation>
     </message>
     <message>
         <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="163"/>
         <source>The screen is too small to display the installer.</source>
-        <translation>Layar terlalu kecil untuk menampilkan pemasang.</translation>
+        <translation>Layar terlalu kecil untuk menampilkan installer.</translation>
     </message>
 </context>
 <context>
@@ -2186,29 +2186,29 @@ Keluaran:
     <message>
         <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="130"/>
         <source>Resize Filesystem Job</source>
-        <translation type="unfinished"/>
+        <translation>Tugas Ubah-ukuran Filesystem</translation>
     </message>
     <message>
         <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="238"/>
         <source>Invalid configuration</source>
-        <translation type="unfinished"/>
+        <translation>Konfigurasi taksah</translation>
     </message>
     <message>
         <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="239"/>
         <source>The file-system resize job has an invalid configuration and will not run.</source>
-        <translation type="unfinished"/>
+        <translation>Tugas pengubahan ukuran filesystem mempunyai sebuah konfigurasi yang taksah dan tidak akan berjalan.</translation>
     </message>
     <message>
         <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="253"/>
         <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="263"/>
         <source>KPMCore not Available</source>
-        <translation type="unfinished"/>
+        <translation>KPMCore tidak Tersedia</translation>
     </message>
     <message>
         <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/>
         <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="264"/>
         <source>Calamares cannot start KPMCore for the file-system resize job.</source>
-        <translation type="unfinished"/>
+        <translation>Calamares gak bisa menjalankan KPMCore untuk tugas pengubahan ukuran filesystem.</translation>
     </message>
     <message>
         <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="272"/>
@@ -2217,39 +2217,39 @@ Keluaran:
         <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="303"/>
         <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="320"/>
         <source>Resize Failed</source>
-        <translation type="unfinished"/>
+        <translation>Pengubahan Ukuran, Gagal</translation>
     </message>
     <message>
         <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="273"/>
         <source>The filesystem %1 could not be found in this system, and cannot be resized.</source>
-        <translation type="unfinished"/>
+        <translation>Filesystem %1 enggak ditemukan dalam sistem ini, dan gak bisa diubahukurannya.</translation>
     </message>
     <message>
         <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="274"/>
         <source>The device %1 could not be found in this system, and cannot be resized.</source>
-        <translation type="unfinished"/>
+        <translation>Perangkat %1 enggak ditemukan dalam sistem ini, dan gak bisa diubahukurannya.</translation>
     </message>
     <message>
         <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="282"/>
         <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="295"/>
         <source>The filesystem %1 cannot be resized.</source>
-        <translation type="unfinished"/>
+        <translation>Filesystem %1 gak bisa diubahukurannya.</translation>
     </message>
     <message>
         <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="283"/>
         <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="296"/>
         <source>The device %1 cannot be resized.</source>
-        <translation type="unfinished"/>
+        <translation>Perangkat %1 gak bisa diubahukurannya.</translation>
     </message>
     <message>
         <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="304"/>
         <source>The filesystem %1 must be resized, but cannot.</source>
-        <translation type="unfinished"/>
+        <translation>Filesystem %1 mestinya bisa diubahukurannya, namun gak bisa.</translation>
     </message>
     <message>
         <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="305"/>
         <source>The device %1 must be resized, but cannot</source>
-        <translation type="unfinished"/>
+        <translation>Perangkat %1 mestinya bisa diubahukurannya, namun gak bisa.</translation>
     </message>
 </context>
 <context>
@@ -2272,7 +2272,7 @@ Keluaran:
     <message>
         <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="85"/>
         <source>The installer failed to resize partition %1 on disk &apos;%2&apos;.</source>
-        <translation>Pemasang gagal untuk merubah ukuran partisi %1 pada disk &apos;%2&apos;.</translation>
+        <translation>Installer gagal untuk merubah ukuran partisi %1 pada disk &apos;%2&apos;.</translation>
     </message>
 </context>
 <context>
@@ -2281,17 +2281,17 @@ Keluaran:
         <location filename="../src/modules/partition/jobs/ResizeVolumeGroupJob.cpp" line="37"/>
         <location filename="../src/modules/partition/jobs/ResizeVolumeGroupJob.cpp" line="55"/>
         <source>Resize volume group named %1 from %2 to %3.</source>
-        <translation type="unfinished"/>
+        <translation>Ubah ukuran grup volume bernama %1 dari %2 ke %3.</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/jobs/ResizeVolumeGroupJob.cpp" line="46"/>
         <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"/>
+        <translation>Ubah ukuran grup volume bernama &lt;strong&gt;%1&lt;/strong&gt; dari &lt;strong&gt;%2&lt;/strong&gt; ke %3&lt;strong&gt;.</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/jobs/ResizeVolumeGroupJob.cpp" line="70"/>
         <source>The installer failed to resize a volume group named &apos;%1&apos;.</source>
-        <translation type="unfinished"/>
+        <translation>Installer gagal mengubah ukuran sebuah grup volume bernama &apos;%1&apos;.</translation>
     </message>
 </context>
 <context>
@@ -2447,7 +2447,7 @@ Keluaran:
     <message>
         <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="144"/>
         <source>The installer failed to set flags on partition %1.</source>
-        <translation>Pemasang gagal menetapkan bendera pada partisi %1.</translation>
+        <translation>Installer gagal menetapkan bendera pada partisi %1.</translation>
     </message>
 </context>
 <context>
@@ -2553,7 +2553,7 @@ Keluaran:
     <message>
         <location filename="../src/modules/summary/SummaryPage.cpp" line="49"/>
         <source>This is an overview of what will happen once you start the install procedure.</source>
-        <translation>Berikut adalah tinjauan mengenai yang akan terjadi setelah Anda memulai prosedur pemasangan.</translation>
+        <translation>Berikut adalah tinjauan mengenai yang akan terjadi setelah Anda memulai prosedur instalasi.</translation>
     </message>
 </context>
 <context>
@@ -2579,7 +2579,7 @@ Keluaran:
     <message>
         <location filename="../src/modules/tracking/TrackingJobs.cpp" line="88"/>
         <source>Internal error in install-tracking.</source>
-        <translation>Galat intern di pelacakan-pemasangan.</translation>
+        <translation>Galat intern di pelacakan-instalasi.</translation>
     </message>
     <message>
         <location filename="../src/modules/tracking/TrackingJobs.cpp" line="89"/>
@@ -2631,7 +2631,7 @@ Keluaran:
     <message>
         <location filename="../src/modules/tracking/page_trackingstep.ui" line="72"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;By selecting this, you will send &lt;span style=&quot; font-weight:600;&quot;&gt;no information at all&lt;/span&gt; about your installation.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Dengan memilih ini, Anda akan mengirim &lt;span style=&quot; font-weight:600;&quot;&gt;tidak ada informasi di &lt;/span&gt; tentang pemasangan Anda. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Dengan memilih ini, Anda akan mengirim &lt;span style=&quot; font-weight:600;&quot;&gt;tidak ada informasi di &lt;/span&gt; tentang instalasi Anda. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="../src/modules/tracking/page_trackingstep.ui" line="123"/>
@@ -2655,22 +2655,22 @@ Keluaran:
     <message>
         <location filename="../src/modules/tracking/TrackingPage.cpp" line="44"/>
         <source>Install tracking helps %1 to see how many users they have, what hardware they install %1 to and (with the last two options below), get continuous information about preferred applications. To see what will be sent, please click the help icon next to each area.</source>
-        <translation>Pasang bantuan pelacakan %1 untuk melihat berapa banyak pengguna memiliki, piranti keras apa yang mereka pasang %1 dan (dengan dua pilihan terakhir), dapatkan informasi berkelanjutan tentang aplikasi yang disukai. Untuk melihat apa yang akan dikirim, silakan klik ikon bantuan ke beberapa area selanjtunya.</translation>
+        <translation>Instal bantuan pelacakan %1 untuk melihat berapa banyak pengguna memiliki, piranti keras apa yang mereka instal %1 dan (dengan dua pilihan terakhir), dapatkan informasi berkelanjutan tentang aplikasi yang disukai. Untuk melihat apa yang akan dikirim, silakan klik ikon bantuan ke beberapa area selanjtunya.</translation>
     </message>
     <message>
         <location filename="../src/modules/tracking/TrackingPage.cpp" line="45"/>
         <source>By selecting this you will send information about your installation and hardware. This information will &lt;b&gt;only be sent once&lt;/b&gt; after the installation finishes.</source>
-        <translation>Dengan memilih ini Anda akan mengirim informasi tentang pemasangan dan piranti keras Anda. Informasi ini hanya akan &lt;b&gt;dikirim sekali&lt;/b&gt; setelah pemasangan selesai. </translation>
+        <translation>Dengan memilih ini Anda akan mengirim informasi tentang instalasi dan piranti keras Anda. Informasi ini hanya akan &lt;b&gt;dikirim sekali&lt;/b&gt; setelah instalasi selesai. </translation>
     </message>
     <message>
         <location filename="../src/modules/tracking/TrackingPage.cpp" line="46"/>
         <source>By selecting this you will &lt;b&gt;periodically&lt;/b&gt; send information about your installation, hardware and applications, to %1.</source>
-        <translation>Dengan memilih ini anda akan &lt;b&gt; secara berkala&lt;/b&gt; mengirim informasi tentang pemasangan, piranti keras dan aplikasi Anda, ke %1.</translation>
+        <translation>Dengan memilih ini anda akan &lt;b&gt; secara berkala&lt;/b&gt; mengirim informasi tentang instalasi, piranti keras dan aplikasi Anda, ke %1.</translation>
     </message>
     <message>
         <location filename="../src/modules/tracking/TrackingPage.cpp" line="47"/>
         <source>By selecting this you will &lt;b&gt;regularly&lt;/b&gt; send information about your installation, hardware, applications and usage patterns, to %1.</source>
-        <translation>Dengan memilih ini anda akan&lt;b&gt;secara teratur&lt;/b&gt; mengirim informasi tentang pemasangan, piranti keras, aplikasi dan pola pemakaian Anda, ke %1.</translation>
+        <translation>Dengan memilih ini anda akan&lt;b&gt;secara teratur&lt;/b&gt; mengirim informasi tentang instalasi, piranti keras, aplikasi dan pola pemakaian Anda, ke %1.</translation>
     </message>
 </context>
 <context>
@@ -2728,27 +2728,27 @@ Keluaran:
     <message>
         <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="14"/>
         <source>VolumeGroupDialog</source>
-        <translation type="unfinished"/>
+        <translation>DialogGrupVolume</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="20"/>
         <source>List of Physical Volumes</source>
-        <translation type="unfinished"/>
+        <translation>Daftar dari Volume Fisik</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="30"/>
         <source>Volume Group Name:</source>
-        <translation type="unfinished"/>
+        <translation>Nama Grup Volume:</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="43"/>
         <source>Volume Group Type:</source>
-        <translation type="unfinished"/>
+        <translation>Tipe Grup Volume:</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="56"/>
         <source>Physical Extent Size:</source>
-        <translation type="unfinished"/>
+        <translation>Ukuran Luas Fisik:</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="66"/>
@@ -2758,7 +2758,7 @@ Keluaran:
     <message>
         <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="82"/>
         <source>Total Size:</source>
-        <translation type="unfinished"/>
+        <translation>Total Ukuran:</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="92"/>
@@ -2766,22 +2766,22 @@ Keluaran:
         <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="132"/>
         <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="152"/>
         <source>---</source>
-        <translation type="unfinished"/>
+        <translation>---</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="102"/>
         <source>Used Size:</source>
-        <translation type="unfinished"/>
+        <translation>Ukuran Terpakai:</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="122"/>
         <source>Total Sectors:</source>
-        <translation type="unfinished"/>
+        <translation>Total Sektor:</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="142"/>
         <source>Quantity of LVs:</source>
-        <translation type="unfinished"/>
+        <translation>Kuantitas LV:</translation>
     </message>
 </context>
 <context>
@@ -2819,17 +2819,17 @@ Keluaran:
     <message>
         <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
         <source>&lt;h1&gt;Welcome to the %1 installer.&lt;/h1&gt;</source>
-        <translation>&lt;h1&gt;Selamat datang di pemasang %1.&lt;/h1&gt;</translation>
+        <translation>&lt;h1&gt;Selamat datang di installer %1.&lt;/h1&gt;</translation>
     </message>
     <message>
         <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
         <source>&lt;h1&gt;Welcome to the Calamares installer for %1.&lt;/h1&gt;</source>
-        <translation>&lt;h1&gt;Selamat datang di Calamares pemasang untuk %1.&lt;/h1&gt;</translation>
+        <translation>&lt;h1&gt;Selamat datang di Calamares installer untuk %1.&lt;/h1&gt;</translation>
     </message>
     <message>
         <location filename="../src/modules/welcome/WelcomePage.cpp" line="73"/>
         <source>About %1 installer</source>
-        <translation>Tentang pemasang %1</translation>
+        <translation>Tentang installer %1</translation>
     </message>
     <message>
         <location filename="../src/modules/welcome/WelcomePage.cpp" line="75"/>
diff --git a/lang/calamares_is.ts b/lang/calamares_is.ts
index 181ca9986..196215a0c 100644
--- a/lang/calamares_is.ts
+++ b/lang/calamares_is.ts
@@ -192,7 +192,7 @@
     <message>
         <location filename="../src/libcalamaresui/ViewManager.cpp" line="179"/>
         <source>Calamares Initialization Failed</source>
-        <translation type="unfinished"/>
+        <translation>Calamares uppsetning mistókst</translation>
     </message>
     <message>
         <location filename="../src/libcalamaresui/ViewManager.cpp" line="180"/>
@@ -207,7 +207,7 @@
     <message>
         <location filename="../src/libcalamaresui/ViewManager.cpp" line="277"/>
         <source>&amp;Install</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Setja upp</translation>
     </message>
     <message>
         <location filename="../src/libcalamaresui/ViewManager.cpp" line="325"/>
@@ -503,7 +503,7 @@ Uppsetningarforritið mun hætta og allar breytingar tapast.</translation>
         <location filename="../src/libcalamares/utils/CommandList.cpp" line="127"/>
         <location filename="../src/libcalamares/utils/CommandList.cpp" line="138"/>
         <source>Could not run command.</source>
-        <translation type="unfinished"/>
+        <translation>Gat ekki keyrt skipun.</translation>
     </message>
     <message>
         <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
@@ -559,7 +559,7 @@ Uppsetningarforritið mun hætta og allar breytingar tapast.</translation>
     <message>
         <location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="151"/>
         <source>LVM LV name</source>
-        <translation type="unfinished"/>
+        <translation>LVM LV nafn</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="188"/>
@@ -822,7 +822,7 @@ Uppsetningarforritið mun hætta og allar breytingar tapast.</translation>
     <message>
         <location filename="../src/modules/partition/core/DeviceModel.cpp" line="89"/>
         <source>%1 - (%2)</source>
-        <translation type="unfinished"/>
+        <translation>%1 - (%2)</translation>
     </message>
 </context>
 <context>
@@ -1281,17 +1281,17 @@ Uppsetningarforritið mun hætta og allar breytingar tapast.</translation>
     <message>
         <location filename="../src/modules/users/CheckPWQuality.cpp" line="63"/>
         <source>Password is too short</source>
-        <translation type="unfinished"/>
+        <translation>Lykilorðið þitt er of stutt</translation>
     </message>
     <message>
         <location filename="../src/modules/users/CheckPWQuality.cpp" line="85"/>
         <source>Password is too long</source>
-        <translation type="unfinished"/>
+        <translation>Lykilorðið þitt er of langt</translation>
     </message>
     <message>
         <location filename="../src/modules/users/CheckPWQuality.cpp" line="151"/>
         <source>Password is too weak</source>
-        <translation type="unfinished"/>
+        <translation>Lykilorðið þitt er of veikt</translation>
     </message>
     <message>
         <location filename="../src/modules/users/CheckPWQuality.cpp" line="158"/>
@@ -1386,7 +1386,7 @@ Uppsetningarforritið mun hætta og allar breytingar tapast.</translation>
     <message>
         <location filename="../src/modules/users/CheckPWQuality.cpp" line="196"/>
         <source>The password is too short</source>
-        <translation type="unfinished"/>
+        <translation>Lykilorðið er of stutt</translation>
     </message>
     <message>
         <location filename="../src/modules/users/CheckPWQuality.cpp" line="198"/>
@@ -1906,7 +1906,7 @@ Uppsetningarforritið mun hætta og allar breytingar tapast.</translation>
     <message>
         <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="85"/>
         <source>Saving files for later ...</source>
-        <translation type="unfinished"/>
+        <translation>Vista skrár fyrir seinna ...</translation>
     </message>
     <message>
         <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="123"/>
@@ -2540,7 +2540,7 @@ Output:
         <location filename="../src/qml/calamares/slideshow/SlideCounter.qml" line="36"/>
         <source>%L1 / %L2</source>
         <extracomment>slide counter, %1 of %2 (numeric)</extracomment>
-        <translation type="unfinished"/>
+        <translation>%L1 / %L2</translation>
     </message>
 </context>
 <context>
@@ -2640,7 +2640,7 @@ Output:
         <location filename="../src/modules/tracking/page_trackingstep.ui" line="195"/>
         <location filename="../src/modules/tracking/page_trackingstep.ui" line="257"/>
         <source>...</source>
-        <translation type="unfinished"/>
+        <translation>...</translation>
     </message>
     <message>
         <location filename="../src/modules/tracking/page_trackingstep.ui" line="271"/>
@@ -2753,7 +2753,7 @@ Output:
     <message>
         <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="82"/>
         <source>Total Size:</source>
-        <translation type="unfinished"/>
+        <translation>Heildar stærð:</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="92"/>
@@ -2761,12 +2761,12 @@ Output:
         <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="132"/>
         <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="152"/>
         <source>---</source>
-        <translation type="unfinished"/>
+        <translation>---</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="102"/>
         <source>Used Size:</source>
-        <translation type="unfinished"/>
+        <translation>Notuð stærð:</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="122"/>
diff --git a/lang/calamares_ja.ts b/lang/calamares_ja.ts
index 001e1a19e..673f3e4bb 100644
--- a/lang/calamares_ja.ts
+++ b/lang/calamares_ja.ts
@@ -1751,7 +1751,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="217"/>
         <source>Are you sure you want to create a new partition table on %1?</source>
-        <translation>％1 上で新しいパーティションテーブルを作成します。よろしいですか？</translation>
+        <translation>%1 上で新しいパーティションテーブルを作成します。よろしいですか？</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="241"/>
diff --git a/lang/calamares_mk.ts b/lang/calamares_mk.ts
new file mode 100644
index 000000000..a1b95a0da
--- /dev/null
+++ b/lang/calamares_mk.ts
@@ -0,0 +1,2847 @@
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="mk" version="2.1">
+<context>
+    <name>BootInfoWidget</name>
+    <message>
+        <location filename="../src/modules/partition/gui/BootInfoWidget.cpp" line="69"/>
+        <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="79"/>
+        <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="91"/>
+        <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="76"/>
+        <source>Boot Partition</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="81"/>
+        <source>System Partition</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="111"/>
+        <source>Do not install a boot loader</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="125"/>
+        <source>%1 (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Calamares::BlankViewStep</name>
+    <message>
+        <location filename="../src/libcalamaresui/viewpages/BlankViewStep.cpp" line="69"/>
+        <source>Blank Page</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Calamares::DebugWindow</name>
+    <message>
+        <location filename="../src/libcalamaresui/utils/DebugWindow.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libcalamaresui/utils/DebugWindow.ui" line="24"/>
+        <source>GlobalStorage</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libcalamaresui/utils/DebugWindow.ui" line="34"/>
+        <source>JobQueue</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libcalamaresui/utils/DebugWindow.ui" line="44"/>
+        <source>Modules</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libcalamaresui/utils/DebugWindow.ui" line="57"/>
+        <source>Type:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libcalamaresui/utils/DebugWindow.ui" line="64"/>
+        <location filename="../src/libcalamaresui/utils/DebugWindow.ui" line="78"/>
+        <source>none</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libcalamaresui/utils/DebugWindow.ui" line="71"/>
+        <source>Interface:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libcalamaresui/utils/DebugWindow.ui" line="93"/>
+        <source>Tools</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="182"/>
+        <source>Debug information</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Calamares::ExecutionViewStep</name>
+    <message>
+        <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="79"/>
+        <source>Install</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Calamares::JobThread</name>
+    <message>
+        <location filename="../src/libcalamares/JobQueue.cpp" line="101"/>
+        <source>Done</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Calamares::ProcessJob</name>
+    <message>
+        <location filename="../src/libcalamares/ProcessJob.cpp" line="52"/>
+        <source>Run command %1 %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/ProcessJob.cpp" line="61"/>
+        <source>Running command %1 %2</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Calamares::PythonJob</name>
+    <message>
+        <location filename="../src/libcalamares/PythonJob.cpp" line="273"/>
+        <source>Running %1 operation.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/PythonJob.cpp" line="288"/>
+        <source>Bad working directory path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/PythonJob.cpp" line="289"/>
+        <source>Working directory %1 for python job %2 is not readable.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/PythonJob.cpp" line="299"/>
+        <source>Bad main script file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/PythonJob.cpp" line="300"/>
+        <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="376"/>
+        <source>Boost.Python error in job &quot;%1&quot;.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Calamares::ViewManager</name>
+    <message>
+        <location filename="../src/libcalamaresui/ViewManager.cpp" line="74"/>
+        <source>&amp;Back</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libcalamaresui/ViewManager.cpp" line="75"/>
+        <location filename="../src/libcalamaresui/ViewManager.cpp" line="279"/>
+        <source>&amp;Next</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libcalamaresui/ViewManager.cpp" line="76"/>
+        <location filename="../src/libcalamaresui/ViewManager.cpp" line="288"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libcalamaresui/ViewManager.cpp" line="77"/>
+        <location filename="../src/libcalamaresui/ViewManager.cpp" line="289"/>
+        <source>Cancel installation without changing the system.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libcalamaresui/ViewManager.cpp" line="179"/>
+        <source>Calamares Initialization Failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libcalamaresui/ViewManager.cpp" line="180"/>
+        <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="185"/>
+        <source>&lt;br/&gt;The following modules could not be loaded:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libcalamaresui/ViewManager.cpp" line="277"/>
+        <source>&amp;Install</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libcalamaresui/ViewManager.cpp" line="325"/>
+        <source>Cancel installation?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libcalamaresui/ViewManager.cpp" line="326"/>
+        <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>
+    <message>
+        <location filename="../src/libcalamaresui/ViewManager.cpp" line="331"/>
+        <source>&amp;Yes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libcalamaresui/ViewManager.cpp" line="332"/>
+        <source>&amp;No</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libcalamaresui/ViewManager.cpp" line="163"/>
+        <source>&amp;Close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libcalamaresui/ViewManager.cpp" line="237"/>
+        <source>Continue with setup?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libcalamaresui/ViewManager.cpp" line="238"/>
+        <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="243"/>
+        <source>&amp;Install now</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libcalamaresui/ViewManager.cpp" line="244"/>
+        <source>Go &amp;back</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libcalamaresui/ViewManager.cpp" line="283"/>
+        <source>&amp;Done</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libcalamaresui/ViewManager.cpp" line="284"/>
+        <source>The installation is complete. Close the installer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libcalamaresui/ViewManager.cpp" line="160"/>
+        <source>Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libcalamaresui/ViewManager.cpp" line="161"/>
+        <source>Installation Failed</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CalamaresPython::Helper</name>
+    <message>
+        <location filename="../src/libcalamares/PythonHelper.cpp" line="270"/>
+        <source>Unknown exception type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/PythonHelper.cpp" line="284"/>
+        <source>unparseable Python error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/PythonHelper.cpp" line="324"/>
+        <source>unparseable Python traceback</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/PythonHelper.cpp" line="329"/>
+        <source>Unfetchable Python error.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CalamaresWindow</name>
+    <message>
+        <location filename="../src/calamares/CalamaresWindow.cpp" line="44"/>
+        <source>%1 Installer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/calamares/CalamaresWindow.cpp" line="111"/>
+        <source>Show debug information</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CheckerWidget</name>
+    <message>
+        <location filename="../src/modules/welcome/checker/CheckerWidget.cpp" line="96"/>
+        <source>This computer does not satisfy the minimum requirements for installing %1.&lt;br/&gt;Installation cannot continue. &lt;a href=&quot;#details&quot;&gt;Details...&lt;/a&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/welcome/checker/CheckerWidget.cpp" line="113"/>
+        <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/checker/CheckerWidget.cpp" line="151"/>
+        <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/checker/CheckerWidget.cpp" line="174"/>
+        <source>For best results, please ensure that this computer:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/welcome/checker/CheckerWidget.cpp" line="202"/>
+        <source>System requirements</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ChoicePage</name>
+    <message>
+        <location filename="../src/modules/partition/gui/ChoicePage.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="131"/>
+        <source>After:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="238"/>
+        <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="1001"/>
+        <source>Boot loader location:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="945"/>
+        <source>%1 will be shrunk to %2MB and a new %3MB partition will be created for %4.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="129"/>
+        <source>Select storage de&amp;vice:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="130"/>
+        <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="927"/>
+        <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="973"/>
+        <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1052"/>
+        <source>Current:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="798"/>
+        <source>Reuse %1 as home partition for %2.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="928"/>
+        <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="1043"/>
+        <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="1099"/>
+        <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="1108"/>
+        <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="1116"/>
+        <source>EFI system partition:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1232"/>
+        <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="1237"/>
+        <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1274"/>
+        <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1296"/>
+        <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1320"/>
+        <source>&lt;strong&gt;Erase disk&lt;/strong&gt;&lt;br/&gt;This will &lt;font color=&quot;red&quot;&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="1264"/>
+        <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="1241"/>
+        <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1270"/>
+        <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1292"/>
+        <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1316"/>
+        <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="1245"/>
+        <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1279"/>
+        <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1300"/>
+        <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1324"/>
+        <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="1287"/>
+        <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="1311"/>
+        <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>
+</context>
+<context>
+    <name>ClearMountsJob</name>
+    <message>
+        <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="46"/>
+        <source>Clear mounts for partitioning operations on %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="54"/>
+        <source>Clearing mounts for partitioning operations on %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="191"/>
+        <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="42"/>
+        <source>Clear all temporary mounts.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/jobs/ClearTempMountsJob.cpp" line="49"/>
+        <source>Clearing all temporary mounts.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/jobs/ClearTempMountsJob.cpp" line="60"/>
+        <source>Cannot get list of temporary mounts.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/jobs/ClearTempMountsJob.cpp" line="99"/>
+        <source>Cleared all temporary mounts.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CommandList</name>
+    <message>
+        <location filename="../src/libcalamares/utils/CommandList.cpp" line="127"/>
+        <location filename="../src/libcalamares/utils/CommandList.cpp" line="138"/>
+        <source>Could not run command.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
+        <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="139"/>
+        <source>The command needs to know the user&apos;s name, but no username is defined.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ContextualProcessJob</name>
+    <message>
+        <location filename="../src/modules/contextualprocess/ContextualProcessJob.cpp" line="117"/>
+        <source>Contextual Processes Job</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CreatePartitionDialog</name>
+    <message>
+        <location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="14"/>
+        <source>Create a Partition</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="48"/>
+        <source> MiB</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="55"/>
+        <source>Partition &amp;Type:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="67"/>
+        <source>&amp;Primary</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="77"/>
+        <source>E&amp;xtended</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="119"/>
+        <source>Fi&amp;le System:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="151"/>
+        <source>LVM LV name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="188"/>
+        <source>Flags:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="161"/>
+        <source>&amp;Mount Point:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="38"/>
+        <source>Si&amp;ze:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/CreatePartitionDialog.cpp" line="72"/>
+        <source>En&amp;crypt</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/CreatePartitionDialog.cpp" line="151"/>
+        <source>Logical</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/CreatePartitionDialog.cpp" line="156"/>
+        <source>Primary</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/CreatePartitionDialog.cpp" line="173"/>
+        <source>GPT</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/CreatePartitionDialog.cpp" line="262"/>
+        <source>Mountpoint already in use. Please select another one.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CreatePartitionJob</name>
+    <message>
+        <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="44"/>
+        <source>Create new %2MB partition on %4 (%3) with file system %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="55"/>
+        <source>Create new &lt;strong&gt;%2MB&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="67"/>
+        <source>Creating new %1 partition on %2.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="79"/>
+        <source>The installer failed to create partition on disk &apos;%1&apos;.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CreatePartitionTableDialog</name>
+    <message>
+        <location filename="../src/modules/partition/gui/CreatePartitionTableDialog.ui" line="20"/>
+        <source>Create Partition Table</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/CreatePartitionTableDialog.ui" line="39"/>
+        <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="65"/>
+        <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="72"/>
+        <source>Master Boot Record (MBR)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/CreatePartitionTableDialog.ui" line="82"/>
+        <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="47"/>
+        <source>Create new %1 partition table on %2.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/jobs/CreatePartitionTableJob.cpp" line="54"/>
+        <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="64"/>
+        <source>Creating new %1 partition table on %2.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/jobs/CreatePartitionTableJob.cpp" line="82"/>
+        <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="51"/>
+        <source>Create user %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/users/CreateUserJob.cpp" line="58"/>
+        <source>Create user &lt;strong&gt;%1&lt;/strong&gt;.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/users/CreateUserJob.cpp" line="65"/>
+        <source>Creating user %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/users/CreateUserJob.cpp" line="81"/>
+        <source>Sudoers dir is not writable.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/users/CreateUserJob.cpp" line="85"/>
+        <source>Cannot create sudoers file for writing.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/users/CreateUserJob.cpp" line="93"/>
+        <source>Cannot chmod sudoers file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/users/CreateUserJob.cpp" line="99"/>
+        <source>Cannot open groups file for reading.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CreateVolumeGroupJob</name>
+    <message>
+        <location filename="../src/modules/partition/jobs/CreateVolumeGroupJob.cpp" line="38"/>
+        <source>Create new volume group named %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/jobs/CreateVolumeGroupJob.cpp" line="45"/>
+        <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="52"/>
+        <source>Creating new volume group named %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/jobs/CreateVolumeGroupJob.cpp" line="65"/>
+        <source>The installer failed to create a volume group named &apos;%1&apos;.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DeactivateVolumeGroupJob</name>
+    <message>
+        <location filename="../src/modules/partition/jobs/DeactivateVolumeGroupJob.cpp" line="34"/>
+        <location filename="../src/modules/partition/jobs/DeactivateVolumeGroupJob.cpp" line="48"/>
+        <source>Deactivate volume group named %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/jobs/DeactivateVolumeGroupJob.cpp" line="41"/>
+        <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="61"/>
+        <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="40"/>
+        <source>Delete partition %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/jobs/DeletePartitionJob.cpp" line="48"/>
+        <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="56"/>
+        <source>Deleting partition %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/jobs/DeletePartitionJob.cpp" line="68"/>
+        <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="150"/>
+        <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>
+    <message>
+        <location filename="../src/modules/partition/gui/DeviceInfoWidget.cpp" line="107"/>
+        <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="114"/>
+        <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="121"/>
+        <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="131"/>
+        <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="137"/>
+        <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>
+</context>
+<context>
+    <name>DeviceModel</name>
+    <message>
+        <location filename="../src/modules/partition/core/DeviceModel.cpp" line="83"/>
+        <source>%1 - %2 (%3)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/core/DeviceModel.cpp" line="89"/>
+        <source>%1 - (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DracutLuksCfgJob</name>
+    <message>
+        <location filename="../src/modules/dracutlukscfg/DracutLuksCfgJob.cpp" line="131"/>
+        <source>Write LUKS configuration for Dracut to %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/dracutlukscfg/DracutLuksCfgJob.cpp" line="133"/>
+        <source>Skip writing LUKS configuration for Dracut: &quot;/&quot; partition is not encrypted</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/dracutlukscfg/DracutLuksCfgJob.cpp" line="149"/>
+        <source>Failed to open %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DummyCppJob</name>
+    <message>
+        <location filename="../src/modules/dummycpp/DummyCppJob.cpp" line="47"/>
+        <source>Dummy C++ Job</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EditExistingPartitionDialog</name>
+    <message>
+        <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="20"/>
+        <source>Edit Existing Partition</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="50"/>
+        <source>Content:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="60"/>
+        <source>&amp;Keep</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="70"/>
+        <source>Format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="89"/>
+        <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="99"/>
+        <source>&amp;Mount Point:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="119"/>
+        <source>Si&amp;ze:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="129"/>
+        <source> MiB</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="136"/>
+        <source>Fi&amp;le System:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="149"/>
+        <source>Flags:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="269"/>
+        <source>Mountpoint already in use. Please select another one.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EncryptWidget</name>
+    <message>
+        <location filename="../src/modules/partition/gui/EncryptWidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/EncryptWidget.ui" line="32"/>
+        <source>En&amp;crypt system</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/EncryptWidget.ui" line="42"/>
+        <source>Passphrase</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/EncryptWidget.ui" line="52"/>
+        <source>Confirm passphrase</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/EncryptWidget.cpp" line="151"/>
+        <source>Please enter the same passphrase in both boxes.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>FillGlobalStorageJob</name>
+    <message>
+        <location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="132"/>
+        <source>Set partition information</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="156"/>
+        <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="160"/>
+        <source>Set up &lt;strong&gt;new&lt;/strong&gt; %2 partition with mount point &lt;strong&gt;%1&lt;/strong&gt;.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="168"/>
+        <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="173"/>
+        <source>Set up %3 partition &lt;strong&gt;%1&lt;/strong&gt; with mount point &lt;strong&gt;%2&lt;/strong&gt;.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="185"/>
+        <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="195"/>
+        <source>Setting up mount points.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>FinishedPage</name>
+    <message>
+        <location filename="../src/modules/finished/FinishedPage.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/finished/FinishedPage.ui" line="95"/>
+        <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=&quot; font-style:italic;&quot;&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.ui" line="98"/>
+        <source>&amp;Restart now</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/finished/FinishedPage.cpp" line="51"/>
+        <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="109"/>
+        <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>FinishedViewStep</name>
+    <message>
+        <location filename="../src/modules/finished/FinishedViewStep.cpp" line="59"/>
+        <source>Finish</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/finished/FinishedViewStep.cpp" line="124"/>
+        <source>Installation Complete</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/finished/FinishedViewStep.cpp" line="125"/>
+        <source>The installation of %1 is complete.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>FormatPartitionJob</name>
+    <message>
+        <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="41"/>
+        <source>Format partition %1 (file system: %2, size: %3 MB) on %4.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="52"/>
+        <source>Format &lt;strong&gt;%3MB&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>Formatting partition %1 with file system %2.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="77"/>
+        <source>The installer failed to format partition %1 on disk &apos;%2&apos;.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>InteractiveTerminalPage</name>
+    <message>
+        <location filename="../src/modules/interactiveterminal/InteractiveTerminalPage.cpp" line="53"/>
+        <source>Konsole not installed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/interactiveterminal/InteractiveTerminalPage.cpp" line="54"/>
+        <source>Please install KDE Konsole and try again!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/interactiveterminal/InteractiveTerminalPage.cpp" line="116"/>
+        <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="45"/>
+        <source>Script</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KeyboardPage</name>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="219"/>
+        <source>Set keyboard model to %1.&lt;br/&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="221"/>
+        <source>Set keyboard layout to %1/%2.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KeyboardViewStep</name>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardViewStep.cpp" line="50"/>
+        <source>Keyboard</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>LCLocaleDialog</name>
+    <message>
+        <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="34"/>
+        <source>System locale setting</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="41"/>
+        <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="66"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="67"/>
+        <source>&amp;OK</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>LicensePage</name>
+    <message>
+        <location filename="../src/modules/license/LicensePage.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/license/LicensePage.cpp" line="89"/>
+        <source>I accept the terms and conditions above.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/license/LicensePage.cpp" line="116"/>
+        <source>&lt;h1&gt;License Agreement&lt;/h1&gt;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="119"/>
+        <source>Please review the End User License Agreements (EULAs) above.&lt;br/&gt;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="125"/>
+        <source>&lt;h1&gt;License Agreement&lt;/h1&gt;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="130"/>
+        <source>Please review the End User License Agreements (EULAs) above.&lt;br/&gt;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>
+    <message>
+        <location filename="../src/modules/license/LicensePage.cpp" line="160"/>
+        <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/LicensePage.cpp" line="167"/>
+        <source>&lt;strong&gt;%1 graphics driver&lt;/strong&gt;&lt;br/&gt;&lt;font color=&quot;Grey&quot;&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/LicensePage.cpp" line="173"/>
+        <source>&lt;strong&gt;%1 browser plugin&lt;/strong&gt;&lt;br/&gt;&lt;font color=&quot;Grey&quot;&gt;by %2&lt;/font&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/license/LicensePage.cpp" line="179"/>
+        <source>&lt;strong&gt;%1 codec&lt;/strong&gt;&lt;br/&gt;&lt;font color=&quot;Grey&quot;&gt;by %2&lt;/font&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/license/LicensePage.cpp" line="185"/>
+        <source>&lt;strong&gt;%1 package&lt;/strong&gt;&lt;br/&gt;&lt;font color=&quot;Grey&quot;&gt;by %2&lt;/font&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/license/LicensePage.cpp" line="191"/>
+        <source>&lt;strong&gt;%1&lt;/strong&gt;&lt;br/&gt;&lt;font color=&quot;Grey&quot;&gt;by %2&lt;/font&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/license/LicensePage.cpp" line="203"/>
+        <source>&lt;a href=&quot;%1&quot;&gt;view license agreement&lt;/a&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>LicenseViewStep</name>
+    <message>
+        <location filename="../src/modules/license/LicenseViewStep.cpp" line="51"/>
+        <source>License</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>LocalePage</name>
+    <message>
+        <location filename="../src/modules/locale/LocalePage.cpp" line="387"/>
+        <source>The system language will be set to %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/locale/LocalePage.cpp" line="389"/>
+        <source>The numbers and dates locale will be set to %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/locale/LocalePage.cpp" line="215"/>
+        <source>Region:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/locale/LocalePage.cpp" line="216"/>
+        <source>Zone:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/locale/LocalePage.cpp" line="220"/>
+        <location filename="../src/modules/locale/LocalePage.cpp" line="221"/>
+        <source>&amp;Change...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/locale/LocalePage.cpp" line="398"/>
+        <source>Set timezone to %1/%2.&lt;br/&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/locale/LocalePage.cpp" line="480"/>
+        <source>%1 (%2)</source>
+        <extracomment>Language (Country)</extracomment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>LocaleViewStep</name>
+    <message>
+        <location filename="../src/modules/locale/LocaleViewStep.cpp" line="60"/>
+        <source>Loading location data...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/locale/LocaleViewStep.cpp" line="175"/>
+        <source>Location</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>NetInstallPage</name>
+    <message>
+        <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="64"/>
+        <source>Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="65"/>
+        <source>Description</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="86"/>
+        <source>Network Installation. (Disabled: Unable to fetch package lists, check your network connection)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="96"/>
+        <source>Network Installation. (Disabled: Received invalid groups data)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>NetInstallViewStep</name>
+    <message>
+        <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="54"/>
+        <source>Package selection</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>PWQ</name>
+    <message>
+        <location filename="../src/modules/users/CheckPWQuality.cpp" line="63"/>
+        <source>Password is too short</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/users/CheckPWQuality.cpp" line="85"/>
+        <source>Password is too long</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/users/CheckPWQuality.cpp" line="151"/>
+        <source>Password is too weak</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/users/CheckPWQuality.cpp" line="158"/>
+        <source>Memory allocation error when setting &apos;%1&apos;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/users/CheckPWQuality.cpp" line="162"/>
+        <source>Memory allocation error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/users/CheckPWQuality.cpp" line="164"/>
+        <source>The password is the same as the old one</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/users/CheckPWQuality.cpp" line="166"/>
+        <source>The password is a palindrome</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/users/CheckPWQuality.cpp" line="168"/>
+        <source>The password differs with case changes only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/users/CheckPWQuality.cpp" line="170"/>
+        <source>The password is too similar to the old one</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/users/CheckPWQuality.cpp" line="172"/>
+        <source>The password contains the user name in some form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/users/CheckPWQuality.cpp" line="174"/>
+        <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="176"/>
+        <source>The password contains forbidden words in some form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/users/CheckPWQuality.cpp" line="179"/>
+        <source>The password contains less than %1 digits</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/users/CheckPWQuality.cpp" line="180"/>
+        <source>The password contains too few digits</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/users/CheckPWQuality.cpp" line="183"/>
+        <source>The password contains less than %1 uppercase letters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/users/CheckPWQuality.cpp" line="184"/>
+        <source>The password contains too few uppercase letters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/users/CheckPWQuality.cpp" line="187"/>
+        <source>The password contains less than %1 lowercase letters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/users/CheckPWQuality.cpp" line="188"/>
+        <source>The password contains too few lowercase letters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/users/CheckPWQuality.cpp" line="191"/>
+        <source>The password contains less than %1 non-alphanumeric characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/users/CheckPWQuality.cpp" line="192"/>
+        <source>The password contains too few non-alphanumeric characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/users/CheckPWQuality.cpp" line="195"/>
+        <source>The password is shorter than %1 characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/users/CheckPWQuality.cpp" line="196"/>
+        <source>The password is too short</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/users/CheckPWQuality.cpp" line="198"/>
+        <source>The password is just rotated old one</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/users/CheckPWQuality.cpp" line="201"/>
+        <source>The password contains less than %1 character classes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/users/CheckPWQuality.cpp" line="202"/>
+        <source>The password does not contain enough character classes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/users/CheckPWQuality.cpp" line="205"/>
+        <source>The password contains more than %1 same characters consecutively</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/users/CheckPWQuality.cpp" line="206"/>
+        <source>The password contains too many same characters consecutively</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/users/CheckPWQuality.cpp" line="209"/>
+        <source>The password contains more than %1 characters of the same class consecutively</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/users/CheckPWQuality.cpp" line="210"/>
+        <source>The password contains too many characters of the same class consecutively</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/users/CheckPWQuality.cpp" line="213"/>
+        <source>The password contains monotonic sequence longer than %1 characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/users/CheckPWQuality.cpp" line="214"/>
+        <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="216"/>
+        <source>No password supplied</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/users/CheckPWQuality.cpp" line="218"/>
+        <source>Cannot obtain random numbers from the RNG device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/users/CheckPWQuality.cpp" line="220"/>
+        <source>Password generation failed - required entropy too low for settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/users/CheckPWQuality.cpp" line="225"/>
+        <source>The password fails the dictionary check - %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/users/CheckPWQuality.cpp" line="227"/>
+        <source>The password fails the dictionary check</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/users/CheckPWQuality.cpp" line="231"/>
+        <source>Unknown setting - %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/users/CheckPWQuality.cpp" line="235"/>
+        <source>Unknown setting</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/users/CheckPWQuality.cpp" line="239"/>
+        <source>Bad integer value of setting - %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/users/CheckPWQuality.cpp" line="243"/>
+        <source>Bad integer value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/users/CheckPWQuality.cpp" line="247"/>
+        <source>Setting %1 is not of integer type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/users/CheckPWQuality.cpp" line="251"/>
+        <source>Setting is not of integer type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/users/CheckPWQuality.cpp" line="255"/>
+        <source>Setting %1 is not of string type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/users/CheckPWQuality.cpp" line="259"/>
+        <source>Setting is not of string type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/users/CheckPWQuality.cpp" line="261"/>
+        <source>Opening the configuration file failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/users/CheckPWQuality.cpp" line="263"/>
+        <source>The configuration file is malformed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/users/CheckPWQuality.cpp" line="265"/>
+        <source>Fatal failure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/users/CheckPWQuality.cpp" line="267"/>
+        <source>Unknown error</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Page_Keyboard</name>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardPage.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardPage.ui" line="70"/>
+        <source>Keyboard Model:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardPage.ui" line="131"/>
+        <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="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/users/page_usersetup.ui" line="36"/>
+        <source>What is your name?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/users/page_usersetup.ui" line="117"/>
+        <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="306"/>
+        <location filename="../src/modules/users/page_usersetup.ui" line="437"/>
+        <location filename="../src/modules/users/page_usersetup.ui" line="582"/>
+        <source>font-weight: normal</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/users/page_usersetup.ui" line="200"/>
+        <source>&lt;small&gt;If more than one person will use this computer, you can set up multiple accounts after installation.&lt;/small&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/users/page_usersetup.ui" line="335"/>
+        <source>Choose a password to keep your account safe.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/users/page_usersetup.ui" line="440"/>
+        <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="226"/>
+        <source>What is the name of this computer?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/users/page_usersetup.ui" line="309"/>
+        <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="450"/>
+        <source>Log in automatically without asking for the password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/users/page_usersetup.ui" line="457"/>
+        <source>Use the same password for the administrator account.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/users/page_usersetup.ui" line="480"/>
+        <source>Choose a password for the administrator account.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/users/page_usersetup.ui" line="585"/>
+        <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="193"/>
+        <source>Root</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="196"/>
+        <source>Home</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="198"/>
+        <source>Boot</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="201"/>
+        <source>EFI system</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="203"/>
+        <source>Swap</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="205"/>
+        <source>New partition for %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="207"/>
+        <source>New partition</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="224"/>
+        <source>%1  %2</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>PartitionModel</name>
+    <message>
+        <location filename="../src/modules/partition/core/PartitionModel.cpp" line="138"/>
+        <location filename="../src/modules/partition/core/PartitionModel.cpp" line="170"/>
+        <source>Free Space</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/core/PartitionModel.cpp" line="142"/>
+        <location filename="../src/modules/partition/core/PartitionModel.cpp" line="174"/>
+        <source>New partition</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/core/PartitionModel.cpp" line="258"/>
+        <source>Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/core/PartitionModel.cpp" line="260"/>
+        <source>File System</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/core/PartitionModel.cpp" line="262"/>
+        <source>Mount Point</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/core/PartitionModel.cpp" line="264"/>
+        <source>Size</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>PartitionPage</name>
+    <message>
+        <location filename="../src/modules/partition/gui/PartitionPage.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/PartitionPage.ui" line="22"/>
+        <source>Storage de&amp;vice:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/PartitionPage.ui" line="51"/>
+        <source>&amp;Revert All Changes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/PartitionPage.ui" line="87"/>
+        <source>New Partition &amp;Table</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/PartitionPage.ui" line="107"/>
+        <source>Cre&amp;ate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/PartitionPage.ui" line="114"/>
+        <source>&amp;Edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/PartitionPage.ui" line="121"/>
+        <source>&amp;Delete</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/PartitionPage.ui" line="132"/>
+        <source>New Volume Group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/PartitionPage.ui" line="139"/>
+        <source>Resize Volume Group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/PartitionPage.ui" line="146"/>
+        <source>Deactivate Volume Group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/PartitionPage.ui" line="153"/>
+        <source>Remove Volume Group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/PartitionPage.ui" line="180"/>
+        <source>I&amp;nstall boot loader on:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="217"/>
+        <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="241"/>
+        <source>Can not create new partition</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="242"/>
+        <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/gui/PartitionViewStep.cpp" line="71"/>
+        <source>Gathering system information...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="122"/>
+        <source>Partitions</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="159"/>
+        <source>Install %1 &lt;strong&gt;alongside&lt;/strong&gt; another operating system.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="163"/>
+        <source>&lt;strong&gt;Erase&lt;/strong&gt; disk and install %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="167"/>
+        <source>&lt;strong&gt;Replace&lt;/strong&gt; a partition with %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="172"/>
+        <source>&lt;strong&gt;Manual&lt;/strong&gt; partitioning.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="185"/>
+        <source>Install %1 &lt;strong&gt;alongside&lt;/strong&gt; another operating system on disk &lt;strong&gt;%2&lt;/strong&gt; (%3).</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="191"/>
+        <source>&lt;strong&gt;Erase&lt;/strong&gt; disk &lt;strong&gt;%2&lt;/strong&gt; (%3) and install %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="197"/>
+        <source>&lt;strong&gt;Replace&lt;/strong&gt; a partition on disk &lt;strong&gt;%2&lt;/strong&gt; (%3) with %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="204"/>
+        <source>&lt;strong&gt;Manual&lt;/strong&gt; partitioning on disk &lt;strong&gt;%1&lt;/strong&gt; (%2).</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="212"/>
+        <source>Disk &lt;strong&gt;%1&lt;/strong&gt; (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="240"/>
+        <source>Current:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="257"/>
+        <source>After:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="400"/>
+        <source>No EFI system partition configured</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="401"/>
+        <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 FAT32 filesystem with the &lt;strong&gt;esp&lt;/strong&gt; flag enabled and mount point &lt;strong&gt;%2&lt;/strong&gt;.&lt;br/&gt;&lt;br/&gt;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/gui/PartitionViewStep.cpp" line="414"/>
+        <source>EFI system partition flag not set</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="415"/>
+        <source>An EFI system partition is necessary to start %1.&lt;br/&gt;&lt;br/&gt;A partition was configured with mount point &lt;strong&gt;%2&lt;/strong&gt; but its &lt;strong&gt;esp&lt;/strong&gt; flag is not set.&lt;br/&gt;To set the flag, go back and edit the partition.&lt;br/&gt;&lt;br/&gt;You can continue without setting the flag but your system may fail to start.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="450"/>
+        <source>Boot partition not encrypted</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="451"/>
+        <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>
+</context>
+<context>
+    <name>PlasmaLnfJob</name>
+    <message>
+        <location filename="../src/modules/plasmalnf/PlasmaLnfJob.cpp" line="41"/>
+        <source>Plasma Look-and-Feel Job</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/plasmalnf/PlasmaLnfJob.cpp" line="73"/>
+        <location filename="../src/modules/plasmalnf/PlasmaLnfJob.cpp" line="74"/>
+        <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="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/plasmalnf/page_plasmalnf.ui" line="20"/>
+        <source>Placeholder</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/plasmalnf/PlasmaLnfPage.cpp" line="67"/>
+        <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="68"/>
+        <source>Look-and-Feel</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>PreserveFiles</name>
+    <message>
+        <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="85"/>
+        <source>Saving files for later ...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="123"/>
+        <source>No files configured to save for later.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="177"/>
+        <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="271"/>
+        <source>
+There was no output from the command.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="272"/>
+        <source>
+Output:
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="275"/>
+        <source>External command crashed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="276"/>
+        <source>Command &lt;i&gt;%1&lt;/i&gt; crashed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="281"/>
+        <source>External command failed to start.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="282"/>
+        <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="286"/>
+        <source>Internal error when starting command.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="287"/>
+        <source>Bad parameters for process job call.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="290"/>
+        <source>External command failed to finish.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="291"/>
+        <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="297"/>
+        <source>External command finished with errors.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="298"/>
+        <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/modules/keyboard/keyboardwidget/keyboardglobal.cpp" line="82"/>
+        <source>Default Keyboard Model</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/keyboardwidget/keyboardglobal.cpp" line="127"/>
+        <location filename="../src/modules/keyboard/keyboardwidget/keyboardglobal.cpp" line="163"/>
+        <source>Default</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/core/KPMHelpers.cpp" line="207"/>
+        <source>unknown</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/core/KPMHelpers.cpp" line="209"/>
+        <source>extended</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/core/KPMHelpers.cpp" line="211"/>
+        <source>unformatted</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/core/KPMHelpers.cpp" line="213"/>
+        <source>swap</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="49"/>
+        <source>Unpartitioned space or unknown partition table</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>RemoveVolumeGroupJob</name>
+    <message>
+        <location filename="../src/modules/partition/jobs/RemoveVolumeGroupJob.cpp" line="34"/>
+        <location filename="../src/modules/partition/jobs/RemoveVolumeGroupJob.cpp" line="48"/>
+        <source>Remove Volume Group named %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/jobs/RemoveVolumeGroupJob.cpp" line="41"/>
+        <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="61"/>
+        <source>The installer failed to remove a volume group named &apos;%1&apos;.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ReplaceWidget</name>
+    <message>
+        <location filename="../src/modules/partition/gui/ReplaceWidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="134"/>
+        <source>Select where to install %1.&lt;br/&gt;&lt;font color=&quot;red&quot;&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="160"/>
+        <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="168"/>
+        <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="178"/>
+        <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="188"/>
+        <source>%1 cannot be installed on this partition.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="194"/>
+        <source>Data partition (%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="211"/>
+        <source>Unknown system partition (%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="216"/>
+        <source>%1 system partition (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="227"/>
+        <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="250"/>
+        <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="261"/>
+        <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="278"/>
+        <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="302"/>
+        <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=&quot;red&quot;&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="270"/>
+        <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="286"/>
+        <source>EFI system partition:</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>RequirementsChecker</name>
+    <message>
+        <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="68"/>
+        <source>Gathering system information...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="118"/>
+        <source>has at least %1 GB available drive space</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="120"/>
+        <source>There is not enough drive space. At least %1 GB is required.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="128"/>
+        <source>has at least %1 GB working memory</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="130"/>
+        <source>The system does not have enough working memory. At least %1 GB is required.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="138"/>
+        <source>is plugged in to a power source</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="139"/>
+        <source>The system is not plugged in to a power source.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="146"/>
+        <source>is connected to the Internet</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="147"/>
+        <source>The system is not connected to the Internet.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="155"/>
+        <source>The installer is not running with administrator rights.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="163"/>
+        <source>The screen is too small to display the installer.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ResizeFSJob</name>
+    <message>
+        <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="130"/>
+        <source>Resize Filesystem Job</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="238"/>
+        <source>Invalid configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="239"/>
+        <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="253"/>
+        <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="263"/>
+        <source>KPMCore not Available</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/>
+        <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="264"/>
+        <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="272"/>
+        <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="281"/>
+        <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="294"/>
+        <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="303"/>
+        <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="320"/>
+        <source>Resize Failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="273"/>
+        <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="274"/>
+        <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="282"/>
+        <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="295"/>
+        <source>The filesystem %1 cannot be resized.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="283"/>
+        <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="296"/>
+        <source>The device %1 cannot be resized.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="304"/>
+        <source>The filesystem %1 must be resized, but cannot.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="305"/>
+        <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="48"/>
+        <source>Resize partition %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="55"/>
+        <source>Resize &lt;strong&gt;%2MB&lt;/strong&gt; partition &lt;strong&gt;%1&lt;/strong&gt; to &lt;strong&gt;%3MB&lt;/strong&gt;.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="66"/>
+        <source>Resizing %2MB partition %1 to %3MB.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="85"/>
+        <source>The installer failed to resize partition %1 on disk &apos;%2&apos;.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ResizeVolumeGroupJob</name>
+    <message>
+        <location filename="../src/modules/partition/jobs/ResizeVolumeGroupJob.cpp" line="37"/>
+        <location filename="../src/modules/partition/jobs/ResizeVolumeGroupJob.cpp" line="55"/>
+        <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="46"/>
+        <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="70"/>
+        <source>The installer failed to resize a volume group named &apos;%1&apos;.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ScanningDialog</name>
+    <message>
+        <location filename="../src/modules/partition/gui/ScanningDialog.cpp" line="84"/>
+        <source>Scanning storage devices...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/ScanningDialog.cpp" line="85"/>
+        <source>Partitioning</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SetHostNameJob</name>
+    <message>
+        <location filename="../src/modules/users/SetHostNameJob.cpp" line="38"/>
+        <source>Set hostname %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/users/SetHostNameJob.cpp" line="45"/>
+        <source>Set hostname &lt;strong&gt;%1&lt;/strong&gt;.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/users/SetHostNameJob.cpp" line="52"/>
+        <source>Setting hostname %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/users/SetHostNameJob.cpp" line="62"/>
+        <location filename="../src/modules/users/SetHostNameJob.cpp" line="69"/>
+        <source>Internal Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/users/SetHostNameJob.cpp" line="76"/>
+        <location filename="../src/modules/users/SetHostNameJob.cpp" line="87"/>
+        <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="59"/>
+        <source>Set keyboard model to %1, layout to %2-%3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/SetKeyboardLayoutJob.cpp" line="321"/>
+        <source>Failed to write keyboard configuration for the virtual console.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/SetKeyboardLayoutJob.cpp" line="322"/>
+        <location filename="../src/modules/keyboard/SetKeyboardLayoutJob.cpp" line="326"/>
+        <location filename="../src/modules/keyboard/SetKeyboardLayoutJob.cpp" line="332"/>
+        <source>Failed to write to %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/SetKeyboardLayoutJob.cpp" line="325"/>
+        <source>Failed to write keyboard configuration for X11.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/SetKeyboardLayoutJob.cpp" line="331"/>
+        <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="49"/>
+        <source>Set flags on partition %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="52"/>
+        <source>Set flags on %1MB %2 partition.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="56"/>
+        <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="71"/>
+        <source>Clear flags on %1MB &lt;strong&gt;%2&lt;/strong&gt; partition.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="75"/>
+        <source>Clear flags on new partition.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="79"/>
+        <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="85"/>
+        <source>Flag %1MB &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="91"/>
+        <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="103"/>
+        <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="107"/>
+        <source>Clearing flags on %1MB &lt;strong&gt;%2&lt;/strong&gt; partition.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="111"/>
+        <source>Clearing flags on new partition.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="115"/>
+        <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="121"/>
+        <source>Setting flags &lt;strong&gt;%3&lt;/strong&gt; on %1MB &lt;strong&gt;%2&lt;/strong&gt; partition.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="127"/>
+        <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="144"/>
+        <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="48"/>
+        <source>Set password for user %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/users/SetPasswordJob.cpp" line="55"/>
+        <source>Setting password for user %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/users/SetPasswordJob.cpp" line="112"/>
+        <source>Bad destination system path.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/users/SetPasswordJob.cpp" line="113"/>
+        <source>rootMountPoint is %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/users/SetPasswordJob.cpp" line="123"/>
+        <source>Cannot disable root account.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/users/SetPasswordJob.cpp" line="124"/>
+        <source>passwd terminated with error code %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/users/SetPasswordJob.cpp" line="139"/>
+        <source>Cannot set password for user %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/users/SetPasswordJob.cpp" line="141"/>
+        <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="43"/>
+        <source>Set timezone to %1/%2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/locale/SetTimezoneJob.cpp" line="71"/>
+        <source>Cannot access selected timezone path.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/locale/SetTimezoneJob.cpp" line="72"/>
+        <source>Bad path: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/locale/SetTimezoneJob.cpp" line="86"/>
+        <source>Cannot set timezone.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/locale/SetTimezoneJob.cpp" line="87"/>
+        <source>Link creation failed, target: %1; link name: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/locale/SetTimezoneJob.cpp" line="96"/>
+        <source>Cannot set timezone,</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/locale/SetTimezoneJob.cpp" line="97"/>
+        <source>Cannot open /etc/timezone for writing</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ShellProcessJob</name>
+    <message>
+        <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="51"/>
+        <source>Shell Processes Job</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SlideCounter</name>
+    <message>
+        <location filename="../src/qml/calamares/slideshow/SlideCounter.qml" line="36"/>
+        <source>%L1 / %L2</source>
+        <extracomment>slide counter, %1 of %2 (numeric)</extracomment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SummaryPage</name>
+    <message>
+        <location filename="../src/modules/summary/SummaryPage.cpp" line="49"/>
+        <source>This is an overview of what will happen once you start the install procedure.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SummaryViewStep</name>
+    <message>
+        <location filename="../src/modules/summary/SummaryViewStep.cpp" line="43"/>
+        <source>Summary</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>TrackingInstallJob</name>
+    <message>
+        <location filename="../src/modules/tracking/TrackingJobs.cpp" line="43"/>
+        <source>Installation feedback</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/tracking/TrackingJobs.cpp" line="53"/>
+        <source>Sending installation feedback.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/tracking/TrackingJobs.cpp" line="88"/>
+        <source>Internal error in install-tracking.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/tracking/TrackingJobs.cpp" line="89"/>
+        <source>HTTP request timed out.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>TrackingMachineNeonJob</name>
+    <message>
+        <location filename="../src/modules/tracking/TrackingJobs.cpp" line="104"/>
+        <source>Machine feedback</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/tracking/TrackingJobs.cpp" line="114"/>
+        <source>Configuring machine feedback.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/tracking/TrackingJobs.cpp" line="133"/>
+        <location filename="../src/modules/tracking/TrackingJobs.cpp" line="136"/>
+        <source>Error in machine feedback configuration.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/tracking/TrackingJobs.cpp" line="134"/>
+        <source>Could not configure machine feedback correctly, script error %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/tracking/TrackingJobs.cpp" line="137"/>
+        <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="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/tracking/page_trackingstep.ui" line="24"/>
+        <source>Placeholder</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/tracking/page_trackingstep.ui" line="72"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;By selecting this, you will send &lt;span style=&quot; font-weight:600;&quot;&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="123"/>
+        <location filename="../src/modules/tracking/page_trackingstep.ui" line="185"/>
+        <location filename="../src/modules/tracking/page_trackingstep.ui" line="247"/>
+        <source>TextLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/tracking/page_trackingstep.ui" line="133"/>
+        <location filename="../src/modules/tracking/page_trackingstep.ui" line="195"/>
+        <location filename="../src/modules/tracking/page_trackingstep.ui" line="257"/>
+        <source>...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/tracking/page_trackingstep.ui" line="271"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a href=&quot;placeholder&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&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="44"/>
+        <source>Install tracking helps %1 to see how many users they have, what hardware they install %1 to and (with the last two options below), get continuous information about preferred applications. 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="45"/>
+        <source>By selecting this you will send information about your installation and hardware. This information will &lt;b&gt;only be sent once&lt;/b&gt; after the installation finishes.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/tracking/TrackingPage.cpp" line="46"/>
+        <source>By selecting this you will &lt;b&gt;periodically&lt;/b&gt; send information about your installation, hardware and applications, to %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/tracking/TrackingPage.cpp" line="47"/>
+        <source>By selecting this you will &lt;b&gt;regularly&lt;/b&gt; send information about your installation, hardware, applications and usage patterns, to %1.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>TrackingViewStep</name>
+    <message>
+        <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="59"/>
+        <source>Feedback</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>UsersPage</name>
+    <message>
+        <location filename="../src/modules/users/UsersPage.cpp" line="289"/>
+        <source>Your username is too long.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/users/UsersPage.cpp" line="295"/>
+        <source>Your username contains invalid characters. Only lowercase letters and numbers are allowed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/users/UsersPage.cpp" line="333"/>
+        <source>Your hostname is too short.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/users/UsersPage.cpp" line="339"/>
+        <source>Your hostname is too long.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/users/UsersPage.cpp" line="345"/>
+        <source>Your hostname contains invalid characters. Only letters, numbers and dashes are allowed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/users/UsersPage.cpp" line="373"/>
+        <location filename="../src/modules/users/UsersPage.cpp" line="417"/>
+        <source>Your passwords do not match!</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>UsersViewStep</name>
+    <message>
+        <location filename="../src/modules/users/UsersViewStep.cpp" line="53"/>
+        <source>Users</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>VolumeGroupBaseDialog</name>
+    <message>
+        <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="14"/>
+        <source>VolumeGroupDialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="20"/>
+        <source>List of Physical Volumes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="30"/>
+        <source>Volume Group Name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="43"/>
+        <source>Volume Group Type:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="56"/>
+        <source>Physical Extent Size:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="66"/>
+        <source> MiB</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="82"/>
+        <source>Total Size:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="92"/>
+        <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="112"/>
+        <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="132"/>
+        <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="152"/>
+        <source>---</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="102"/>
+        <source>Used Size:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="122"/>
+        <source>Total Sectors:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="142"/>
+        <source>Quantity of LVs:</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>WelcomePage</name>
+    <message>
+        <location filename="../src/modules/welcome/WelcomePage.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/welcome/WelcomePage.ui" line="75"/>
+        <source>&amp;Language:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/welcome/WelcomePage.ui" line="176"/>
+        <source>&amp;Release notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
+        <source>&amp;Known issues</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="146"/>
+        <source>&amp;About</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
+        <source>&lt;h1&gt;Welcome to the %1 installer.&lt;/h1&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
+        <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/WelcomePage.cpp" line="73"/>
+        <source>About %1 installer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/welcome/WelcomePage.cpp" line="75"/>
+        <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;Copyright 2014-2017 Teo Mrnjavac &amp;lt;teo@kde.org&amp;gt;&lt;br/&gt;Copyright 2017 Adriaan de Groot &amp;lt;groot@kde.org&amp;gt;&lt;br/&gt;Thanks to: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg and the &lt;a href=&quot;https://www.transifex.com/calamares/calamares/&quot;&gt;Calamares translators team&lt;/a&gt;.&lt;br/&gt;&lt;br/&gt;&lt;a href=&quot;https://calamares.io/&quot;&gt;Calamares&lt;/a&gt; development is sponsored by &lt;br/&gt;&lt;a href=&quot;http://www.blue-systems.com/&quot;&gt;Blue Systems&lt;/a&gt; - Liberating Software.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/modules/welcome/WelcomePage.cpp" line="290"/>
+        <source>%1 support</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>WelcomeViewStep</name>
+    <message>
+        <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="52"/>
+        <source>Welcome</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+</TS>
\ No newline at end of file
diff --git a/lang/calamares_ru.ts b/lang/calamares_ru.ts
index 6862e400d..1dffae487 100644
--- a/lang/calamares_ru.ts
+++ b/lang/calamares_ru.ts
@@ -718,22 +718,22 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/modules/partition/jobs/CreateVolumeGroupJob.cpp" line="38"/>
         <source>Create new volume group named %1.</source>
-        <translation type="unfinished"/>
+        <translation>Создать новую группу томов на диске %1</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/jobs/CreateVolumeGroupJob.cpp" line="45"/>
         <source>Create new volume group named &lt;strong&gt;%1&lt;/strong&gt;.</source>
-        <translation type="unfinished"/>
+        <translation>Создать новую группу томов на диске %1</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/jobs/CreateVolumeGroupJob.cpp" line="52"/>
         <source>Creating new volume group named %1.</source>
-        <translation type="unfinished"/>
+        <translation>Cоздание новой группы томов на диске %1</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/jobs/CreateVolumeGroupJob.cpp" line="65"/>
         <source>The installer failed to create a volume group named &apos;%1&apos;.</source>
-        <translation type="unfinished"/>
+        <translation>Программа установки не смогла создать группу томов на диске &apos;%1&apos;.</translation>
     </message>
 </context>
 <context>
@@ -829,7 +829,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/modules/dracutlukscfg/DracutLuksCfgJob.cpp" line="131"/>
         <source>Write LUKS configuration for Dracut to %1</source>
-        <translation type="unfinished"/>
+        <translation>Записать LUKS настройки для Dracut в %1</translation>
     </message>
     <message>
         <location filename="../src/modules/dracutlukscfg/DracutLuksCfgJob.cpp" line="133"/>
@@ -1470,7 +1470,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/modules/users/CheckPWQuality.cpp" line="239"/>
         <source>Bad integer value of setting - %1</source>
-        <translation type="unfinished"/>
+        <translation>Недопустимое целое значение свойства - %1</translation>
     </message>
     <message>
         <location filename="../src/modules/users/CheckPWQuality.cpp" line="243"/>
@@ -1729,7 +1729,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/modules/partition/gui/PartitionPage.ui" line="139"/>
         <source>Resize Volume Group</source>
-        <translation type="unfinished"/>
+        <translation>Изменить размер группы томов</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/PartitionPage.ui" line="146"/>
@@ -1739,12 +1739,12 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/modules/partition/gui/PartitionPage.ui" line="153"/>
         <source>Remove Volume Group</source>
-        <translation type="unfinished"/>
+        <translation>Удалить группу томов</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/PartitionPage.ui" line="180"/>
         <source>I&amp;nstall boot loader on:</source>
-        <translation type="unfinished"/>
+        <translation>Уст&amp;ановить загрузчик в:</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="217"/>
@@ -1884,7 +1884,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/modules/plasmalnf/page_plasmalnf.ui" line="20"/>
         <source>Placeholder</source>
-        <translation type="unfinished"/>
+        <translation>Заменитель</translation>
     </message>
     <message>
         <location filename="../src/modules/plasmalnf/PlasmaLnfPage.cpp" line="67"/>
@@ -1905,12 +1905,12 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="85"/>
         <source>Saving files for later ...</source>
-        <translation type="unfinished"/>
+        <translation>Сохраняю файлы на потом...</translation>
     </message>
     <message>
         <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="123"/>
         <source>No files configured to save for later.</source>
-        <translation type="unfinished"/>
+        <translation>Нет файлов, которые требуется сохранить на потом.</translation>
     </message>
     <message>
         <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="177"/>
@@ -1924,7 +1924,8 @@ The installer will quit and all changes will be lost.</source>
         <location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="271"/>
         <source>
 There was no output from the command.</source>
-        <translation type="unfinished"/>
+        <translation>
+Вывода из команды не последовало.</translation>
     </message>
     <message>
         <location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="272"/>
@@ -2031,17 +2032,17 @@ Output:
         <location filename="../src/modules/partition/jobs/RemoveVolumeGroupJob.cpp" line="34"/>
         <location filename="../src/modules/partition/jobs/RemoveVolumeGroupJob.cpp" line="48"/>
         <source>Remove Volume Group named %1.</source>
-        <translation type="unfinished"/>
+        <translation>Удалить группу томов на диске %1</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/jobs/RemoveVolumeGroupJob.cpp" line="41"/>
         <source>Remove Volume Group named &lt;strong&gt;%1&lt;/strong&gt;.</source>
-        <translation type="unfinished"/>
+        <translation>Удалить группу томов на диске %1</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/jobs/RemoveVolumeGroupJob.cpp" line="61"/>
         <source>The installer failed to remove a volume group named &apos;%1&apos;.</source>
-        <translation type="unfinished"/>
+        <translation>Установщик не смог удалить группу томов на диске &apos;%1&apos;.</translation>
     </message>
 </context>
 <context>
@@ -2182,12 +2183,12 @@ Output:
     <message>
         <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="130"/>
         <source>Resize Filesystem Job</source>
-        <translation type="unfinished"/>
+        <translation>Изменить размер файловой системы</translation>
     </message>
     <message>
         <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="238"/>
         <source>Invalid configuration</source>
-        <translation type="unfinished"/>
+        <translation>Недействительная конфигурация</translation>
     </message>
     <message>
         <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="239"/>
@@ -2213,7 +2214,7 @@ Output:
         <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="303"/>
         <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="320"/>
         <source>Resize Failed</source>
-        <translation type="unfinished"/>
+        <translation>Не удалось изменить размер</translation>
     </message>
     <message>
         <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="273"/>
@@ -2622,7 +2623,7 @@ Output:
     <message>
         <location filename="../src/modules/tracking/page_trackingstep.ui" line="24"/>
         <source>Placeholder</source>
-        <translation type="unfinished"/>
+        <translation>Заменитель</translation>
     </message>
     <message>
         <location filename="../src/modules/tracking/page_trackingstep.ui" line="72"/>

From 99b99d24bdbb354e980362dd4795c030c00617b5 Mon Sep 17 00:00:00 2001
From: Calamares CI <groot@kde.org>
Date: Tue, 11 Dec 2018 19:31:22 +0100
Subject: [PATCH 38/74] i18n: [desktop] Automatic merge of Transifex
 translations

---
 calamares.desktop | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/calamares.desktop b/calamares.desktop
index b4c3a2693..c29b9b345 100644
--- a/calamares.desktop
+++ b/calamares.desktop
@@ -104,6 +104,10 @@ Name[it_IT]=Installa il sistema
 Icon[it_IT]=calamares
 GenericName[it_IT]=Programma d'installazione del sistema
 Comment[it_IT]=Calamares — Programma d'installazione del sistema
+Name[mk]=Инсталирај го системот
+Icon[mk]=calamares
+GenericName[mk]=Системен Инсталер
+Comment[mk]=Calamares - Системен Инсталер
 Name[nb]=Installer System
 Icon[nb]=calamares
 GenericName[nb]=Systeminstallatør

From bf976b3de06ce581be49bd7879dd800b6bc14a7b Mon Sep 17 00:00:00 2001
From: Calamares CI <groot@kde.org>
Date: Tue, 11 Dec 2018 19:31:23 +0100
Subject: [PATCH 39/74] i18n: [dummypythonqt] Automatic merge of Transifex
 translations

---
 .../lang/mk/LC_MESSAGES/dummypythonqt.mo      | Bin 0 -> 625 bytes
 .../lang/mk/LC_MESSAGES/dummypythonqt.po      |  46 ++++++++++++++++++
 2 files changed, 46 insertions(+)
 create mode 100644 src/modules/dummypythonqt/lang/mk/LC_MESSAGES/dummypythonqt.mo
 create mode 100644 src/modules/dummypythonqt/lang/mk/LC_MESSAGES/dummypythonqt.po

diff --git a/src/modules/dummypythonqt/lang/mk/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/mk/LC_MESSAGES/dummypythonqt.mo
new file mode 100644
index 0000000000000000000000000000000000000000..aae5bd9b4655721e470dcbd9f68828dd44e0ef94
GIT binary patch
literal 625
zcmYL`&2AGh5XYCV11rIyXAYACRV#4T4k3!11_&WV5eW$)^oVdbZfde?uWYAjAA}1M
zFM)(q@%0S8aOGK;O+@pTej3kc=I`<D-<_MEBGe7!9#ThcAp@k;2jmVSklTns{#=Wq
z3ygP>(e)_W!T25{me(r1Fx{vFTCU*DKpe}g8g(<3E+ChcXl%_#nR?Qnkt1oHGMdA<
z(|y%>*@L6r<ZXZSI-bbFSWkv-u4d%<a_-2~aEQmFDd}1%JPwf;!b=V{%9?~xLLUQT
z{863II;Gf1Ch|;`=G(poVKu@Uz-pW|A5c_05YCgS720LO8_QuRtXCQ)%6W6<777mX
zb;bTKJS(j6M(09h)zsuq9<Db)BRyY=xg=95^3o=iGozKzuy^Wx;dqj)R;#KnuTm%S
zyqrx^kqNYyF7Y_!k{YEAmgI|MKOXjnz3t~=RT_7V_EO`v7X?1s%X6O;nNYd~>8Y?z
z`u4l&A!%;=%BxPKB|V**nbLC(&12=SHsz2n;&HaLA|r>!=8l6d)~RdPTCh2`_cYuG
yMxosX2D`hkNhwq?XZ!FJC~#n{I0|3F@9_2NcZbj6N4N~%!>@1&;b-_(iT(j+m9#Vf

literal 0
HcmV?d00001

diff --git a/src/modules/dummypythonqt/lang/mk/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/mk/LC_MESSAGES/dummypythonqt.po
new file mode 100644
index 000000000..82998bf47
--- /dev/null
+++ b/src/modules/dummypythonqt/lang/mk/LC_MESSAGES/dummypythonqt.po
@@ -0,0 +1,46 @@
+# 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.
+# 
+# Translators:
+# Martin Ristovski <martinristovski@protonmail.com>, 2018
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-10-05 11:34-0400\n"
+"PO-Revision-Date: 2016-12-16 12:18+0000\n"
+"Last-Translator: Martin Ristovski <martinristovski@protonmail.com>, 2018\n"
+"Language-Team: Macedonian (https://www.transifex.com/calamares/teams/20061/mk/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: mk\n"
+"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
+
+#: src/modules/dummypythonqt/main.py:84
+msgid "Click me!"
+msgstr "Кликни ме!"
+
+#: src/modules/dummypythonqt/main.py:94
+msgid "A new QLabel."
+msgstr "Нов QLabel."
+
+#: src/modules/dummypythonqt/main.py:97
+msgid "Dummy PythonQt ViewStep"
+msgstr ""
+
+#: src/modules/dummypythonqt/main.py:183
+msgid "The Dummy PythonQt Job"
+msgstr ""
+
+#: src/modules/dummypythonqt/main.py:186
+msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
+msgstr ""
+
+#: src/modules/dummypythonqt/main.py:190
+msgid "A status message for Dummy PythonQt Job."
+msgstr ""

From 915884c6fe9229f78ec1e7cd0aca3ab06bca7d06 Mon Sep 17 00:00:00 2001
From: Calamares CI <groot@kde.org>
Date: Tue, 11 Dec 2018 19:31:23 +0100
Subject: [PATCH 40/74] i18n: [python] Automatic merge of Transifex
 translations

---
 lang/python/es/LC_MESSAGES/python.mo | Bin 1207 -> 2626 bytes
 lang/python/es/LC_MESSAGES/python.po |  27 +++---
 lang/python/fr/LC_MESSAGES/python.mo | Bin 1193 -> 2528 bytes
 lang/python/fr/LC_MESSAGES/python.po |  23 +++--
 lang/python/id/LC_MESSAGES/python.mo | Bin 1082 -> 2644 bytes
 lang/python/id/LC_MESSAGES/python.po |  35 ++++----
 lang/python/ja/LC_MESSAGES/python.mo | Bin 2808 -> 3013 bytes
 lang/python/ja/LC_MESSAGES/python.po |   5 +-
 lang/python/mk/LC_MESSAGES/python.mo | Bin 0 -> 2005 bytes
 lang/python/mk/LC_MESSAGES/python.po | 120 +++++++++++++++++++++++++++
 10 files changed, 174 insertions(+), 36 deletions(-)
 create mode 100644 lang/python/mk/LC_MESSAGES/python.mo
 create mode 100644 lang/python/mk/LC_MESSAGES/python.po

diff --git a/lang/python/es/LC_MESSAGES/python.mo b/lang/python/es/LC_MESSAGES/python.mo
index a8182412db11321bc73fae9cf5b6dd5b75f473e4..e3aaa18ecc0486bbc41153365958a6e5098fadad 100644
GIT binary patch
literal 2626
zcmbW2O>Y}T7{>=_d2x9yAhig}6dK{EU3;CTY2q{}C3d4wCyf%P;yT$K+tcjMY<Fgp
zSW(3pi31lTuDu{3gv84Yi3<i!NPGj-O1*I41C$g0+4XDMl+cwXzwGSu%*^vLfB$*>
z$mayl>lklh{DScoM(_mw;JE{y0PlkDg8zVLz*A2W@*cPV+V?H+9QYad3iuQF8u&+-
z_qy}<!AZ;?dn#LR9<=^GXxIA$oCUuF&w_u0E_m`tX7?dDk9P&yGk*(yi8K8Mp2B<h
zG$9wjPr)hhXYdkuADjWFo*|?RM&L>CYw!*5SMUsY2RsfQeU^~(;0bU7tabS@XxIH7
zTmk<A?K!8P%k2FwzW_Hd|2z0L_)d-x9Fx3^0hj)B4FA2_eR~PCG1>i*CW4U2^B7nn
z%_%^T4)P*~%`KKp9~_w=ypiVxydAYO3rtF7sHbE@G?SRqnrOC6Wx4lZCl-d&tCi)x
z2{S@T+7JOBwW)n{7^7_U|6FXnw)D^)D?&#BYtxWP*5vWNb#|DhLV7BU0&X~|Bw^U5
zQQNd|;2UbQFgl|RkLcblvdATm8KMlC*AkLD!Y_~|sSOJP8ZmDRJL&$6kWH#2?|m4V
zAIr-m9QS+Q;50~FnlZX}THm6+;+op5^If408A{wEj7Ac7u-%HH{%DRg)jZ&y;XZAs
zn3@*vS@e<^DnAK$fvm>L<67GYdtuZ3Sl&~KG>EE5$MQxYE93q+S>vJFejpe9*#|Q*
zRMCS^U&rAB<b(=Mc^H{CWesD?+~VGr-OWZIveF=){gD>Ph79d#vmJCBB@R&q1a<=%
zaF%@MI*&E_w@g<rFI>I6Sf$siYwJtbR&r}RQn7KCbyN7x2T4;qbycRh)oXQUA?9h*
zI~8<EnNGN+X{Y2m?gd&ZmCsK)?xgF&&{^Z#!Y)3ryXd&njypq3F6_>_cycwSjZ=@A
z)B!UpF4M(C_=+yZOlw6idCAR0pfEER=bIrDK>^+T{<(BdxXNaNW_0SDg=M-PF)4J5
z=3B-@x?C*o?CcbbU0F2vu5~PWEMOsvxh@*G=;DOyPL+yy9nUQ<EmsHGC>7k?f|7<y
z9IhQ9O2c<e5qC|<S)`xEnwz<e`W0t-U}v{#@Yt#1%K4~HnNDvC(?4dJa-CZZl9&a~
z6%~iNOl6e5>bZ$on*BSMm-O@;Esf9S2zpoJVkO+?gNq&a6>0c0*Iq0(MND}>S&VDD
zjlLi9@<itcX=Q6<(ZhM!`}i1c*uJNo|No?Lwikrd*dX#O1|JbZf6yv6K$P6d5<_YY
z+hhZ^W2BBcv(zRNyoT_M@B~BqGj!G-bO-(;-&9xoaHo7!UciN=yE;C1!p?29qJ)2@
zg)GMIHxmeJUksT<=O(f@-?y~W0|n^$R3BBUOc=9Y8mTg6<m5mX2zt*WmCr-C*oNr)
zbk%g=mX)l<GO_e<iy4BD=<3do@?iytSd1zJG!@Uj=yoNwE2U|EdPzG_N~?hgk>~xn
z9GZU2T&9vc2ob$ywKeUX&TYEQyv{eaVRV#qzS6ckT5K~DTa?U(A1K`o9Y0vZ-Iqx)
ZOf;!*9YQ$J9U6=C5I@1N?A}Rq%D+X?83F(R

delta 307
zcmX>kvYoU3o)F7a1|Z-BVi_P#0b*VtUIWA+@BoMff%qX1ivaOwD9ynL5tjwhCO|QL
zAgv9gQ-HJqke&dfMS=7|AiWQWuLH3pkUx!?fk6sLZvfIN3=D}3r-2M1puh(pZ49KD
zSs(_P18ERH8A!_m>FGckXa)lZ5HkTW2!I^T4#cb=4io^DfdSAs1~wp`yoae}@>}NE
z$s1TU8@LrE<|StqC+8~!A6}T3oRM0k;B$C$0gy^bRq#nI%1u<TNh{9D2a4o?c$2GH
SKTTfEzHqVyXToG9E(HMpmoXp!

diff --git a/lang/python/es/LC_MESSAGES/python.po b/lang/python/es/LC_MESSAGES/python.po
index 6cd814f28..7298ce485 100644
--- a/lang/python/es/LC_MESSAGES/python.po
+++ b/lang/python/es/LC_MESSAGES/python.po
@@ -6,6 +6,7 @@
 # Translators:
 # strel, 2017
 # Francisco Sánchez López de Lerma <fslopezlerma@gmail.com>, 2018
+# Guido Grasso <cuquiman97@gmail.com>, 2018
 # 
 #, fuzzy
 msgid ""
@@ -14,7 +15,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-10-05 11:34-0400\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
-"Last-Translator: Francisco Sánchez López de Lerma <fslopezlerma@gmail.com>, 2018\n"
+"Last-Translator: Guido Grasso <cuquiman97@gmail.com>, 2018\n"
 "Language-Team: Spanish (https://www.transifex.com/calamares/teams/20061/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,31 +25,31 @@ msgstr ""
 
 #: src/modules/displaymanager/main.py:380
 msgid "Cannot write KDM configuration file"
-msgstr ""
+msgstr "No se puede escribir el archivo de configuración KDM"
 
 #: src/modules/displaymanager/main.py:381
 msgid "KDM config file {!s} does not exist"
-msgstr ""
+msgstr "El archivo de configuración {!s} de KDM no existe"
 
 #: src/modules/displaymanager/main.py:442
 msgid "Cannot write LXDM configuration file"
-msgstr ""
+msgstr "No se puede escribir el archivo de configuración LXDM"
 
 #: src/modules/displaymanager/main.py:443
 msgid "LXDM config file {!s} does not exist"
-msgstr ""
+msgstr "El archivo de configuracion {!s} de LXDM no existe"
 
 #: src/modules/displaymanager/main.py:517
 msgid "Cannot write LightDM configuration file"
-msgstr ""
+msgstr "No se puede escribir el archivo de configuración de LightDM"
 
 #: src/modules/displaymanager/main.py:518
 msgid "LightDM config file {!s} does not exist"
-msgstr ""
+msgstr "El archivo de configuración {!s} de LightDM no existe"
 
 #: src/modules/displaymanager/main.py:592
 msgid "Cannot configure LightDM"
-msgstr ""
+msgstr "No se puede configurar LightDM"
 
 #: src/modules/displaymanager/main.py:593
 msgid "No LightDM greeter installed."
@@ -56,16 +57,18 @@ msgstr ""
 
 #: src/modules/displaymanager/main.py:624
 msgid "Cannot write SLIM configuration file"
-msgstr ""
+msgstr "No se puede escribir el archivo de configuración de SLIM"
 
 #: src/modules/displaymanager/main.py:625
 msgid "SLIM config file {!s} does not exist"
-msgstr ""
+msgstr "El archivo de configuración {!s} de SLIM no existe"
 
 #: src/modules/displaymanager/main.py:740
 #: src/modules/displaymanager/main.py:772
 msgid "No display managers selected for the displaymanager module."
 msgstr ""
+"No se ha seleccionado ningún gestor de pantalla para el modulo "
+"displaymanager"
 
 #: src/modules/displaymanager/main.py:741
 msgid ""
@@ -76,10 +79,12 @@ msgstr ""
 #: src/modules/displaymanager/main.py:773
 msgid "The list is empty after checking for installed display managers."
 msgstr ""
+"La lista está vacía después de haber chequeado los gestores de pantalla "
+"instalados"
 
 #: src/modules/displaymanager/main.py:821
 msgid "Display manager configuration was incomplete"
-msgstr ""
+msgstr "La configuración del gestor de pantalla estaba incompleta"
 
 #: src/modules/umount/main.py:40
 msgid "Unmount file systems."
diff --git a/lang/python/fr/LC_MESSAGES/python.mo b/lang/python/fr/LC_MESSAGES/python.mo
index 602af1c17346200e1e2cf474c0b3b3f072151de5..b612733eab2cdd4655d4fc9c898f2381799155af 100644
GIT binary patch
literal 2528
zcmbVNNpl=E6c!M+VGm1jfGSbJWxJA|>9HMR#@NJoNx5t%E_<Bfz(wv>&nWIzH<H@+
zKyl;%oZ$us4wUD_B}WdS8h%3x4*UUr0hbh?rWbp>KtNTRuO+?r^cKBu{<wJIYl87I
z<{OxIG2g^odjvli_kgbhe+FIx{tkQ__y9Nxy!2?kUIkvkIsv`}{1*5M@W%pwDfWK@
zPGSE~puLAaM#v0s4tN>(3D5=p0Q?AeA9x)&b%Bsqfhq71cYg(>cK?ao-Zt<m)?Wgr
zf%l5_U%>aVZakUm$3Pp;=fJms-vM8<^1v4GezAY?DMA?5Q@}d#8=$rOD=-8;0B!(x
zpU(606A*5Z=P_|K$N_*ngL%<@6vO8EMNEWG5CVA?6RP9|Ogj*6HEP8dTp|c#Xgr72
z<926(Nf{gJ#WE0`RB^f{I$g84ULNc#VK`k~T(3l!5wWC!2>Gzg+J_G#lw1E-V_R!0
zXWqCdbP}>2jhJK|u1?t5XPOG>#ZeM+!^vVAMLnAIOcxH{iFfM5JKFGse)<`?!6jD=
zQAW(`3dtSe*U5_1hJ_(bn750YbhRU7hsKhZ2SfWKV=|4#{qhV-H{&v)w4*qjQgCo!
znd1_i`ojTfs(Hvg!+jdWikdDjCCZ4S*iS=VCmSmExYpL4(nmTrGUmmpG;pCoN5)Ky
z5XSv+vdN=(@08=!?rFE%r|#7>6xvXsDUTA<qi`;jJ`a#DA0g45*mOH#yu(6mVug%R
zCjAq>*X=8-6Kj0f7z=D-ye{{4t(P|PDodq}vgAnWwv23)gEvTZ4|R;Ni-g=k=A0GZ
zxy_ZvBW=-*`GwW_8%y-|(&pC6t(&z?p2W&H>$)R+=YzDPop#)!wT)YCXF>77%XSv=
z6k2q`ZB9E)*Kx1XX0tUp<+xL>3qfa-?+I)CNbZ{BPCM?qwCO_bvWrn$W7;@v#iR}y
z($S*xsggaL7$JA*d;3D9lfFI(o0H9nYu7sw6Csil&0QJX3w7B^kwd4=S=6G-ic7Cc
z$GXNOy47gx@9)=*H7){vVD%av3t7Yz*9`*=-I#FQcbbhrHO6b}E9*-~32D~d+CnT1
zm+-HbAW*{(Oanb7<P0jnl;&o3yS?m8AIaIP0<N4Tw3d$owdnMYFqM}r8mQVvm?{=J
z%dv`di^^oM)Uy*aH2<6(lXQ+Y$7gC}B}!sE+?^0_n^zr-2T)Saae>jS?<oOZf^;Cz
zpO8DIm6H+ZX~^nBDOtYyA6f-H{%0R8qmeaM#hZKXrxfI38C5bHr9a978>VfbtZ$e=
z%OUF^wCoU!*3Q01m(YNDMtI<$0kx6r3&WC=y8~v+`ZDV)q%4(G_$ayv1ViT(OjnT?
zBtou1Bp;{T9C2OY<0!QAqe`JT;b57P@(R`Y)Ps08y9+`s3Q7@S+0a>^<PztGEk~IR
zJ?m4Q^(`0L<Y1M=sr8cP1ZW?@c_s)t5C2*b;)Pfh*17b!l_m*#$96Rea4guNgEL}9
zIW3XdcdUoJ(L;r_;qM{+G)|EQKkI`v1(eWMXYeM6)A^r5LHX!#OPkeYl{uEE>`>D^
mlo)mO%9{L>D+R4)eH3{y>qnLf^4eP-%?=|30!NEZ)8ua`%M9uO

delta 291
zcmaDLypps2o)F7a1|Z-BVi_P#0b*VtUIWA+@BoMff%qX1ivaOwD9ynL5tjwhCO|QL
zAgv9gQ-HJqke&dfMS=7|AiW5PuS5A&%nS??AbB9I$iR@uuoB1+0}7l5(pEtF5s=mc
z(y}ZJ3>HAz2S_Ue=~f^OG=qTyh?#&G1VD~v2Vzzb2MU17zyN3r0~-)ep2O5Kxr#Y<
zaw*GZ1+Ubi)Z9u1_x#eL+|(Qeo2+yQ%OR~OHB~RIXtE#cv&s4FiziRx$e6r`Qw0Fj
C{3+M~

diff --git a/lang/python/fr/LC_MESSAGES/python.po b/lang/python/fr/LC_MESSAGES/python.po
index d869f977d..f4d4ef26c 100644
--- a/lang/python/fr/LC_MESSAGES/python.po
+++ b/lang/python/fr/LC_MESSAGES/python.po
@@ -8,6 +8,7 @@
 # Abdallah B <bahassinea@gmail.com>, 2017
 # Aestan <anthony.margerand@protonmail.com>, 2018
 # Jeremy Gourmel <jgourmel@free.fr>, 2018
+# Aurnytoraink <wiiu3dsxl13127@gmail.com>, 2018
 # 
 #, fuzzy
 msgid ""
@@ -16,7 +17,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-10-05 11:34-0400\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
-"Last-Translator: Jeremy Gourmel <jgourmel@free.fr>, 2018\n"
+"Last-Translator: Aurnytoraink <wiiu3dsxl13127@gmail.com>, 2018\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"
@@ -26,7 +27,7 @@ msgstr ""
 
 #: src/modules/displaymanager/main.py:380
 msgid "Cannot write KDM configuration file"
-msgstr ""
+msgstr "Impossible d'écrire le fichier de configuration KDM"
 
 #: src/modules/displaymanager/main.py:381
 msgid "KDM config file {!s} does not exist"
@@ -34,7 +35,7 @@ msgstr ""
 
 #: src/modules/displaymanager/main.py:442
 msgid "Cannot write LXDM configuration file"
-msgstr ""
+msgstr "Impossible d'écrire le fichier de configuration LXDM"
 
 #: src/modules/displaymanager/main.py:443
 msgid "LXDM config file {!s} does not exist"
@@ -42,7 +43,7 @@ msgstr ""
 
 #: src/modules/displaymanager/main.py:517
 msgid "Cannot write LightDM configuration file"
-msgstr ""
+msgstr "Impossible d'écrire le fichier de configuration LightDM"
 
 #: src/modules/displaymanager/main.py:518
 msgid "LightDM config file {!s} does not exist"
@@ -50,15 +51,15 @@ msgstr ""
 
 #: src/modules/displaymanager/main.py:592
 msgid "Cannot configure LightDM"
-msgstr ""
+msgstr "Impossible de configurer LightDM"
 
 #: src/modules/displaymanager/main.py:593
 msgid "No LightDM greeter installed."
-msgstr ""
+msgstr "Aucun hôte LightDM est installé"
 
 #: src/modules/displaymanager/main.py:624
 msgid "Cannot write SLIM configuration file"
-msgstr ""
+msgstr "Impossible d'écrire le fichier de configuration SLIM"
 
 #: src/modules/displaymanager/main.py:625
 msgid "SLIM config file {!s} does not exist"
@@ -68,20 +69,26 @@ msgstr ""
 #: src/modules/displaymanager/main.py:772
 msgid "No display managers selected for the displaymanager module."
 msgstr ""
+"Aucun gestionnaire d'affichage n'a été sélectionné pour le module de "
+"gestionnaire d'affichage"
 
 #: src/modules/displaymanager/main.py:741
 msgid ""
 "The displaymanagers list is empty or undefined in bothglobalstorage and "
 "displaymanager.conf."
 msgstr ""
+"La liste des gestionnaires d'affichage est vide ou indéfinie dans "
+"bothglobalstorage et displaymanager.conf."
 
 #: src/modules/displaymanager/main.py:773
 msgid "The list is empty after checking for installed display managers."
 msgstr ""
+"La liste est vide après vérification des gestionnaires d'affichage "
+"installés."
 
 #: src/modules/displaymanager/main.py:821
 msgid "Display manager configuration was incomplete"
-msgstr ""
+msgstr "La configuration du gestionnaire d'affichage était incomplète"
 
 #: src/modules/umount/main.py:40
 msgid "Unmount file systems."
diff --git a/lang/python/id/LC_MESSAGES/python.mo b/lang/python/id/LC_MESSAGES/python.mo
index 0dba5b35a8840ce4e551949b9132d50ba3914285..9c932366fa7e627a1e023e45c8f43e15fbe7b2be 100644
GIT binary patch
literal 2644
zcma)7O>Y}T7@k54ttnsOs|P-&g@i=y+Uq7jaGI(mP9iII8zpYxfIwsKcs<?Snbpp0
z6RYZtV-HA(6N3N10f{RTKY<GuZirj2z4FYi*B@~T8EO1@X5W41eV=#UXaAZz{XM~W
z3-fKvKQQ0Jd~^yw7-yd$<O1*<@O|JV;0M4h;D^9qxc&}!1?yjduLA!Dz7Bjc#PiSQ
z`xk*L*k1-(e|@0!_XueH{S15u_$P1;_yl+vxO|!r7x*>M+J6iD68H=725{~SA#VWp
zfj=O20i;-;d7hAY-~w;~*aR*C^>F>;aQ!=Q4*QRRZvs!9&GWthd=2aBaJ>n97wfNp
z6!;K$3HTGxp7R^<I`AK$J#XP$?ym*3ym~+Z{07(pJ_cIuua$5n&<=Y((k3t31qMvW
zc}$z1jS;R#!*W~<gic<<wDG=-2@0|S*W?9EP(@IVY&?fwd+sZkwq9g|NvRC&D%lf$
znsC|_e&5tv#e;)H7*2QUt&s^cLP^>aA)mHsesL0`-24AJ+iy0GJ+Ury9I^q8m}EXr
zj`%rXnhM!fQ5<r^Nj;6C0gVTykAUx~PI-Dq8y?dK56L!{JYmQ(V%@%w+!0=xG^92x
z3~9`|0Z!7R9U*<HBrhIJ?awdDG+OeCXLxB$T*erEa8W;`p5mHX*7>2(hD;FmA4XHe
zJ>Bk>Dk@0*goA|yjAW^BWQC{RG=rLI9`df?9_^`wnm#Wq3W_7;r6Dhq-9&Y{);9lw
z6uLOS*j1@C$hku27mWgEOWqRM<B_^Q!_;VZmZyn&KRvhhOmLcpV2}z;c@&!gMFy$#
zcn?+dkT>lp)AvKwVWBoEK^-ZR-jM{$_U@O7bw2Hk^(=ecKJNxL6-&>E%ECu+5mD+p
zGO|?U;p+izSA<=#b`SJA4bQpD6OGoX(cPOHJ2$sC>D|q}{l@KEr9B?2#5gVO3(xs1
z^|jMhHCo!e-F7w-p7onk#|5p?t8R7Gsk)B)5v^8h%PWq%;<_+&_V|5aosaE4aoknM
z{ghT+*j;upN=>GX(@vPwAp;#X`Z<$E4HUh0kp1Do4L@Qc1S8S)E7@UqNBSv<bK0Cm
zHQJCKF25E`(#5_pv947r2L}gbW4($VKeX>wx-4W7OSrBWyrnBwUH9W^MR=8^QmfJ0
z95YcZyQK{!4VMUP5F<mw4^0IvF60`hXNl%!{Z4z!SsmNiqk24XHqq%GDpRAY9brb1
z)~N7GyJ4EJ(AiQ+q-#{h*;21p*J%EC-CZk@Z5Ggu(2Pc0`oT~EnHEI{O&O%P9C>Xg
zEz#d6u(BO~60@Q7PR4cov9?{v&P2pVx|())m_{^VQJhMjv{N6-=%tYus$rSfx(2Kd
z{hQn;Eilms1z~^+&*~vMKj6m6e#@D0-Vyme6d=<-vW1UBE_L~LCHsElAu*55KF$;n
zC;KSK@diWn8~bPr7#4*ZN!<Wh;R+>rRA}nV>L@vxl_z2miazwhqyf!Du4w9^@}YTc
zwlwBZqBPg`&X4r2GNE?3K3x?<&&Rrk_h!?~L~fiy9RkCWBZngT5M>FJR!D^zmQuq4
zPh_Ho7PocrY<nG}ZJvFW%X^VRu5H7Urd%VT)Wb>04txcg;pLo*W9gb8waH_qZ5$ff
M%Ml1q0tTu37k#e^AOHXW

delta 322
zcmca2vWuhso)F7a1|Z-BVi_P#0b*VtUIWA+@BoMff%qX1ivaOwD9ynL5tjwhCO|QL
zAgv9gQ-HJqke&dfMS=7|AiWfbuLH3VkYCHpz#s;a2htJ@42cZOfeap?zyYYlSs<+j
z<UfJ(xmg$(#DRPzAPqEwfdhz{fEWZoj%Ej9RuBgYfXcuCsGWfgh$lZ`YME@z5<5AV
zb+fcbVo_10LU3tOWnw{MZc<`;Wuk&jMq*KMMcHI=ws(`?u{$dlBo-&;r7IL9W~Y`g
a<fi5#aTQcG@=9|xQzol&+E2FOk^lfuOEVY%

diff --git a/lang/python/id/LC_MESSAGES/python.po b/lang/python/id/LC_MESSAGES/python.po
index c3d730acd..718ed81cc 100644
--- a/lang/python/id/LC_MESSAGES/python.po
+++ b/lang/python/id/LC_MESSAGES/python.po
@@ -6,6 +6,7 @@
 # Translators:
 # Choiril Abdul, 2018
 # Harry Suryapambagya <harsxv@gmail.com>, 2018
+# Wantoyo <wantoyek@gmail.com>, 2018
 # 
 #, fuzzy
 msgid ""
@@ -14,7 +15,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-10-05 11:34-0400\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
-"Last-Translator: Harry Suryapambagya <harsxv@gmail.com>, 2018\n"
+"Last-Translator: Wantoyo <wantoyek@gmail.com>, 2018\n"
 "Language-Team: Indonesian (https://www.transifex.com/calamares/teams/20061/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,62 +25,66 @@ msgstr ""
 
 #: src/modules/displaymanager/main.py:380
 msgid "Cannot write KDM configuration file"
-msgstr ""
+msgstr "Gak bisa menulis file konfigurasi KDM"
 
 #: src/modules/displaymanager/main.py:381
 msgid "KDM config file {!s} does not exist"
-msgstr ""
+msgstr "File {!s} config KDM belum ada"
 
 #: src/modules/displaymanager/main.py:442
 msgid "Cannot write LXDM configuration file"
-msgstr ""
+msgstr "Gak bisa menulis file konfigurasi LXDM"
 
 #: src/modules/displaymanager/main.py:443
 msgid "LXDM config file {!s} does not exist"
-msgstr ""
+msgstr "File {!s} config LXDM enggak ada"
 
 #: src/modules/displaymanager/main.py:517
 msgid "Cannot write LightDM configuration file"
-msgstr ""
+msgstr "Gak bisa menulis file konfigurasi LightDM"
 
 #: src/modules/displaymanager/main.py:518
 msgid "LightDM config file {!s} does not exist"
-msgstr ""
+msgstr "File {!s} config LightDM belum ada"
 
 #: src/modules/displaymanager/main.py:592
 msgid "Cannot configure LightDM"
-msgstr ""
+msgstr "Gak bisa mengkonfigurasi LightDM"
 
 #: src/modules/displaymanager/main.py:593
 msgid "No LightDM greeter installed."
-msgstr ""
+msgstr "Tiada LightDM greeter yang terinstal."
 
 #: src/modules/displaymanager/main.py:624
 msgid "Cannot write SLIM configuration file"
-msgstr ""
+msgstr "Gak bisa menulis file konfigurasi SLIM"
 
 #: src/modules/displaymanager/main.py:625
 msgid "SLIM config file {!s} does not exist"
-msgstr ""
+msgstr "File {!s} config SLIM belum ada"
 
 #: src/modules/displaymanager/main.py:740
 #: src/modules/displaymanager/main.py:772
 msgid "No display managers selected for the displaymanager module."
-msgstr ""
+msgstr "Tiada display manager yang dipilih untuk modul displaymanager."
 
 #: src/modules/displaymanager/main.py:741
 msgid ""
 "The displaymanagers list is empty or undefined in bothglobalstorage and "
 "displaymanager.conf."
 msgstr ""
+"Daftar displaymanager telah kosong atau takdidefinisikan dalam "
+"bothglobalstorage dan displaymanager.conf."
 
 #: src/modules/displaymanager/main.py:773
 msgid "The list is empty after checking for installed display managers."
 msgstr ""
+"Daftar telah kosong sesudah pemeriksaan untuk display manager yang "
+"terinstal."
 
 #: src/modules/displaymanager/main.py:821
 msgid "Display manager configuration was incomplete"
-msgstr ""
+msgstr "Konfigurasi display manager belum rampung"
 
 #: src/modules/umount/main.py:40
 msgid "Unmount file systems."
@@ -104,13 +109,13 @@ msgstr "Paket pemrosesan (%(count)d/%(total)d)"
 
 #: src/modules/packages/main.py:64 src/modules/packages/main.py:74
 msgid "Install packages."
-msgstr "pasang paket"
+msgstr "Instal paket-paket."
 
 #: src/modules/packages/main.py:67
 #, python-format
 msgid "Installing one package."
 msgid_plural "Installing %(num)d packages."
-msgstr[0] "memasang paket %(num)d"
+msgstr[0] "Menginstal paket %(num)d"
 
 #: src/modules/packages/main.py:70
 #, python-format
diff --git a/lang/python/ja/LC_MESSAGES/python.mo b/lang/python/ja/LC_MESSAGES/python.mo
index f95e6b93ad86b3cad31066fae4e40cad952a0ae5..687043bbf5052156147f174aaeabfef6f1978c8f 100644
GIT binary patch
delta 686
zcmX}p&r4KM6u|K_Iio&vO2^E?qMHgXY++6XW|6e;AF!ZB5D$Gi4`)W1Hw3Px=YX`B
zYTy|m2m=!Mi->T93TxN4l^Y4#Ty)&D9+!RZ%+!JNKKEQM=l*!7-9LJAzhmLILiCVV
z$OG~kSqSkVTF;1FLJRw`4+n4p2XU@Z2Y7?}Gj`$;UchR@_NMy$b-cxV9O;*n1OwBs
zfTrOmyo!f7hE*KGcvxf@pP^Y_#HYB2;~0yGbmJtx;_xo^Q&*csMzOa=<SstO`&g{i
zIgy_X?lEDt)=xNr=HyQrrqFD-gmK)!oA?VyFlve1#&I-_pW{O;qgh|YK^$tUub;#f
z>SfHZzx19Jxr48<@#=Dsnu|-6G(it(C(R9GBzyl4bJ%~uUF00uMV=>lgj%qd&|Y{f
z;g8gUhY`#C_YSgi_fII=^x#p#QAyX!D%Vp^Y9YI*?3t{SQBw(LYR*m1s+swWa?@Vc
zP9~jcHSKx}NqbSH?6f`WWW3-syw`EE^X6o8`{+Ya9hbK%rS;wYNOL3@wl0TC!N-=q
yk^H{)caGn$Rm$tyf2aNLwQouLoBD;X^V@pqi_X8)exb7URr?#-Uk$#sjr|3#8+DEV

delta 550
zcmXZZJ4*vW5Ww+COiq)iiFqj`LO>ycL3{>$HCk9HLafB*5F;X9niB+tU@uri3yTB4
zfyI4-E9|uJ3z*KzLcziZ1pjlnfw|xAvdqrzJq~~8ny=}|tq^&#NIsFH<VA=N@qr`w
ziDMWKi;UwGma!Jh&#}V%9*6K5v)B&&3f5yiBJ->lka|toW}pRa)Pi@Y4S2YWZJfkH
zL}VH_Q1_qV9y*xAU%aBpRJ7ZuV~8xW?%@*t;VM>pyK@^?IA0zZXvgoU9d`mVecgj5
zaE|p&oWV<+MHd(F4YhDFCbEXRsQVo(;|uEkAH2azoF>r25a;`cQ^UUnNP^TxG?JwL
znhePc3YV0Al3J1`HFzKy^hf-jK<*%1*pF1;0P;8@>!xKj?9zV2s=L{6C)}z<-Q<pW
Xd{93<IVx?Lho)`1dBcddt`pUNd9*kd

diff --git a/lang/python/ja/LC_MESSAGES/python.po b/lang/python/ja/LC_MESSAGES/python.po
index 8a51a0394..d6b28c627 100644
--- a/lang/python/ja/LC_MESSAGES/python.po
+++ b/lang/python/ja/LC_MESSAGES/python.po
@@ -5,6 +5,7 @@
 # 
 # Translators:
 # Takefumi Nagata, 2018
+# 諏訪子 洩矢, 2018
 # 
 #, fuzzy
 msgid ""
@@ -13,7 +14,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-10-05 11:34-0400\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
-"Last-Translator: Takefumi Nagata, 2018\n"
+"Last-Translator: 諏訪子 洩矢, 2018\n"
 "Language-Team: Japanese (https://www.transifex.com/calamares/teams/20061/ja/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -75,7 +76,7 @@ msgstr ""
 
 #: src/modules/displaymanager/main.py:773
 msgid "The list is empty after checking for installed display managers."
-msgstr ""
+msgstr "インストールされたディスプレイマネージャーに検索しましたと、リストが空です。"
 
 #: src/modules/displaymanager/main.py:821
 msgid "Display manager configuration was incomplete"
diff --git a/lang/python/mk/LC_MESSAGES/python.mo b/lang/python/mk/LC_MESSAGES/python.mo
new file mode 100644
index 0000000000000000000000000000000000000000..62fdc0d8a8b9590f76f055840865811557c2c719
GIT binary patch
literal 2005
zcmb_cL2nyH7#*NMF<jtOBr1IoP+HNocS8$dg9{;Xk=3}3Qn%^_(9|9~OLk|hnQ@Z}
zklF^pkrSvALU2UlVoCxQp(%nxue*od5I+L(19-Exla@B6kuuWkn{VdLn{U5)yMH~i
z=L?4R6#8@MAE7^u{wKO?^blkFfMdYtfg$h(;CsNAfGflJ`{8;zjQ<&~Kl?Ca`@x$6
zP6FQty8T}PZ-Mh0@G#;p_b^rm{sBA#-1jJB=YSIE;+w!3;Qq%Ls{qdftHAGo$AEtW
z-vtJb57s{iLY_gMJ%R2TD6Ei=7<+PvI4*CXv%Tn#pyQ~#xtg$PE~T>6P_h-ZyIRm}
z)LyVNwb8<oj;x>)Gqp_$w~><6iehmmXZGBKkOu1iD|ULede0NL63H{5568^M)KtQd
zdke7~8Ov@<<UXW364{=2QjID?Z7qZqnj&c|k7Lm+GORWu(~0>-O1R{0p$!=ki-r|V
zYAH>2L5vtf0wt>1jYW~&_KMpdKd03PQ1hxy?<~Yo`H<$OrcX@0Q=zk!`P0=?CkykU
zqqOyErX4lCx4UiQ)m2D^xl?s-T8sR;ycupqNaKDm;RU|uAEh7&UpeCWM|>YdZ(dx8
zocI>+HP4^${MRY)!F$<9E6j3Zy}IVo#M~+!QjKdHNt#E|)djN{(HluVqel~Ob+ocd
zCOnFZ4V4@_oM!+b+3uoPUS06S$uvY$$%sojxL|F^gr(Bb(o)g7qoS5rc6&<=9&^YG
zQ?l4)O5?u&YEViRONR=zYOS(Wo}lO#rj@ipBHN1{ytWm~wuDQH<Rmo~xHiI;&(x25
z6I(oYR7+^DA{(k1$#zH+=OeqBX-LUpVJ_}!9(%`?PE1I$lZU1}K1qXN`Jkj1Q7|f(
zDWC%fXb}1|hB!DxZ<0?T1(OAqex0sS`fIw8{^SO$X^*nYZgc}vtLYko{>XOBSw8&*
z3)izx(ti45wvt^+d)cQLW6nLZD}<$9b~Rlm%-mBNk{jvI?kIP_;2YU})!|3A>%#fB
zvg@ilt8D(O8I%{-lwHoQprZYqR&qO)9aqi?{r>IU`8aRET0Md@uIE|y()G0OJOlE^
z$W{Zd!4UbvwQME51_ynXThndF+rdYDSmuY#t#D2sKDq(Dwd|@h@ERn0**6F;5vaZY
X{_Ap&uR?s?xper?d+>YQrda<1zo1ti

literal 0
HcmV?d00001

diff --git a/lang/python/mk/LC_MESSAGES/python.po b/lang/python/mk/LC_MESSAGES/python.po
new file mode 100644
index 000000000..16a51e0c2
--- /dev/null
+++ b/lang/python/mk/LC_MESSAGES/python.po
@@ -0,0 +1,120 @@
+# 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.
+# 
+# Translators:
+# Martin Ristovski <martinristovski@protonmail.com>, 2018
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-10-05 11:34-0400\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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: mk\n"
+"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
+
+#: src/modules/displaymanager/main.py:380
+msgid "Cannot write KDM configuration file"
+msgstr "KDM конфигурациониот фајл не може да се создаде"
+
+#: src/modules/displaymanager/main.py:381
+msgid "KDM config file {!s} does not exist"
+msgstr "KDM конфигурациониот фајл {!s} не постои"
+
+#: src/modules/displaymanager/main.py:442
+msgid "Cannot write LXDM configuration file"
+msgstr "LXDM конфигурациониот фајл не може да се создаде"
+
+#: src/modules/displaymanager/main.py:443
+msgid "LXDM config file {!s} does not exist"
+msgstr "LXDM конфигурациониот фајл {!s} не постои"
+
+#: src/modules/displaymanager/main.py:517
+msgid "Cannot write LightDM configuration file"
+msgstr "LightDM конфигурациониот фајл не може да се создаде"
+
+#: src/modules/displaymanager/main.py:518
+msgid "LightDM config file {!s} does not exist"
+msgstr "LightDM конфигурациониот фајл {!s} не постои"
+
+#: src/modules/displaymanager/main.py:592
+msgid "Cannot configure LightDM"
+msgstr "Не може да се подеси LightDM"
+
+#: src/modules/displaymanager/main.py:593
+msgid "No LightDM greeter installed."
+msgstr "Нема инсталирано LightDM поздравувач"
+
+#: src/modules/displaymanager/main.py:624
+msgid "Cannot write SLIM configuration file"
+msgstr "SLIM конфигурациониот фајл не може да се создаде"
+
+#: src/modules/displaymanager/main.py:625
+msgid "SLIM config file {!s} does not exist"
+msgstr "SLIM конфигурациониот фајл {!s} не постои"
+
+#: src/modules/displaymanager/main.py:740
+#: src/modules/displaymanager/main.py:772
+msgid "No display managers selected for the displaymanager module."
+msgstr "Немате избрано дисплеј менаџер за displaymanager модулот."
+
+#: src/modules/displaymanager/main.py:741
+msgid ""
+"The displaymanagers list is empty or undefined in bothglobalstorage and "
+"displaymanager.conf."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:773
+msgid "The list is empty after checking for installed display managers."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:821
+msgid "Display manager configuration was incomplete"
+msgstr ""
+
+#: src/modules/umount/main.py:40
+msgid "Unmount file systems."
+msgstr ""
+
+#: src/modules/dummypython/main.py:44
+msgid "Dummy python job."
+msgstr ""
+
+#: src/modules/dummypython/main.py:97
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/machineid/main.py:35
+msgid "Generate machine-id."
+msgstr ""
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr ""
+
+#: src/modules/packages/main.py:64 src/modules/packages/main.py:74
+msgid "Install packages."
+msgstr ""
+
+#: src/modules/packages/main.py:67
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:70
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""

From 0b6e1ca4884bdbeda25624c02640902b749fd268 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Thu, 13 Dec 2018 14:50:33 +0100
Subject: [PATCH 41/74] i18n: update list of translations from Transifex

 - Add automatic tooling to retrieve translation stats and
   output new CMake variable settings.
 - If there are i18n language selection warnings, stop CMake.
---
 CMakeLists.txt | 19 +++++++----
 ci/txstats.py  | 87 ++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 100 insertions(+), 6 deletions(-)
 create mode 100644 ci/txstats.py

diff --git a/CMakeLists.txt b/CMakeLists.txt
index faaab2283..47054bd8c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -103,12 +103,12 @@ set( CALAMARES_VERSION_RC 1 )
 #       checks for new languages and misspelled ones are done (that is,
 #       copy these four lines to four backup lines, add "p", and then update
 #       the original four lines with the current translations).
-set( _tx_complete ca zh_TW hr cs_CZ da et fr id it_IT lt pl pt_PT es_MX tr_TR )
-set( _tx_good sq de pt_BR zh_CN ja ro es sk )
-set( _tx_ok hu ru he nl bg uk ast is ko ar sv el gl en_GB
-            th fi_FI hi eu nb sr sl sr@latin mr es_PR kn kk be )
-set( _tx_bad fr_CH gu lo fa ur uz eo )
-
+set( _tx_complete zh_TW tr_TR sk pt_PT pt_BR pl lt ja id hr gl fr
+    et de da cs_CZ ca )
+set( _tx_good es sq es_MX zh_CN it_IT he en_GB ru ro hi bg hu )
+set( _tx_ok uk nl ast ko is ar sv el th fi_FI eu sr nb sl
+    sr@latin mr es_PR )
+set( _tx_bad eo kk kn uz ur mk lo gu fr_CH fa be )
 
 ### Required versions
 #
@@ -316,12 +316,14 @@ endif()
 #
 set( prev_tx ${p_tx_complete} ${p_tx_good} ${p_tx_ok} ${p_tx_bad} )
 set( curr_tx ${_tx_complete} ${_tx_good} ${_tx_ok} ${_tx_bad} )
+set( tx_errors OFF )
 if ( prev_tx )
     # Gone in new list
     foreach( l ${prev_tx} )
         list( FIND curr_tx ${l} p_l )
         if( p_l EQUAL -1 )
             message(WARNING "Language ${l} was present in previous translations and is now absent.")
+            set( tx_errors ON )
         endif()
     endforeach()
 
@@ -330,10 +332,12 @@ if ( prev_tx )
         list( FIND prev_tx ${l} p_l )
         if( p_l EQUAL -1 )
             message(WARNING "Language ${l} is new.")
+            set( tx_errors ON )
         endif()
         set( p_l "lang/calamares_${l}.ts" )
         if( NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${p_l} )
             message(WARNING "Language ${l} has no .ts file yet.")
+            set( tx_errors ON )
         endif()
     endforeach()
 
@@ -342,6 +346,9 @@ if ( prev_tx )
 endif()
 unset( prev_tx )
 unset( curr_tx )
+if( tx_errors )
+    message( FATAL_ERROR "Translation warnings, see above." )
+endif()
 
 set( CALAMARES_TRANSLATION_LANGUAGES en ${_tx_complete} ${_tx_good} ${_tx_ok} )
 list( SORT CALAMARES_TRANSLATION_LANGUAGES )
diff --git a/ci/txstats.py b/ci/txstats.py
new file mode 100644
index 000000000..368ce503e
--- /dev/null
+++ b/ci/txstats.py
@@ -0,0 +1,87 @@
+#! /usr/bin/env python
+#
+# Uses the Transifex API to get a list of enabled languages,
+# and outputs CMake settings for inclusion into CMakeLists.txt.
+import sys
+
+def get_tx_credentials():
+    """
+    Gets the API token out of the user's .transifexrc (this is supposed
+    to be secure).
+    """
+    import configparser
+    import os
+    txconfig_name = os.path.expanduser("~/.transifexrc")
+    try:
+        with open(txconfig_name, "r") as f:
+            parser = configparser.SafeConfigParser()
+            parser.readfp(f)
+
+            return parser.get("https://www.transifex.com", "password")
+    except IOError as e:
+        return None
+
+def output_langs(all_langs, label, filterfunc):
+    """
+    Output (via print) all of the languages in @p all_langs
+    that satisfy the translation-percentage filter @p filterfunc.
+    Prints a CMake set() command with the @p label as part
+    of the variable name.
+
+    Performs line-wrapping.
+    """
+    these_langs = [l for s, l in all_langs if filterfunc(s)]
+    out = " ".join(["set( _tx_%s" % label, " ".join(these_langs), ")"])
+    width = 68
+    prefix = ""
+
+    while len(out) > width - len(prefix):
+        chunk = out[:out[:width].rfind(" ")]
+        print("%s%s" % (prefix, chunk))
+        out = out[len(chunk)+1:]
+        prefix = "    "
+    print("%s%s" % (prefix, out))
+
+def get_tx_stats(token):
+    """
+    Does an API request to Transifex with the given API @p token, getting
+    the translation statistics for the main body of texts. Then prints
+    out CMake settings to replace the _tx_* variables in CMakeLists.txt
+    according to standard criteria.
+    """
+    import requests
+
+    r = requests.get("https://api.transifex.com/organizations/calamares/projects/calamares/resources/calamares-master/", auth=("api", token))
+    if r.status_code != 200:
+        return 1
+
+    all_langs = []
+
+    j = r.json()
+    languages = j["stats"]
+    print("# Total %d languages" % len(languages))
+    for lang_name in languages:
+        stats = languages[lang_name]["translated"]["percentage"]
+        all_langs.append((stats, lang_name))
+
+    all_langs.sort(reverse=True)
+
+    output_langs(all_langs, "complete", lambda s : s == 1.0)
+    output_langs(all_langs, "good", lambda s : 1.0 > s >= 0.75)
+    output_langs(all_langs, "ok", lambda s : 0.75 > s >= 0.05)
+    output_langs(all_langs, "bad", lambda s : 0.05 > s)
+
+    return 0
+
+
+def main():
+    cred = get_tx_credentials()
+    if cred:
+        return get_tx_stats(cred)
+    else:
+        print("! Could not find API token in ~/.transifexrc")
+        return 1
+    return 0
+
+if __name__ == "__main__":
+    sys.exit(main())

From 311af6de5d9a4d157ec6d888e6b85b0aaf9441a1 Mon Sep 17 00:00:00 2001
From: Harald Sitter <sitter@kde.org>
Date: Thu, 5 Apr 2018 11:57:23 +0200
Subject: [PATCH 42/74] [locale] prefer native language and country names when
 available
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This basically means we talk about localization in the respective
localized variant. e.g. "German (Germany)" ➡ "Deutsch (Deutschland)".

If geoip lookup failed or isn't configured for whatever reason it's a
stretch to expect the user to know english enough to find their own
language. Preferring the localized strings resolves this issue.

Additionally this happens to bypass #712 respectively
https://bugreports.qt.io/browse/QTBUG-34287
as the native names are properly spelled. So, as long as Qt has localized
names the names will also be properly spelled.
---
 src/modules/keyboard/KeyboardPage.cpp | 2 ++
 src/modules/locale/LocalePage.cpp     | 9 +++++++--
 src/modules/welcome/WelcomePage.cpp   | 1 -
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/modules/keyboard/KeyboardPage.cpp b/src/modules/keyboard/KeyboardPage.cpp
index 6f4473014..9056ba273 100644
--- a/src/modules/keyboard/KeyboardPage.cpp
+++ b/src/modules/keyboard/KeyboardPage.cpp
@@ -369,6 +369,8 @@ KeyboardPage::onActivate()
     {
         const auto langParts = lang.split( '_', QString::SkipEmptyParts );
 
+        // Note that this his string is not fit for display purposes!
+        // It doesn't come from QLocale::nativeCountryName.
         QString country = QLocale::countryToString( QLocale( lang ).country() );
         cDebug() << " .. extracted country" << country << "::" << langParts;
 
diff --git a/src/modules/locale/LocalePage.cpp b/src/modules/locale/LocalePage.cpp
index 9aad283c6..50f2d9889 100644
--- a/src/modules/locale/LocalePage.cpp
+++ b/src/modules/locale/LocalePage.cpp
@@ -477,8 +477,13 @@ LocalePage::prettyLCLocale( const QString& lcLocale ) const
 
     QLocale locale( localeString );
     //: Language (Country)
-    return tr( "%1 (%2)" ).arg( QLocale::languageToString( locale.language() ) )
-                          .arg( QLocale::countryToString( locale.country() ) );
+    const QString lang = !locale.nativeLanguageName().isEmpty() ?
+                         locale.nativeLanguageName() :
+                         QLocale::languageToString( locale.language() );
+    const QString country = !locale.nativeCountryName().isEmpty() ?
+                            locale.nativeCountryName() :
+                            QLocale::countryToString( locale.country() );
+    return tr( "%1 (%2)" ).arg( lang ).arg( country );
 }
 
 void
diff --git a/src/modules/welcome/WelcomePage.cpp b/src/modules/welcome/WelcomePage.cpp
index 0a1d2fb7d..4fc44e0d5 100644
--- a/src/modules/welcome/WelcomePage.cpp
+++ b/src/modules/welcome/WelcomePage.cpp
@@ -345,4 +345,3 @@ WelcomePage::focusInEvent( QFocusEvent* e )
         ui->languageWidget->setFocus();
     e->accept();
 }
-

From 084f4d24450b018999b97f53f3580cc69507cc5c Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Fri, 14 Dec 2018 10:52:55 +0100
Subject: [PATCH 43/74] [libcalamaresui] Refactor: move LocaleLabel to UI
 library

 - This is prep-work for making locale labels consistent everywhere.
 - While here, improve code documentation.
---
 .../utils/CalamaresUtilsGui.cpp               | 37 ++++++++++
 src/libcalamaresui/utils/CalamaresUtilsGui.h  | 65 ++++++++++++++++-
 src/modules/welcome/WelcomePage.cpp           | 72 +------------------
 3 files changed, 103 insertions(+), 71 deletions(-)

diff --git a/src/libcalamaresui/utils/CalamaresUtilsGui.cpp b/src/libcalamaresui/utils/CalamaresUtilsGui.cpp
index 425ee1811..41465ca02 100644
--- a/src/libcalamaresui/utils/CalamaresUtilsGui.cpp
+++ b/src/libcalamaresui/utils/CalamaresUtilsGui.cpp
@@ -266,5 +266,42 @@ clearLayout( QLayout* layout )
     }
 }
 
+LocaleLabel::LocaleLabel( const QString& locale )
+    : m_locale( LocaleLabel::getLocale( locale ) )
+    , m_localeId( locale )
+{
+    QString sortKey = QLocale::languageToString( m_locale.language() );
+    QString label = m_locale.nativeLanguageName();
+
+    if ( label.isEmpty() )
+        label = QString( QLatin1Literal( "* %1 (%2)" ) ).arg( locale, sortKey );
+
+    if ( locale.contains( '_' ) && QLocale::countriesForLanguage( m_locale.language() ).count() > 2 )
+    {
+        QLatin1Literal countrySuffix( " (%1)" );
+
+        sortKey.append( QString( countrySuffix ).arg( QLocale::countryToString( m_locale.country() ) ) );
+
+        // If the language name is RTL, make this parenthetical addition RTL as well.
+        QString countryFormat = label.isRightToLeft() ? QString( QChar( 0x202B ) ) : QString();
+        countryFormat.append( countrySuffix );
+        label.append( countryFormat.arg( m_locale.nativeCountryName() ) );
+    }
+
+    m_sortKey = sortKey;
+    m_label = label;
+}
+
+QLocale LocaleLabel::getLocale( const QString& localeName )
+{
+    if ( localeName.contains( "@latin" ) )
+    {
+        QLocale loc( localeName );  // Ignores @latin
+        return QLocale( loc.language(), QLocale::Script::LatinScript, loc.country() );
+    }
+    else
+        return QLocale( localeName );
+}
+
 
 }
diff --git a/src/libcalamaresui/utils/CalamaresUtilsGui.h b/src/libcalamaresui/utils/CalamaresUtilsGui.h
index 4b041466d..1e5f283b1 100644
--- a/src/libcalamaresui/utils/CalamaresUtilsGui.h
+++ b/src/libcalamaresui/utils/CalamaresUtilsGui.h
@@ -23,6 +23,7 @@
 #include "utils/CalamaresUtils.h"
 #include "UiDllMacro.h"
 
+#include <QObject>
 #include <QPixmap>
 #include <QSize>
 
@@ -125,6 +126,68 @@ constexpr int windowMinimumWidth = 800;
 constexpr int windowMinimumHeight = 520;
 constexpr int windowPreferredWidth = 1024;
 constexpr int windowPreferredHeight = 520;
-}
+
+/**
+ * @brief Consistent locale (language + country) naming.
+ *
+ * Support class to turn locale names (as used by Calamares's
+ * translation system) into QLocales, and also into consistent
+ * human-readable text labels.
+ */
+class LocaleLabel : public QObject
+{
+    Q_OBJECT
+
+public:
+    /** @brief Construct from a locale name.
+     *
+     * The locale name should be one that Qt recognizes, e.g. en_US or ar_EY.
+     */
+    LocaleLabel( const QString& localeName );
+
+    /** @brief Define a sorting order.
+     *
+     * English (@see isEnglish() -- it means en_US) is sorted at the top.
+     */
+    bool operator <(const LocaleLabel& other) const
+    {
+        if ( isEnglish() )
+            return !other.isEnglish();
+        if ( other.isEnglish() )
+            return false;
+        return m_sortKey < other.m_sortKey;
+    }
+
+    /** @brief Is this locale English?
+     *
+     * en_US and en (American English) is defined as English. The Queen's
+     * English -- proper English -- is relegated to non-English status.
+     */
+    bool isEnglish() const
+    {
+       return m_localeId == QLatin1Literal( "en_US" ) || m_localeId == QLatin1Literal( "en" );
+    }
+
+    /** @brief Get the human-readable name for this locale. */
+    QString label() const { return m_label; }
+    /** @brief Get the Qt locale. */
+    QLocale locale() const { return m_locale; }
+
+    /** @brief Get a Qt locale for the given @p localeName
+     *
+     * This special-cases `sr@latin`, which is used as a translation
+     * name in Calamares, while Qt recognizes `sr@latn`.
+     */
+    static QLocale getLocale( const QString& localeName );
+
+protected:
+    QLocale m_locale;
+    QString m_localeId;  // the locale identifier, e.g. "en_GB"
+    QString m_sortKey;  // the English name of the locale
+    QString m_label;  // the native name of the locale
+} ;
+
+
+}  // namespace CalamaresUtils
 
 #endif // CALAMARESUTILSGUI_H
diff --git a/src/modules/welcome/WelcomePage.cpp b/src/modules/welcome/WelcomePage.cpp
index 4fc44e0d5..8ffb153bf 100644
--- a/src/modules/welcome/WelcomePage.cpp
+++ b/src/modules/welcome/WelcomePage.cpp
@@ -132,74 +132,6 @@ bool matchLocale( QComboBox& list, QLocale& matchFound, std::function<bool(const
     return false;
 }
 
-struct LocaleLabel
-{
-    LocaleLabel( const QString& locale )
-        : m_locale( LocaleLabel::getLocale( locale ) )
-        , m_localeId( locale )
-    {
-        QString sortKey = QLocale::languageToString( m_locale.language() );
-        QString label = m_locale.nativeLanguageName();
-
-        if ( label.isEmpty() )
-            label = QString( QLatin1Literal( "* %1 (%2)" ) ).arg( locale, sortKey );
-
-        if ( locale.contains( '_' ) && QLocale::countriesForLanguage( m_locale.language() ).count() > 2 )
-        {
-            QLatin1Literal countrySuffix( " (%1)" );
-
-            sortKey.append( QString( countrySuffix ).arg( QLocale::countryToString( m_locale.country() ) ) );
-
-            // If the language name is RTL, make this parenthetical addition RTL as well.
-            QString countryFormat = label.isRightToLeft() ? QString( QChar( 0x202B ) ) : QString();
-            countryFormat.append( countrySuffix );
-            label.append( countryFormat.arg( m_locale.nativeCountryName() ) );
-        }
-
-        m_sortKey = sortKey;
-        m_label = label;
-    }
-
-    QLocale m_locale;
-    QString m_localeId;  // the locale identifier, e.g. "en_GB"
-    QString m_sortKey;  // the English name of the locale
-    QString m_label;  // the native name of the locale
-
-    /** @brief Define a sorting order.
-     *
-     * English (@see isEnglish() -- it means en_US) is sorted at the top.
-     */
-    bool operator <(const LocaleLabel& other) const
-    {
-        if ( isEnglish() )
-            return !other.isEnglish();
-        if ( other.isEnglish() )
-            return false;
-        return m_sortKey < other.m_sortKey;
-    }
-
-    /** @brief Is this locale English?
-     *
-     * en_US and en (American English) is defined as English. The Queen's
-     * English -- proper English -- is relegated to non-English status.
-     */
-    bool isEnglish() const
-    {
-       return m_localeId == QLatin1Literal( "en_US" ) || m_localeId == QLatin1Literal( "en" );
-    }
-
-    static QLocale getLocale( const QString& localeName )
-    {
-        if ( localeName.contains( "@latin" ) )
-        {
-            QLocale loc( localeName );
-            return QLocale( loc.language(), QLocale::Script::LatinScript, loc.country() );
-        }
-        else
-            return QLocale( localeName );
-    }
-} ;
-
 void
 WelcomePage::initLanguages()
 {
@@ -208,7 +140,7 @@ WelcomePage::initLanguages()
     ui->languageWidget->setInsertPolicy( QComboBox::InsertAtBottom );
 
     {
-        std::list< LocaleLabel > localeList;
+        std::list< CalamaresUtils::LocaleLabel > localeList;
         const auto locales = QString( CALAMARES_TRANSLATION_LANGUAGES ).split( ';');
         for ( const QString& locale : locales )
         {
@@ -219,7 +151,7 @@ WelcomePage::initLanguages()
 
         for ( const auto& locale : localeList )
         {
-            ui->languageWidget->addItem( locale.m_label, locale.m_locale );
+            ui->languageWidget->addItem( locale.label(), locale.locale() );
         }
     }
 

From 1f4ac45bb5d6ad4712109bd126a33cf306d35e9d Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Fri, 14 Dec 2018 11:22:47 +0100
Subject: [PATCH 44/74] [libcalamaresui] Cleanup locale-labeling code

 - Support translations of the "language (country)" format instead
   of forcing English parenthesis.
---
 .../utils/CalamaresUtilsGui.cpp               | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/libcalamaresui/utils/CalamaresUtilsGui.cpp b/src/libcalamaresui/utils/CalamaresUtilsGui.cpp
index 41465ca02..5e4b8e069 100644
--- a/src/libcalamaresui/utils/CalamaresUtilsGui.cpp
+++ b/src/libcalamaresui/utils/CalamaresUtilsGui.cpp
@@ -270,26 +270,27 @@ LocaleLabel::LocaleLabel( const QString& locale )
     : m_locale( LocaleLabel::getLocale( locale ) )
     , m_localeId( locale )
 {
+    QString longFormat = tr( "%1 (%2)", "Language (Country)" );
+
     QString sortKey = QLocale::languageToString( m_locale.language() );
-    QString label = m_locale.nativeLanguageName();
+    QString languageName = m_locale.nativeLanguageName();
+    QString countryName;
 
-    if ( label.isEmpty() )
-        label = QString( QLatin1Literal( "* %1 (%2)" ) ).arg( locale, sortKey );
+    if ( languageName.isEmpty() )
+        languageName = QString( QLatin1Literal( "* %1 (%2)" ) ).arg( locale, sortKey );
 
-    if ( locale.contains( '_' ) && QLocale::countriesForLanguage( m_locale.language() ).count() > 2 )
+    bool needsCountryName = locale.contains( '_' ) && QLocale::countriesForLanguage( m_locale.language() ).count() > 2;
+
+    if ( needsCountryName )
     {
-        QLatin1Literal countrySuffix( " (%1)" );
+        sortKey.append( '+' );
+        sortKey.append( QLocale::countryToString( m_locale.country() ) );
 
-        sortKey.append( QString( countrySuffix ).arg( QLocale::countryToString( m_locale.country() ) ) );
-
-        // If the language name is RTL, make this parenthetical addition RTL as well.
-        QString countryFormat = label.isRightToLeft() ? QString( QChar( 0x202B ) ) : QString();
-        countryFormat.append( countrySuffix );
-        label.append( countryFormat.arg( m_locale.nativeCountryName() ) );
+        countryName = m_locale.nativeCountryName();
     }
 
     m_sortKey = sortKey;
-    m_label = label;
+    m_label = needsCountryName ? longFormat.arg( languageName ).arg( countryName ) : languageName;
 }
 
 QLocale LocaleLabel::getLocale( const QString& localeName )

From 3dda9ab860f1d2aec92e505465f4bc1c97d6d664 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Fri, 14 Dec 2018 11:30:05 +0100
Subject: [PATCH 45/74] [libcalamaresui] LocaleLabel doesn't need to inherit
 QObject

 - Use static QObject::tr instead.
---
 src/libcalamaresui/utils/CalamaresUtilsGui.cpp | 2 +-
 src/libcalamaresui/utils/CalamaresUtilsGui.h   | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/libcalamaresui/utils/CalamaresUtilsGui.cpp b/src/libcalamaresui/utils/CalamaresUtilsGui.cpp
index 5e4b8e069..803e1b050 100644
--- a/src/libcalamaresui/utils/CalamaresUtilsGui.cpp
+++ b/src/libcalamaresui/utils/CalamaresUtilsGui.cpp
@@ -270,7 +270,7 @@ LocaleLabel::LocaleLabel( const QString& locale )
     : m_locale( LocaleLabel::getLocale( locale ) )
     , m_localeId( locale )
 {
-    QString longFormat = tr( "%1 (%2)", "Language (Country)" );
+    QString longFormat = QObject::tr( "%1 (%2)", "Language (Country)" );
 
     QString sortKey = QLocale::languageToString( m_locale.language() );
     QString languageName = m_locale.nativeLanguageName();
diff --git a/src/libcalamaresui/utils/CalamaresUtilsGui.h b/src/libcalamaresui/utils/CalamaresUtilsGui.h
index 1e5f283b1..9cbc7a4a3 100644
--- a/src/libcalamaresui/utils/CalamaresUtilsGui.h
+++ b/src/libcalamaresui/utils/CalamaresUtilsGui.h
@@ -134,10 +134,8 @@ constexpr int windowPreferredHeight = 520;
  * translation system) into QLocales, and also into consistent
  * human-readable text labels.
  */
-class LocaleLabel : public QObject
+class LocaleLabel
 {
-    Q_OBJECT
-
 public:
     /** @brief Construct from a locale name.
      *

From 8790985fca581469b96b61cb71f1c631a2291b2a Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Fri, 14 Dec 2018 11:33:13 +0100
Subject: [PATCH 46/74] [libcalamaresui] Code-formatting, remove dead code

---
 src/libcalamaresui/utils/CalamaresUtilsGui.cpp |  8 ++------
 src/libcalamaresui/utils/CalamaresUtilsGui.h   | 14 ++++++++++----
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/libcalamaresui/utils/CalamaresUtilsGui.cpp b/src/libcalamaresui/utils/CalamaresUtilsGui.cpp
index 803e1b050..789b41c4f 100644
--- a/src/libcalamaresui/utils/CalamaresUtilsGui.cpp
+++ b/src/libcalamaresui/utils/CalamaresUtilsGui.cpp
@@ -170,11 +170,7 @@ createRoundedImage( const QPixmap& pixmap, const QSize& size, float frameWidthPc
 
     painter.setBrush( brush );
     painter.setPen( pen );
-    painter.drawRoundedRect( outerRect, qreal(frameWidthPct) * 100.0, qreal(frameWidthPct) * 100.0, Qt::RelativeSize );
-
-/*    painter.setBrush( Qt::transparent );
-    painter.setPen( Qt::white );
-    painter.drawRoundedRect( outerRect, frameWidthPct, frameWidthPct, Qt::RelativeSize ); */
+    painter.drawRoundedRect( outerRect, qreal( frameWidthPct ) * 100.0, qreal( frameWidthPct ) * 100.0, Qt::RelativeSize );
 
     return frame;
 }
@@ -246,7 +242,7 @@ setDefaultFontSize( int points )
 QSize
 defaultIconSize()
 {
-    const int w = int(defaultFontHeight() * 1.6);
+    const int w = int( defaultFontHeight() * 1.6 );
     return QSize( w, w );
 }
 
diff --git a/src/libcalamaresui/utils/CalamaresUtilsGui.h b/src/libcalamaresui/utils/CalamaresUtilsGui.h
index 9cbc7a4a3..e75eee210 100644
--- a/src/libcalamaresui/utils/CalamaresUtilsGui.h
+++ b/src/libcalamaresui/utils/CalamaresUtilsGui.h
@@ -147,7 +147,7 @@ public:
      *
      * English (@see isEnglish() -- it means en_US) is sorted at the top.
      */
-    bool operator <(const LocaleLabel& other) const
+    bool operator <( const LocaleLabel& other ) const
     {
         if ( isEnglish() )
             return !other.isEnglish();
@@ -163,13 +163,19 @@ public:
      */
     bool isEnglish() const
     {
-       return m_localeId == QLatin1Literal( "en_US" ) || m_localeId == QLatin1Literal( "en" );
+        return m_localeId == QLatin1Literal( "en_US" ) || m_localeId == QLatin1Literal( "en" );
     }
 
     /** @brief Get the human-readable name for this locale. */
-    QString label() const { return m_label; }
+    QString label() const
+    {
+        return m_label;
+    }
     /** @brief Get the Qt locale. */
-    QLocale locale() const { return m_locale; }
+    QLocale locale() const
+    {
+        return m_locale;
+    }
 
     /** @brief Get a Qt locale for the given @p localeName
      *

From 210965aca48dac26837335f1d7538fc4a6fc5183 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Fri, 14 Dec 2018 13:20:32 +0100
Subject: [PATCH 47/74] [libcalamaresui] Allow always-show-country setting in
 locale label

---
 src/libcalamaresui/utils/CalamaresUtilsGui.cpp | 5 +++--
 src/libcalamaresui/utils/CalamaresUtilsGui.h   | 9 +++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/libcalamaresui/utils/CalamaresUtilsGui.cpp b/src/libcalamaresui/utils/CalamaresUtilsGui.cpp
index 789b41c4f..a7783af3e 100644
--- a/src/libcalamaresui/utils/CalamaresUtilsGui.cpp
+++ b/src/libcalamaresui/utils/CalamaresUtilsGui.cpp
@@ -262,7 +262,7 @@ clearLayout( QLayout* layout )
     }
 }
 
-LocaleLabel::LocaleLabel( const QString& locale )
+LocaleLabel::LocaleLabel( const QString& locale, LabelFormat format )
     : m_locale( LocaleLabel::getLocale( locale ) )
     , m_localeId( locale )
 {
@@ -275,7 +275,8 @@ LocaleLabel::LocaleLabel( const QString& locale )
     if ( languageName.isEmpty() )
         languageName = QString( QLatin1Literal( "* %1 (%2)" ) ).arg( locale, sortKey );
 
-    bool needsCountryName = locale.contains( '_' ) && QLocale::countriesForLanguage( m_locale.language() ).count() > 2;
+    bool needsCountryName = ( format == LabelFormat::AlwaysWithCountry ) ||
+        (locale.contains( '_' ) && QLocale::countriesForLanguage( m_locale.language() ).count() > 1 );
 
     if ( needsCountryName )
     {
diff --git a/src/libcalamaresui/utils/CalamaresUtilsGui.h b/src/libcalamaresui/utils/CalamaresUtilsGui.h
index e75eee210..6a036b218 100644
--- a/src/libcalamaresui/utils/CalamaresUtilsGui.h
+++ b/src/libcalamaresui/utils/CalamaresUtilsGui.h
@@ -137,11 +137,16 @@ constexpr int windowPreferredHeight = 520;
 class LocaleLabel
 {
 public:
+    /** @brief Formatting option for label -- add (country) to label. */
+    enum class LabelFormat { AlwaysWithCountry, IfNeededWithCountry } ;
+
     /** @brief Construct from a locale name.
      *
-     * The locale name should be one that Qt recognizes, e.g. en_US or ar_EY.
+     * The @p localeName should be one that Qt recognizes, e.g. en_US or ar_EY.
+     * The @p format determines whether the country name is always present
+     * in the label (human-readable form) or only if needed for disambiguation.
      */
-    LocaleLabel( const QString& localeName );
+    LocaleLabel( const QString& localeName, LabelFormat format = LabelFormat::IfNeededWithCountry );
 
     /** @brief Define a sorting order.
      *

From 56a71c232f73113843272bc85bfb7ee904379d21 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Fri, 14 Dec 2018 13:27:32 +0100
Subject: [PATCH 48/74] [locale] Use the re-factored LocaleLabel

---
 src/modules/locale/LocalePage.cpp | 31 ++++++++-----------------------
 src/modules/locale/LocalePage.h   |  1 -
 2 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/src/modules/locale/LocalePage.cpp b/src/modules/locale/LocalePage.cpp
index 50f2d9889..ea77d6b9f 100644
--- a/src/modules/locale/LocalePage.cpp
+++ b/src/modules/locale/LocalePage.cpp
@@ -21,6 +21,7 @@
 
 #include "timezonewidget/timezonewidget.h"
 #include "SetTimezoneJob.h"
+#include "utils/CalamaresUtilsGui.h"
 #include "utils/Logger.h"
 #include "utils/Retranslator.h"
 #include "GlobalStorage.h"
@@ -383,12 +384,14 @@ LocalePage::init( const QString& initialRegion,
 
 std::pair< QString, QString > LocalePage::prettyLocaleStatus( const LocaleConfiguration& lc ) const
 {
+    using CalamaresUtils::LocaleLabel;
+
+    LocaleLabel lang( lc.lang, LocaleLabel::LabelFormat::AlwaysWithCountry );
+    LocaleLabel num( lc.lc_numeric, LocaleLabel::LabelFormat::AlwaysWithCountry );
+
     return std::make_pair< QString, QString >(
-        tr( "The system language will be set to %1." )
-            .arg( prettyLCLocale( lc.lang ) ),
-        tr( "The numbers and dates locale will be set to %1." )
-                            .arg( prettyLCLocale( lc.lc_numeric ) )
-                                             );
+        tr( "The system language will be set to %1." ).arg( lang.label() ),
+        tr( "The numbers and dates locale will be set to %1." ).arg( num.label() ) );
 }
 
 QString
@@ -468,24 +471,6 @@ LocalePage::guessLocaleConfiguration() const
 }
 
 
-QString
-LocalePage::prettyLCLocale( const QString& lcLocale ) const
-{
-    QString localeString = lcLocale;
-    if ( localeString.endsWith( " UTF-8" ) )
-        localeString.remove( " UTF-8" );
-
-    QLocale locale( localeString );
-    //: Language (Country)
-    const QString lang = !locale.nativeLanguageName().isEmpty() ?
-                         locale.nativeLanguageName() :
-                         QLocale::languageToString( locale.language() );
-    const QString country = !locale.nativeCountryName().isEmpty() ?
-                            locale.nativeCountryName() :
-                            QLocale::countryToString( locale.country() );
-    return tr( "%1 (%2)" ).arg( lang ).arg( country );
-}
-
 void
 LocalePage::updateGlobalStorage()
 {
diff --git a/src/modules/locale/LocalePage.h b/src/modules/locale/LocalePage.h
index c4ca20503..fae16cfb9 100644
--- a/src/modules/locale/LocalePage.h
+++ b/src/modules/locale/LocalePage.h
@@ -51,7 +51,6 @@ public:
 
 private:
     LocaleConfiguration guessLocaleConfiguration() const;
-    QString prettyLCLocale( const QString& localesMap ) const;
 
     // For the given locale config, return two strings describing
     // the settings for language and numbers.

From fe3a88f834dabdb81bd5dddf2a35d6b4e2ad9a27 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Thu, 3 Jan 2019 14:36:48 +0100
Subject: [PATCH 49/74] [packages] Fix cut-and-paste-o in packages try_remove

 - Copied from_local from the code for install, which doesn't
   make sense and causes a NameError.

FIXES #1063
---
 src/modules/packages/main.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/modules/packages/main.py b/src/modules/packages/main.py
index 9116cf2ef..aac1aa6f9 100644
--- a/src/modules/packages/main.py
+++ b/src/modules/packages/main.py
@@ -150,10 +150,10 @@ class PackageManager(metaclass=abc.ABCMeta):
         @param packagedata: str|dict
         """
         if isinstance(packagedata, str):
-            self.remove([packagedata], from_local=from_local)
+            self.remove([packagedata])
         else:
             self.run(packagedata["pre-script"])
-            self.remove([packagedata["package"]], from_local=from_local)
+            self.remove([packagedata["package"]])
             self.run(packagedata["post-script"])
 
 

From ad9fe5b38249d5af7e5aea97efb867d37bd9230a Mon Sep 17 00:00:00 2001
From: Calamares CI <groot@kde.org>
Date: Thu, 3 Jan 2019 15:06:50 +0100
Subject: [PATCH 50/74] i18n: [calamares] Automatic merge of Transifex
 translations

---
 lang/calamares_ar.ts |   4 +-
 lang/calamares_eu.ts | 287 ++++++++++++++++++++++---------------------
 lang/calamares_hu.ts | 235 ++++++++++++++++++-----------------
 lang/calamares_ja.ts |  90 +++++++-------
 lang/calamares_mk.ts |  12 +-
 5 files changed, 317 insertions(+), 311 deletions(-)

diff --git a/lang/calamares_ar.ts b/lang/calamares_ar.ts
index 32ed6c1d7..f50c7d51f 100644
--- a/lang/calamares_ar.ts
+++ b/lang/calamares_ar.ts
@@ -73,7 +73,7 @@
     <message>
         <location filename="../src/libcalamaresui/utils/DebugWindow.ui" line="44"/>
         <source>Modules</source>
-        <translation>الوحدا</translation>
+        <translation>الوحدات</translation>
     </message>
     <message>
         <location filename="../src/libcalamaresui/utils/DebugWindow.ui" line="57"/>
@@ -2834,7 +2834,7 @@ Output:
     <message>
         <location filename="../src/modules/welcome/WelcomePage.cpp" line="290"/>
         <source>%1 support</source>
-        <translation>1%  الدعم</translation>
+        <translation>%1  الدعم</translation>
     </message>
 </context>
 <context>
diff --git a/lang/calamares_eu.ts b/lang/calamares_eu.ts
index 811d034b3..c93ffb6b1 100644
--- a/lang/calamares_eu.ts
+++ b/lang/calamares_eu.ts
@@ -4,17 +4,17 @@
     <message>
         <location filename="../src/modules/partition/gui/BootInfoWidget.cpp" line="69"/>
         <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"/>
+        <translation>Sistema honen &lt;strong&gt;abio ingurunea&lt;/strong&gt;. &lt;br&gt;&lt;br&gt;X86 zaharrek &lt;strong&gt;BIOS&lt;/strong&gt; euskarria bakarrik daukate. &lt;br&gt;Sistema modernoek normalean &lt;strong&gt;EFI&lt;/strong&gt; darabilte, baina BIOS bezala ere agertu daitezke konpatibilitate moduan hasiz gero. </translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/BootInfoWidget.cpp" line="79"/>
         <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"/>
+        <translation>Sistema hau &lt;strong&gt;EFI&lt;/strong&gt; abio inguruneaz hasi da.&lt;br&gt;&lt;br&gt;EFI ingurunetik abiaraztea konfiguratzeko instalatzaile honek abio kargatzaile aplikazioa ezarri behar du, &lt;strong&gt;GRUB &lt;/strong&gt; bezalakoa edo &lt;strong&gt;systemd-abioa&lt;/strong&gt; &lt;strong&gt;EFI sistema partizio&lt;/strong&gt; batean. Hau automatikoa da, zuk partizioak eskuz egitea aukeratzen ez baduzu, eta kasu horretan zuk sortu edo aukeratu beharko duzu zure kabuz.</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/BootInfoWidget.cpp" line="91"/>
         <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"/>
+        <translation>Sistema hau &lt;strong&gt;BIOS&lt;/strong&gt; abio inguruneaz hasi da.&lt;br&gt;&lt;br&gt;BIOS ingurunetik abiaraztea konfiguratzeko instalatzaile honek abio kargatzaile aplikazioa ezarri behar du, &lt;strong&gt;GRUB&lt;/strong&gt; bezalakoa, partizioaren hasieran edo &lt;strong&gt;Master Boot Record&lt;/strong&gt; deritzonean partizio taularen hasieratik gertu (hobetsia). Hau automatikoa da, zuk partizioak eskuz egitea aukeratzen ez baduzu eta kasu horretan zuk sortu edo aukeratu beharko duzu zure kabuz.</translation>
     </message>
 </context>
 <context>
@@ -22,7 +22,7 @@
     <message>
         <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="59"/>
         <source>Master Boot Record of %1</source>
-        <translation type="unfinished"/>
+        <translation>%1-(e)n Master Boot Record</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="76"/>
@@ -50,7 +50,7 @@
     <message>
         <location filename="../src/libcalamaresui/viewpages/BlankViewStep.cpp" line="69"/>
         <source>Blank Page</source>
-        <translation type="unfinished"/>
+        <translation>Orri zuria</translation>
     </message>
 </context>
 <context>
@@ -63,7 +63,7 @@
     <message>
         <location filename="../src/libcalamaresui/utils/DebugWindow.ui" line="24"/>
         <source>GlobalStorage</source>
-        <translation type="unfinished"/>
+        <translation>Biltegiratze globala</translation>
     </message>
     <message>
         <location filename="../src/libcalamaresui/utils/DebugWindow.ui" line="34"/>
@@ -84,12 +84,12 @@
         <location filename="../src/libcalamaresui/utils/DebugWindow.ui" line="64"/>
         <location filename="../src/libcalamaresui/utils/DebugWindow.ui" line="78"/>
         <source>none</source>
-        <translation type="unfinished"/>
+        <translation>Ezer ez</translation>
     </message>
     <message>
         <location filename="../src/libcalamaresui/utils/DebugWindow.ui" line="71"/>
         <source>Interface:</source>
-        <translation type="unfinished"/>
+        <translation>Interfasea:</translation>
     </message>
     <message>
         <location filename="../src/libcalamaresui/utils/DebugWindow.ui" line="93"/>
@@ -99,7 +99,7 @@
     <message>
         <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="182"/>
         <source>Debug information</source>
-        <translation type="unfinished"/>
+        <translation>Arazte informazioa</translation>
     </message>
 </context>
 <context>
@@ -146,7 +146,7 @@
     <message>
         <location filename="../src/libcalamares/PythonJob.cpp" line="289"/>
         <source>Working directory %1 for python job %2 is not readable.</source>
-        <translation type="unfinished"/>
+        <translation>%1 lanerako direktorioa %2 python lanak ezin du irakurri.</translation>
     </message>
     <message>
         <location filename="../src/libcalamares/PythonJob.cpp" line="299"/>
@@ -161,7 +161,7 @@
     <message>
         <location filename="../src/libcalamares/PythonJob.cpp" line="376"/>
         <source>Boost.Python error in job &quot;%1&quot;.</source>
-        <translation type="unfinished"/>
+        <translation>Boost.Python errorea &quot;%1&quot; lanean.</translation>
     </message>
 </context>
 <context>
@@ -192,22 +192,22 @@
     <message>
         <location filename="../src/libcalamaresui/ViewManager.cpp" line="179"/>
         <source>Calamares Initialization Failed</source>
-        <translation type="unfinished"/>
+        <translation>Calamares instalazioak huts egin du</translation>
     </message>
     <message>
         <location filename="../src/libcalamaresui/ViewManager.cpp" line="180"/>
         <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"/>
+        <translation>%1 ezin da instalatu. Calamares ez da gai konfiguratutako modulu guztiak kargatzeko. Arazao hau banaketak Calamares erabiltzen duen eragatik da.</translation>
     </message>
     <message>
         <location filename="../src/libcalamaresui/ViewManager.cpp" line="185"/>
         <source>&lt;br/&gt;The following modules could not be loaded:</source>
-        <translation type="unfinished"/>
+        <translation>&lt;br/&gt; Ondorengo moduluak ezin izan dira kargatu:</translation>
     </message>
     <message>
         <location filename="../src/libcalamaresui/ViewManager.cpp" line="277"/>
         <source>&amp;Install</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Instalatu</translation>
     </message>
     <message>
         <location filename="../src/libcalamaresui/ViewManager.cpp" line="325"/>
@@ -218,7 +218,8 @@
         <location filename="../src/libcalamaresui/ViewManager.cpp" line="326"/>
         <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"/>
+        <translation>Ziur uneko instalazio prozesua bertan behera utzi nahi duzula?
+Instalatzailea irten egingo da eta aldaketa guztiak galduko dira.</translation>
     </message>
     <message>
         <location filename="../src/libcalamaresui/ViewManager.cpp" line="331"/>
@@ -243,7 +244,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/libcalamaresui/ViewManager.cpp" line="238"/>
         <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"/>
+        <translation>%1 instalatzailea zure diskoan aldaketak egitera doa %2 instalatzeko.&lt;br/&gt;&lt;strong&gt;Ezingo dituzu desegin aldaketa hauek.&lt;/strong&gt;</translation>
     </message>
     <message>
         <location filename="../src/libcalamaresui/ViewManager.cpp" line="243"/>
@@ -281,7 +282,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/libcalamares/PythonHelper.cpp" line="270"/>
         <source>Unknown exception type</source>
-        <translation type="unfinished"/>
+        <translation>Salbuespen-mota ezezaguna</translation>
     </message>
     <message>
         <location filename="../src/libcalamares/PythonHelper.cpp" line="284"/>
@@ -309,7 +310,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/calamares/CalamaresWindow.cpp" line="111"/>
         <source>Show debug information</source>
-        <translation type="unfinished"/>
+        <translation>Erakutsi arazte informazioa</translation>
     </message>
 </context>
 <context>
@@ -317,17 +318,17 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/modules/welcome/checker/CheckerWidget.cpp" line="96"/>
         <source>This computer does not satisfy the minimum requirements for installing %1.&lt;br/&gt;Installation cannot continue. &lt;a href=&quot;#details&quot;&gt;Details...&lt;/a&gt;</source>
-        <translation type="unfinished"/>
+        <translation>Konputagailu honek ez dauzka gutxieneko eskakizunak %1 instalatzeko. &lt;br/&gt;Instalazioak ezin du jarraitu. &lt;a href=&quot;#details&quot;&gt;Xehetasunak...&lt;/a&gt;</translation>
     </message>
     <message>
         <location filename="../src/modules/welcome/checker/CheckerWidget.cpp" line="113"/>
         <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"/>
+        <translation>Konputagailu honek ez du betetzen gomendatutako zenbait eskakizun %1 instalatzeko. &lt;br/&gt;Instalazioak jarraitu ahal du, baina zenbait ezaugarri desgaituko dira.</translation>
     </message>
     <message>
         <location filename="../src/modules/welcome/checker/CheckerWidget.cpp" line="151"/>
         <source>This program will ask you some questions and set up %2 on your computer.</source>
-        <translation type="unfinished"/>
+        <translation>Konputagailuan %2 ezartzeko programa honek hainbat galdera egingo dizkizu.</translation>
     </message>
     <message>
         <location filename="../src/modules/welcome/checker/CheckerWidget.cpp" line="174"/>
@@ -370,7 +371,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="129"/>
         <source>Select storage de&amp;vice:</source>
-        <translation type="unfinished"/>
+        <translation>Aukeratu &amp;biltegiratze-gailua:</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="130"/>
@@ -413,7 +414,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1232"/>
         <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"/>
+        <translation>Biltegiratze-gailuak badirudi ez duela sistema eragilerik. Zer egin nahiko zenuke? &lt;br/&gt;Zure aukerak berrikusteko eta berresteko aukera izango duzu aldaketak gauzatu aurretik biltegiratze-gailuan</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1237"/>
@@ -421,7 +422,7 @@ The installer will quit and all changes will be lost.</source>
         <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1296"/>
         <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1320"/>
         <source>&lt;strong&gt;Erase disk&lt;/strong&gt;&lt;br/&gt;This will &lt;font color=&quot;red&quot;&gt;delete&lt;/font&gt; all data currently present on the selected storage device.</source>
-        <translation type="unfinished"/>
+        <translation>&lt;strong&gt;Diskoa ezabatu&lt;/strong&gt;&lt;br/&gt;Honek orain dauden datu guztiak &lt;font color=&quot;red&quot;&gt;ezbatuko&lt;/font&gt; ditu biltegiratze-gailutik.</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1264"/>
@@ -533,7 +534,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="48"/>
         <source> MiB</source>
-        <translation type="unfinished"/>
+        <translation> MiB</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="55"/>
@@ -558,12 +559,12 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="151"/>
         <source>LVM LV name</source>
-        <translation type="unfinished"/>
+        <translation>LVM LV izena</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="188"/>
         <source>Flags:</source>
-        <translation type="unfinished"/>
+        <translation>Banderak:</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="161"/>
@@ -573,12 +574,12 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="38"/>
         <source>Si&amp;ze:</source>
-        <translation>Ta&amp;maina:</translation>
+        <translation>&amp;Tamaina:</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/CreatePartitionDialog.cpp" line="72"/>
         <source>En&amp;crypt</source>
-        <translation type="unfinished"/>
+        <translation>En%kriptatu</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/CreatePartitionDialog.cpp" line="151"/>
@@ -598,7 +599,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/modules/partition/gui/CreatePartitionDialog.cpp" line="262"/>
         <source>Mountpoint already in use. Please select another one.</source>
-        <translation type="unfinished"/>
+        <translation>Muntatze-puntua erabiltzen. Mesedez aukeratu beste bat.</translation>
     </message>
 </context>
 <context>
@@ -606,22 +607,22 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="44"/>
         <source>Create new %2MB partition on %4 (%3) with file system %1.</source>
-        <translation type="unfinished"/>
+        <translation>Sortu %2MB partizioa %4n (%3) %1 fitxategi sistemaz.</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="55"/>
         <source>Create new &lt;strong&gt;%2MB&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"/>
+        <translation>Sortu &lt;strong&gt;%2MB&lt;/strong&gt; partizioa &lt;strong&gt;%4&lt;/strong&gt;n (%3) &lt;strong&gt;%1&lt;/strong&gt; fitxategi sistemaz.</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="67"/>
         <source>Creating new %1 partition on %2.</source>
-        <translation type="unfinished"/>
+        <translation>%1 partizioa berria sortzen %2n.</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="79"/>
         <source>The installer failed to create partition on disk &apos;%1&apos;.</source>
-        <translation type="unfinished"/>
+        <translation>Huts egin du instalatzaileak &apos;%1&apos; diskoan partizioa sortzen.</translation>
     </message>
 </context>
 <context>
@@ -634,17 +635,17 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/modules/partition/gui/CreatePartitionTableDialog.ui" line="39"/>
         <source>Creating a new partition table will delete all existing data on the disk.</source>
-        <translation type="unfinished"/>
+        <translation>Partizio taula berria sortzean diskoan dauden datu guztiak ezabatuko dira.</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/CreatePartitionTableDialog.ui" line="65"/>
         <source>What kind of partition table do you want to create?</source>
-        <translation type="unfinished"/>
+        <translation>Zein motatako partizio taula sortu nahi duzu?</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/CreatePartitionTableDialog.ui" line="72"/>
         <source>Master Boot Record (MBR)</source>
-        <translation type="unfinished"/>
+        <translation>Master Boot Record (MBR)</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/CreatePartitionTableDialog.ui" line="82"/>
@@ -657,22 +658,22 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/modules/partition/jobs/CreatePartitionTableJob.cpp" line="47"/>
         <source>Create new %1 partition table on %2.</source>
-        <translation type="unfinished"/>
+        <translation>Sortu %1 partizio taula berria %2n.</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/jobs/CreatePartitionTableJob.cpp" line="54"/>
         <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"/>
+        <translation>Sortu &lt;strong&gt;%1&lt;/strong&gt; partizio taula berria &lt;strong&gt;%2&lt;/strong&gt;n (%3).</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/jobs/CreatePartitionTableJob.cpp" line="64"/>
         <source>Creating new %1 partition table on %2.</source>
-        <translation type="unfinished"/>
+        <translation>%1 partizio taula berria %2n sortzen.</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/jobs/CreatePartitionTableJob.cpp" line="82"/>
         <source>The installer failed to create a partition table on %1.</source>
-        <translation type="unfinished"/>
+        <translation>Huts egin du instalatzaileak &apos;%1&apos; diskoan partizioa taula sortzen.</translation>
     </message>
 </context>
 <context>
@@ -685,7 +686,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/modules/users/CreateUserJob.cpp" line="58"/>
         <source>Create user &lt;strong&gt;%1&lt;/strong&gt;.</source>
-        <translation type="unfinished"/>
+        <translation>Sortu &lt;strong&gt;%1&lt;/strong&gt; erabiltzailea</translation>
     </message>
     <message>
         <location filename="../src/modules/users/CreateUserJob.cpp" line="65"/>
@@ -718,22 +719,22 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/modules/partition/jobs/CreateVolumeGroupJob.cpp" line="38"/>
         <source>Create new volume group named %1.</source>
-        <translation type="unfinished"/>
+        <translation>Sortu bolumen talde berria %1 izenaz.</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/jobs/CreateVolumeGroupJob.cpp" line="45"/>
         <source>Create new volume group named &lt;strong&gt;%1&lt;/strong&gt;.</source>
-        <translation type="unfinished"/>
+        <translation>Sortu bolumen talde berria&lt;strong&gt; %1&lt;/strong&gt; izenaz.</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/jobs/CreateVolumeGroupJob.cpp" line="52"/>
         <source>Creating new volume group named %1.</source>
-        <translation type="unfinished"/>
+        <translation>Bolumen talde berria sortzen %1 izenaz.</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/jobs/CreateVolumeGroupJob.cpp" line="65"/>
         <source>The installer failed to create a volume group named &apos;%1&apos;.</source>
-        <translation type="unfinished"/>
+        <translation>Huts egin du instalatzaileak &apos;%1&apos; izeneko bolumen taldea sortzen.</translation>
     </message>
 </context>
 <context>
@@ -742,17 +743,17 @@ The installer will quit and all changes will be lost.</source>
         <location filename="../src/modules/partition/jobs/DeactivateVolumeGroupJob.cpp" line="34"/>
         <location filename="../src/modules/partition/jobs/DeactivateVolumeGroupJob.cpp" line="48"/>
         <source>Deactivate volume group named %1.</source>
-        <translation type="unfinished"/>
+        <translation>Desaktibatu %1 izeneko bolumen taldea.</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/jobs/DeactivateVolumeGroupJob.cpp" line="41"/>
         <source>Deactivate volume group named &lt;strong&gt;%1&lt;/strong&gt;.</source>
-        <translation type="unfinished"/>
+        <translation>Desaktibatu &lt;strong&gt;%1&lt;/strong&gt; izeneko bolumen taldea.</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/jobs/DeactivateVolumeGroupJob.cpp" line="61"/>
         <source>The installer failed to deactivate a volume group named %1.</source>
-        <translation type="unfinished"/>
+        <translation>Huts egin du instalatzaileak &apos;%1&apos; izeneko bolumen taldea desaktibatzen.</translation>
     </message>
 </context>
 <context>
@@ -765,7 +766,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/modules/partition/jobs/DeletePartitionJob.cpp" line="48"/>
         <source>Delete partition &lt;strong&gt;%1&lt;/strong&gt;.</source>
-        <translation type="unfinished"/>
+        <translation>Ezabatu &lt;strong&gt;%1&lt;/strong&gt; partizioa.</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/jobs/DeletePartitionJob.cpp" line="56"/>
@@ -775,7 +776,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/modules/partition/jobs/DeletePartitionJob.cpp" line="68"/>
         <source>The installer failed to delete partition %1.</source>
-        <translation type="unfinished"/>
+        <translation>Huts egin du instalatzaileak %1 partizioa ezabatzen.</translation>
     </message>
 </context>
 <context>
@@ -788,7 +789,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/modules/partition/gui/DeviceInfoWidget.cpp" line="107"/>
         <source>This device has a &lt;strong&gt;%1&lt;/strong&gt; partition table.</source>
-        <translation type="unfinished"/>
+        <translation>Gailuak &lt;strong&gt;%1&lt;/strong&gt; partizio taula dauka.</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/DeviceInfoWidget.cpp" line="114"/>
@@ -821,7 +822,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/modules/partition/core/DeviceModel.cpp" line="89"/>
         <source>%1 - (%2)</source>
-        <translation type="unfinished"/>
+        <translation>%1 - (%2)</translation>
     </message>
 </context>
 <context>
@@ -839,7 +840,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/modules/dracutlukscfg/DracutLuksCfgJob.cpp" line="149"/>
         <source>Failed to open %1</source>
-        <translation type="unfinished"/>
+        <translation>Huts egin du %1 irekitzean</translation>
     </message>
 </context>
 <context>
@@ -847,7 +848,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/modules/dummycpp/DummyCppJob.cpp" line="47"/>
         <source>Dummy C++ Job</source>
-        <translation type="unfinished"/>
+        <translation>Dummy C++ lana</translation>
     </message>
 </context>
 <context>
@@ -855,7 +856,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="20"/>
         <source>Edit Existing Partition</source>
-        <translation type="unfinished"/>
+        <translation>Editatu badagoen partizioa</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="50"/>
@@ -865,7 +866,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="60"/>
         <source>&amp;Keep</source>
-        <translation type="unfinished"/>
+        <translation>M&amp;antendu</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="70"/>
@@ -890,7 +891,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="129"/>
         <source> MiB</source>
-        <translation type="unfinished"/>
+        <translation> MiB</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="136"/>
@@ -900,12 +901,12 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="149"/>
         <source>Flags:</source>
-        <translation type="unfinished"/>
+        <translation>Banderak:</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="269"/>
         <source>Mountpoint already in use. Please select another one.</source>
-        <translation type="unfinished"/>
+        <translation>Muntatze-puntua erabiltzen. Mesedez aukeratu beste bat.</translation>
     </message>
 </context>
 <context>
@@ -918,22 +919,22 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/modules/partition/gui/EncryptWidget.ui" line="32"/>
         <source>En&amp;crypt system</source>
-        <translation type="unfinished"/>
+        <translation>Sistema en%kriptatua</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/EncryptWidget.ui" line="42"/>
         <source>Passphrase</source>
-        <translation type="unfinished"/>
+        <translation>Pasahitza</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/EncryptWidget.ui" line="52"/>
         <source>Confirm passphrase</source>
-        <translation type="unfinished"/>
+        <translation>Berretsi pasahitza</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/EncryptWidget.cpp" line="151"/>
         <source>Please enter the same passphrase in both boxes.</source>
-        <translation type="unfinished"/>
+        <translation>Mesedez sartu pasahitz berdina bi kutxatan.</translation>
     </message>
 </context>
 <context>
@@ -946,7 +947,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="156"/>
         <source>Install %1 on &lt;strong&gt;new&lt;/strong&gt; %2 system partition.</source>
-        <translation type="unfinished"/>
+        <translation>Instalatu %1 sistemako %2 partizio &lt;strong&gt;berrian&lt;/strong&gt;.</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="160"/>
@@ -966,7 +967,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="185"/>
         <source>Install boot loader on &lt;strong&gt;%1&lt;/strong&gt;.</source>
-        <translation type="unfinished"/>
+        <translation>Instalatu abio kargatzailea &lt;strong&gt;%1&lt;/strong&gt;-(e)n.</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="195"/>
@@ -1012,12 +1013,12 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/modules/finished/FinishedViewStep.cpp" line="124"/>
         <source>Installation Complete</source>
-        <translation type="unfinished"/>
+        <translation>Instalazioa amaitua</translation>
     </message>
     <message>
         <location filename="../src/modules/finished/FinishedViewStep.cpp" line="125"/>
         <source>The installation of %1 is complete.</source>
-        <translation type="unfinished"/>
+        <translation>%1 instalazioa amaitu da.</translation>
     </message>
 </context>
 <context>
@@ -1025,7 +1026,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="41"/>
         <source>Format partition %1 (file system: %2, size: %3 MB) on %4.</source>
-        <translation type="unfinished"/>
+        <translation>Formateatu %1 partizioa %4-(e)n (fitxategi sistema: %2, tamaina: %3 MB).</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="52"/>
@@ -1035,12 +1036,12 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="63"/>
         <source>Formatting partition %1 with file system %2.</source>
-        <translation type="unfinished"/>
+        <translation>%1 partizioa formateatzen %2 sistemaz.</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="77"/>
         <source>The installer failed to format partition %1 on disk &apos;%2&apos;.</source>
-        <translation type="unfinished"/>
+        <translation>Huts egin du instalatzaileak %1 partizioa sortzen &apos;%2&apos; diskoan.</translation>
     </message>
 </context>
 <context>
@@ -1053,7 +1054,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/modules/interactiveterminal/InteractiveTerminalPage.cpp" line="54"/>
         <source>Please install KDE Konsole and try again!</source>
-        <translation type="unfinished"/>
+        <translation>Mesedez instalatu KDE kontsola eta saiatu berriz!</translation>
     </message>
     <message>
         <location filename="../src/modules/interactiveterminal/InteractiveTerminalPage.cpp" line="116"/>
@@ -1066,7 +1067,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/modules/interactiveterminal/InteractiveTerminalViewStep.cpp" line="45"/>
         <source>Script</source>
-        <translation type="unfinished"/>
+        <translation>Script</translation>
     </message>
 </context>
 <context>
@@ -1074,12 +1075,12 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="219"/>
         <source>Set keyboard model to %1.&lt;br/&gt;</source>
-        <translation type="unfinished"/>
+        <translation>Ezarri teklatu mota %1ra.&lt;br/&gt;</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="221"/>
         <source>Set keyboard layout to %1/%2.</source>
-        <translation type="unfinished"/>
+        <translation>Ezarri teklatu diseinua %1%2ra.</translation>
     </message>
 </context>
 <context>
@@ -1110,7 +1111,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="67"/>
         <source>&amp;OK</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Ados</translation>
     </message>
 </context>
 <context>
@@ -1180,7 +1181,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/modules/license/LicensePage.cpp" line="203"/>
         <source>&lt;a href=&quot;%1&quot;&gt;view license agreement&lt;/a&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;a href=&quot;%1&quot;&gt;Ikusi lizentzia kontratua&lt;/a&gt;</translation>
     </message>
 </context>
 <context>
@@ -1196,12 +1197,12 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/modules/locale/LocalePage.cpp" line="387"/>
         <source>The system language will be set to %1.</source>
-        <translation type="unfinished"/>
+        <translation>%1 ezarriko da sistemako hizkuntza bezala.</translation>
     </message>
     <message>
         <location filename="../src/modules/locale/LocalePage.cpp" line="389"/>
         <source>The numbers and dates locale will be set to %1.</source>
-        <translation type="unfinished"/>
+        <translation>Zenbaki eta daten eskualdea %1-(e)ra ezarri da.</translation>
     </message>
     <message>
         <location filename="../src/modules/locale/LocalePage.cpp" line="215"/>
@@ -1222,7 +1223,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/modules/locale/LocalePage.cpp" line="398"/>
         <source>Set timezone to %1/%2.&lt;br/&gt;</source>
-        <translation type="unfinished"/>
+        <translation>Ordu-zonaldea %1%2-ra ezarri da.&lt;br/&gt;</translation>
     </message>
     <message>
         <location filename="../src/modules/locale/LocalePage.cpp" line="480"/>
@@ -1254,7 +1255,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="65"/>
         <source>Description</source>
-        <translation type="unfinished"/>
+        <translation>Deskribapena</translation>
     </message>
     <message>
         <location filename="../src/modules/netinstall/NetInstallPage.cpp" line="86"/>
@@ -1272,7 +1273,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="54"/>
         <source>Package selection</source>
-        <translation type="unfinished"/>
+        <translation>Pakete aukeraketa</translation>
     </message>
 </context>
 <context>
@@ -1280,17 +1281,17 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/modules/users/CheckPWQuality.cpp" line="63"/>
         <source>Password is too short</source>
-        <translation type="unfinished"/>
+        <translation>Pasahitza laburregia da</translation>
     </message>
     <message>
         <location filename="../src/modules/users/CheckPWQuality.cpp" line="85"/>
         <source>Password is too long</source>
-        <translation type="unfinished"/>
+        <translation>Pasahitza luzeegia da</translation>
     </message>
     <message>
         <location filename="../src/modules/users/CheckPWQuality.cpp" line="151"/>
         <source>Password is too weak</source>
-        <translation type="unfinished"/>
+        <translation>Pasahitza ahulegia da</translation>
     </message>
     <message>
         <location filename="../src/modules/users/CheckPWQuality.cpp" line="158"/>
@@ -1305,12 +1306,12 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/modules/users/CheckPWQuality.cpp" line="164"/>
         <source>The password is the same as the old one</source>
-        <translation type="unfinished"/>
+        <translation>Pasahitza aurreko zahar baten berdina da</translation>
     </message>
     <message>
         <location filename="../src/modules/users/CheckPWQuality.cpp" line="166"/>
         <source>The password is a palindrome</source>
-        <translation type="unfinished"/>
+        <translation>Pasahitza palindromoa da</translation>
     </message>
     <message>
         <location filename="../src/modules/users/CheckPWQuality.cpp" line="168"/>
@@ -1320,7 +1321,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/modules/users/CheckPWQuality.cpp" line="170"/>
         <source>The password is too similar to the old one</source>
-        <translation type="unfinished"/>
+        <translation>Pasahitza aurreko zahar baten oso antzerakoa da</translation>
     </message>
     <message>
         <location filename="../src/modules/users/CheckPWQuality.cpp" line="172"/>
@@ -1340,52 +1341,52 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/modules/users/CheckPWQuality.cpp" line="179"/>
         <source>The password contains less than %1 digits</source>
-        <translation type="unfinished"/>
+        <translation>Pasahitzak %1 baino zenbaki gutxiago ditu</translation>
     </message>
     <message>
         <location filename="../src/modules/users/CheckPWQuality.cpp" line="180"/>
         <source>The password contains too few digits</source>
-        <translation type="unfinished"/>
+        <translation>Pasahitzak zenbaki gutxiegi ditu</translation>
     </message>
     <message>
         <location filename="../src/modules/users/CheckPWQuality.cpp" line="183"/>
         <source>The password contains less than %1 uppercase letters</source>
-        <translation type="unfinished"/>
+        <translation>Pasahitzak %1 baino maiuskula gutxiago ditu</translation>
     </message>
     <message>
         <location filename="../src/modules/users/CheckPWQuality.cpp" line="184"/>
         <source>The password contains too few uppercase letters</source>
-        <translation type="unfinished"/>
+        <translation>Pasahitzak maiuskula gutxiegi ditu</translation>
     </message>
     <message>
         <location filename="../src/modules/users/CheckPWQuality.cpp" line="187"/>
         <source>The password contains less than %1 lowercase letters</source>
-        <translation type="unfinished"/>
+        <translation>Pasahitzak %1 baino minuskula gutxiago ditu</translation>
     </message>
     <message>
         <location filename="../src/modules/users/CheckPWQuality.cpp" line="188"/>
         <source>The password contains too few lowercase letters</source>
-        <translation type="unfinished"/>
+        <translation>Pasahitzak minuskula gutxiegi ditu</translation>
     </message>
     <message>
         <location filename="../src/modules/users/CheckPWQuality.cpp" line="191"/>
         <source>The password contains less than %1 non-alphanumeric characters</source>
-        <translation type="unfinished"/>
+        <translation>Pasahitzak alfabetokoak ez diren %1 baino karaktere gutxiago ditu</translation>
     </message>
     <message>
         <location filename="../src/modules/users/CheckPWQuality.cpp" line="192"/>
         <source>The password contains too few non-alphanumeric characters</source>
-        <translation type="unfinished"/>
+        <translation>Pasahitzak alfabetokoak ez diren karaktere gutxiegi ditu</translation>
     </message>
     <message>
         <location filename="../src/modules/users/CheckPWQuality.cpp" line="195"/>
         <source>The password is shorter than %1 characters</source>
-        <translation type="unfinished"/>
+        <translation>Pasahitza %1 karaktere baino motzagoa da.</translation>
     </message>
     <message>
         <location filename="../src/modules/users/CheckPWQuality.cpp" line="196"/>
         <source>The password is too short</source>
-        <translation type="unfinished"/>
+        <translation>Pasahitza motzegia da</translation>
     </message>
     <message>
         <location filename="../src/modules/users/CheckPWQuality.cpp" line="198"/>
@@ -1551,24 +1552,24 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/modules/users/page_usersetup.ui" line="117"/>
         <source>What name do you want to use to log in?</source>
-        <translation type="unfinished"/>
+        <translation>Zein izen erabili nahi duzu saioa hastean?</translation>
     </message>
     <message>
         <location filename="../src/modules/users/page_usersetup.ui" line="306"/>
         <location filename="../src/modules/users/page_usersetup.ui" line="437"/>
         <location filename="../src/modules/users/page_usersetup.ui" line="582"/>
         <source>font-weight: normal</source>
-        <translation type="unfinished"/>
+        <translation>Letra-mota zabalera: normala</translation>
     </message>
     <message>
         <location filename="../src/modules/users/page_usersetup.ui" line="200"/>
         <source>&lt;small&gt;If more than one person will use this computer, you can set up multiple accounts after installation.&lt;/small&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;small&gt;Ordenagailu hau pertsona batek baino gehiagok erabiltzen badu, instalazio ondoren hainbat kontu ezarri zenitzake.&lt;/small&gt; </translation>
     </message>
     <message>
         <location filename="../src/modules/users/page_usersetup.ui" line="335"/>
         <source>Choose a password to keep your account safe.</source>
-        <translation type="unfinished"/>
+        <translation>Aukeratu pasahitza zure kontua babesteko.</translation>
     </message>
     <message>
         <location filename="../src/modules/users/page_usersetup.ui" line="440"/>
@@ -1583,7 +1584,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/modules/users/page_usersetup.ui" line="309"/>
         <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"/>
+        <translation>&lt;small&gt;Izen hau erakutsiko da sarean zure ordenagailua besteei erakustean.&lt;/small&gt;</translation>
     </message>
     <message>
         <location filename="../src/modules/users/page_usersetup.ui" line="450"/>
@@ -1603,7 +1604,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/modules/users/page_usersetup.ui" line="585"/>
         <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"/>
+        <translation>&lt;small&gt;Sartu pasahitza birritan, honela tekleatze erroreak egiaztatzeko.&lt;/small&gt;</translation>
     </message>
 </context>
 <context>
@@ -1611,32 +1612,32 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="193"/>
         <source>Root</source>
-        <translation type="unfinished"/>
+        <translation>Root</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="196"/>
         <source>Home</source>
-        <translation type="unfinished"/>
+        <translation>Home</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="198"/>
         <source>Boot</source>
-        <translation type="unfinished"/>
+        <translation>Boot</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="201"/>
         <source>EFI system</source>
-        <translation type="unfinished"/>
+        <translation>EFI sistema</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="203"/>
         <source>Swap</source>
-        <translation type="unfinished"/>
+        <translation>Swap</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="205"/>
         <source>New partition for %1</source>
-        <translation type="unfinished"/>
+        <translation>Partizio berri %1(e)ntzat</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="207"/>
@@ -1646,7 +1647,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="224"/>
         <source>%1  %2</source>
-        <translation type="unfinished"/>
+        <translation>%1  %2</translation>
     </message>
 </context>
 <context>
@@ -1694,12 +1695,12 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/modules/partition/gui/PartitionPage.ui" line="22"/>
         <source>Storage de&amp;vice:</source>
-        <translation type="unfinished"/>
+        <translation>Biltegiratze-gailua:</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/PartitionPage.ui" line="51"/>
         <source>&amp;Revert All Changes</source>
-        <translation type="unfinished"/>
+        <translation>Atze&amp;ra bota aldaketa guztiak:</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/PartitionPage.ui" line="87"/>
@@ -1905,7 +1906,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="85"/>
         <source>Saving files for later ...</source>
-        <translation type="unfinished"/>
+        <translation>Fitxategiak geroko gordetzen...</translation>
     </message>
     <message>
         <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="123"/>
@@ -1931,32 +1932,34 @@ There was no output from the command.</source>
         <source>
 Output:
 </source>
-        <translation type="unfinished"/>
+        <translation>
+Irteera:
+</translation>
     </message>
     <message>
         <location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="275"/>
         <source>External command crashed.</source>
-        <translation type="unfinished"/>
+        <translation>Kanpo-komandoak huts egin du.</translation>
     </message>
     <message>
         <location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="276"/>
         <source>Command &lt;i&gt;%1&lt;/i&gt; crashed.</source>
-        <translation type="unfinished"/>
+        <translation>&lt;i&gt;%1&lt;/i&gt; komandoak huts egin du.</translation>
     </message>
     <message>
         <location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="281"/>
         <source>External command failed to start.</source>
-        <translation type="unfinished"/>
+        <translation>Ezin izan da %1 kanpo-komandoa abiarazi.</translation>
     </message>
     <message>
         <location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="282"/>
         <source>Command &lt;i&gt;%1&lt;/i&gt; failed to start.</source>
-        <translation type="unfinished"/>
+        <translation>Ezin izan da &lt;i&gt;%1&lt;/i&gt; komandoa abiarazi.</translation>
     </message>
     <message>
         <location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="286"/>
         <source>Internal error when starting command.</source>
-        <translation type="unfinished"/>
+        <translation>Barne-akatsa komandoa abiarazterakoan.</translation>
     </message>
     <message>
         <location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="287"/>
@@ -1966,7 +1969,7 @@ Output:
     <message>
         <location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="290"/>
         <source>External command failed to finish.</source>
-        <translation type="unfinished"/>
+        <translation>Kanpo-komandoa ez da bukatu.</translation>
     </message>
     <message>
         <location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="291"/>
@@ -1976,7 +1979,7 @@ Output:
     <message>
         <location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="297"/>
         <source>External command finished with errors.</source>
-        <translation type="unfinished"/>
+        <translation>Kanpo-komandoak akatsekin bukatu da.</translation>
     </message>
     <message>
         <location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="298"/>
@@ -1989,7 +1992,7 @@ Output:
     <message>
         <location filename="../src/modules/keyboard/keyboardwidget/keyboardglobal.cpp" line="82"/>
         <source>Default Keyboard Model</source>
-        <translation type="unfinished"/>
+        <translation>Teklatu mota lehenetsia</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/keyboardwidget/keyboardglobal.cpp" line="127"/>
@@ -2000,22 +2003,22 @@ Output:
     <message>
         <location filename="../src/modules/partition/core/KPMHelpers.cpp" line="207"/>
         <source>unknown</source>
-        <translation type="unfinished"/>
+        <translation>Ezezaguna</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/core/KPMHelpers.cpp" line="209"/>
         <source>extended</source>
-        <translation type="unfinished"/>
+        <translation>Hedatua</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/core/KPMHelpers.cpp" line="211"/>
         <source>unformatted</source>
-        <translation type="unfinished"/>
+        <translation>Formatugabea</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/core/KPMHelpers.cpp" line="213"/>
         <source>swap</source>
-        <translation type="unfinished"/>
+        <translation>swap</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="49"/>
@@ -2167,12 +2170,12 @@ Output:
     <message>
         <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="155"/>
         <source>The installer is not running with administrator rights.</source>
-        <translation type="unfinished"/>
+        <translation>Instalatzailea ez dabil exekutatzen administrari eskubideekin.</translation>
     </message>
     <message>
         <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="163"/>
         <source>The screen is too small to display the installer.</source>
-        <translation type="unfinished"/>
+        <translation>Pantaila txikiegia da instalatzailea erakusteko.</translation>
     </message>
 </context>
 <context>
@@ -2185,7 +2188,7 @@ Output:
     <message>
         <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="238"/>
         <source>Invalid configuration</source>
-        <translation type="unfinished"/>
+        <translation>Konfigurazio baliogabea</translation>
     </message>
     <message>
         <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="239"/>
@@ -2251,7 +2254,7 @@ Output:
     <message>
         <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="48"/>
         <source>Resize partition %1.</source>
-        <translation type="unfinished"/>
+        <translation>Tamaina aldatu %1 partizioari.</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="55"/>
@@ -2293,12 +2296,12 @@ Output:
     <message>
         <location filename="../src/modules/partition/gui/ScanningDialog.cpp" line="84"/>
         <source>Scanning storage devices...</source>
-        <translation type="unfinished"/>
+        <translation>Biltegiratze-gailuak eskaneatzen...</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/ScanningDialog.cpp" line="85"/>
         <source>Partitioning</source>
-        <translation type="unfinished"/>
+        <translation>Partizioa(k) egiten</translation>
     </message>
 </context>
 <context>
@@ -2469,7 +2472,7 @@ Output:
     <message>
         <location filename="../src/modules/users/SetPasswordJob.cpp" line="123"/>
         <source>Cannot disable root account.</source>
-        <translation type="unfinished"/>
+        <translation>Ezin da desgaitu root kontua.</translation>
     </message>
     <message>
         <location filename="../src/modules/users/SetPasswordJob.cpp" line="124"/>
@@ -2517,7 +2520,7 @@ Output:
     <message>
         <location filename="../src/modules/locale/SetTimezoneJob.cpp" line="96"/>
         <source>Cannot set timezone,</source>
-        <translation type="unfinished"/>
+        <translation>Ezin da ezarri ordu-zonaldea</translation>
     </message>
     <message>
         <location filename="../src/modules/locale/SetTimezoneJob.cpp" line="97"/>
@@ -2747,12 +2750,12 @@ Output:
     <message>
         <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="66"/>
         <source> MiB</source>
-        <translation type="unfinished"/>
+        <translation> MiB</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="82"/>
         <source>Total Size:</source>
-        <translation type="unfinished"/>
+        <translation>Tamaina guztira:</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="92"/>
@@ -2760,22 +2763,22 @@ Output:
         <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="132"/>
         <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="152"/>
         <source>---</source>
-        <translation type="unfinished"/>
+        <translation>---</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="102"/>
         <source>Used Size:</source>
-        <translation type="unfinished"/>
+        <translation>Erabilitako tamaina:</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="122"/>
         <source>Total Sectors:</source>
-        <translation type="unfinished"/>
+        <translation>Sektoreak guztira:</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="142"/>
         <source>Quantity of LVs:</source>
-        <translation type="unfinished"/>
+        <translation>LV kopurua:</translation>
     </message>
 </context>
 <context>
diff --git a/lang/calamares_hu.ts b/lang/calamares_hu.ts
index 0be907a6c..47a596df1 100644
--- a/lang/calamares_hu.ts
+++ b/lang/calamares_hu.ts
@@ -192,17 +192,17 @@
     <message>
         <location filename="../src/libcalamaresui/ViewManager.cpp" line="179"/>
         <source>Calamares Initialization Failed</source>
-        <translation type="unfinished"/>
+        <translation>A Calamares előkészítése meghiúsult</translation>
     </message>
     <message>
         <location filename="../src/libcalamaresui/ViewManager.cpp" line="180"/>
         <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"/>
+        <translation>A(z) %1 nem telepíthető. A Calamares nem tudta betölteni a konfigurált modulokat. Ez a probléma abból fakad, ahogy a disztribúció a Calamarest használja.</translation>
     </message>
     <message>
         <location filename="../src/libcalamaresui/ViewManager.cpp" line="185"/>
         <source>&lt;br/&gt;The following modules could not be loaded:</source>
-        <translation type="unfinished"/>
+        <translation>&lt;br/&gt;A következő modulok nem tölthetőek be:</translation>
     </message>
     <message>
         <location filename="../src/libcalamaresui/ViewManager.cpp" line="277"/>
@@ -509,12 +509,12 @@ Telepítés nem folytatható. &lt;a href=&quot;#details&quot;&gt;Részletek...&l
     <message>
         <location filename="../src/libcalamares/utils/CommandList.cpp" line="128"/>
         <source>The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined.</source>
-        <translation type="unfinished"/>
+        <translation>A parancs a gazdakörnyezetben fut, és ismernie kell a gyökér útvonalát, de nincs rootMountPoint megadva.</translation>
     </message>
     <message>
         <location filename="../src/libcalamares/utils/CommandList.cpp" line="139"/>
         <source>The command needs to know the user&apos;s name, but no username is defined.</source>
-        <translation type="unfinished"/>
+        <translation>A parancsnak tudnia kell a felhasználónevet, de az nincs megadva.</translation>
     </message>
 </context>
 <context>
@@ -522,7 +522,7 @@ Telepítés nem folytatható. &lt;a href=&quot;#details&quot;&gt;Részletek...&l
     <message>
         <location filename="../src/modules/contextualprocess/ContextualProcessJob.cpp" line="117"/>
         <source>Contextual Processes Job</source>
-        <translation type="unfinished"/>
+        <translation>Környezetfüggő folyamatok feladat</translation>
     </message>
 </context>
 <context>
@@ -560,7 +560,7 @@ Telepítés nem folytatható. &lt;a href=&quot;#details&quot;&gt;Részletek...&l
     <message>
         <location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="151"/>
         <source>LVM LV name</source>
-        <translation type="unfinished"/>
+        <translation>LVM LV név</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="188"/>
@@ -720,22 +720,22 @@ Telepítés nem folytatható. &lt;a href=&quot;#details&quot;&gt;Részletek...&l
     <message>
         <location filename="../src/modules/partition/jobs/CreateVolumeGroupJob.cpp" line="38"/>
         <source>Create new volume group named %1.</source>
-        <translation type="unfinished"/>
+        <translation>Új kötetcsoport létrehozása: %1.</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/jobs/CreateVolumeGroupJob.cpp" line="45"/>
         <source>Create new volume group named &lt;strong&gt;%1&lt;/strong&gt;.</source>
-        <translation type="unfinished"/>
+        <translation>Új kötetcsoport létrehozása: &lt;strong&gt;%1&lt;/strong&gt;.</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/jobs/CreateVolumeGroupJob.cpp" line="52"/>
         <source>Creating new volume group named %1.</source>
-        <translation type="unfinished"/>
+        <translation>Új kötetcsoport létrehozása: %1.</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/jobs/CreateVolumeGroupJob.cpp" line="65"/>
         <source>The installer failed to create a volume group named &apos;%1&apos;.</source>
-        <translation type="unfinished"/>
+        <translation>A telepítő nem tudta létrehozni a kötetcsoportot: „%1”.</translation>
     </message>
 </context>
 <context>
@@ -744,17 +744,17 @@ Telepítés nem folytatható. &lt;a href=&quot;#details&quot;&gt;Részletek...&l
         <location filename="../src/modules/partition/jobs/DeactivateVolumeGroupJob.cpp" line="34"/>
         <location filename="../src/modules/partition/jobs/DeactivateVolumeGroupJob.cpp" line="48"/>
         <source>Deactivate volume group named %1.</source>
-        <translation type="unfinished"/>
+        <translation>A kötetcsoport deaktiválása: %1.</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/jobs/DeactivateVolumeGroupJob.cpp" line="41"/>
         <source>Deactivate volume group named &lt;strong&gt;%1&lt;/strong&gt;.</source>
-        <translation type="unfinished"/>
+        <translation>Kötetcsoport deaktiválása: &lt;strong&gt;%1&lt;/strong&gt;.</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/jobs/DeactivateVolumeGroupJob.cpp" line="61"/>
         <source>The installer failed to deactivate a volume group named %1.</source>
-        <translation type="unfinished"/>
+        <translation>A telepítőnek nem sikerült deaktiválnia a kötetcsoportot: %1.</translation>
     </message>
 </context>
 <context>
@@ -823,7 +823,7 @@ Telepítés nem folytatható. &lt;a href=&quot;#details&quot;&gt;Részletek...&l
     <message>
         <location filename="../src/modules/partition/core/DeviceModel.cpp" line="89"/>
         <source>%1 - (%2)</source>
-        <translation type="unfinished"/>
+        <translation>%1 – (%2)</translation>
     </message>
 </context>
 <context>
@@ -986,7 +986,7 @@ Telepítés nem folytatható. &lt;a href=&quot;#details&quot;&gt;Részletek...&l
     <message>
         <location filename="../src/modules/finished/FinishedPage.ui" line="95"/>
         <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=&quot; font-style:italic;&quot;&gt;Done&lt;/span&gt; or close the installer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Ha ez be van jelölve, akkor a rendszer azonnal újraindul, ha a &lt;span style=&quot; font-style:italic;&quot;&gt;Kész&lt;/span&gt;-re kattint, vagy bezárja a telepítőt.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="../src/modules/finished/FinishedPage.ui" line="98"/>
@@ -1292,232 +1292,232 @@ Telepítés nem folytatható. &lt;a href=&quot;#details&quot;&gt;Részletek...&l
     <message>
         <location filename="../src/modules/users/CheckPWQuality.cpp" line="151"/>
         <source>Password is too weak</source>
-        <translation type="unfinished"/>
+        <translation>A jelszó túl gyenge</translation>
     </message>
     <message>
         <location filename="../src/modules/users/CheckPWQuality.cpp" line="158"/>
         <source>Memory allocation error when setting &apos;%1&apos;</source>
-        <translation type="unfinished"/>
+        <translation>Memóriafoglalási hiba a(z) „%1” beállításakor</translation>
     </message>
     <message>
         <location filename="../src/modules/users/CheckPWQuality.cpp" line="162"/>
         <source>Memory allocation error</source>
-        <translation type="unfinished"/>
+        <translation>Memóriafoglalási hiba</translation>
     </message>
     <message>
         <location filename="../src/modules/users/CheckPWQuality.cpp" line="164"/>
         <source>The password is the same as the old one</source>
-        <translation type="unfinished"/>
+        <translation>A jelszó ugyanaz, mint a régi</translation>
     </message>
     <message>
         <location filename="../src/modules/users/CheckPWQuality.cpp" line="166"/>
         <source>The password is a palindrome</source>
-        <translation type="unfinished"/>
+        <translation>A jelszó egy palindrom</translation>
     </message>
     <message>
         <location filename="../src/modules/users/CheckPWQuality.cpp" line="168"/>
         <source>The password differs with case changes only</source>
-        <translation type="unfinished"/>
+        <translation>A jelszó csak kis- és nagybetűben tér el</translation>
     </message>
     <message>
         <location filename="../src/modules/users/CheckPWQuality.cpp" line="170"/>
         <source>The password is too similar to the old one</source>
-        <translation type="unfinished"/>
+        <translation>A jelszó túlságosan hasonlít a régire</translation>
     </message>
     <message>
         <location filename="../src/modules/users/CheckPWQuality.cpp" line="172"/>
         <source>The password contains the user name in some form</source>
-        <translation type="unfinished"/>
+        <translation>A jelszó tartalmazza felhasználónevet valamilyen formában</translation>
     </message>
     <message>
         <location filename="../src/modules/users/CheckPWQuality.cpp" line="174"/>
         <source>The password contains words from the real name of the user in some form</source>
-        <translation type="unfinished"/>
+        <translation>A jelszó tartalmazza a felhasználó valódi nevét valamilyen formában</translation>
     </message>
     <message>
         <location filename="../src/modules/users/CheckPWQuality.cpp" line="176"/>
         <source>The password contains forbidden words in some form</source>
-        <translation type="unfinished"/>
+        <translation>A jelszó tiltott szavakat tartalmaz valamilyen formában</translation>
     </message>
     <message>
         <location filename="../src/modules/users/CheckPWQuality.cpp" line="179"/>
         <source>The password contains less than %1 digits</source>
-        <translation type="unfinished"/>
+        <translation>A jelszó kevesebb mint %1 számjegyet tartalmaz</translation>
     </message>
     <message>
         <location filename="../src/modules/users/CheckPWQuality.cpp" line="180"/>
         <source>The password contains too few digits</source>
-        <translation type="unfinished"/>
+        <translation>A jelszó túl kevés számjegyet tartalmaz</translation>
     </message>
     <message>
         <location filename="../src/modules/users/CheckPWQuality.cpp" line="183"/>
         <source>The password contains less than %1 uppercase letters</source>
-        <translation type="unfinished"/>
+        <translation>A jelszó kevesebb mint %1 nagybetűt tartalmaz</translation>
     </message>
     <message>
         <location filename="../src/modules/users/CheckPWQuality.cpp" line="184"/>
         <source>The password contains too few uppercase letters</source>
-        <translation type="unfinished"/>
+        <translation>A jelszó túl kevés nagybetűt tartalmaz</translation>
     </message>
     <message>
         <location filename="../src/modules/users/CheckPWQuality.cpp" line="187"/>
         <source>The password contains less than %1 lowercase letters</source>
-        <translation type="unfinished"/>
+        <translation>A jelszó kevesebb mint %1 kisbetűt tartalmaz</translation>
     </message>
     <message>
         <location filename="../src/modules/users/CheckPWQuality.cpp" line="188"/>
         <source>The password contains too few lowercase letters</source>
-        <translation type="unfinished"/>
+        <translation>A jelszó túl kevés kisbetűt tartalmaz</translation>
     </message>
     <message>
         <location filename="../src/modules/users/CheckPWQuality.cpp" line="191"/>
         <source>The password contains less than %1 non-alphanumeric characters</source>
-        <translation type="unfinished"/>
+        <translation>A jelszó kevesebb mint %1 nem alfanumerikus karaktert tartalmaz</translation>
     </message>
     <message>
         <location filename="../src/modules/users/CheckPWQuality.cpp" line="192"/>
         <source>The password contains too few non-alphanumeric characters</source>
-        <translation type="unfinished"/>
+        <translation>A jelszó túl kevés nem alfanumerikus karaktert tartalmaz</translation>
     </message>
     <message>
         <location filename="../src/modules/users/CheckPWQuality.cpp" line="195"/>
         <source>The password is shorter than %1 characters</source>
-        <translation type="unfinished"/>
+        <translation>A jelszó rövidebb mint %1 karakter</translation>
     </message>
     <message>
         <location filename="../src/modules/users/CheckPWQuality.cpp" line="196"/>
         <source>The password is too short</source>
-        <translation type="unfinished"/>
+        <translation>A jelszó túl rövid</translation>
     </message>
     <message>
         <location filename="../src/modules/users/CheckPWQuality.cpp" line="198"/>
         <source>The password is just rotated old one</source>
-        <translation type="unfinished"/>
+        <translation>A jelszó egy újra felhasznált régi jelszó</translation>
     </message>
     <message>
         <location filename="../src/modules/users/CheckPWQuality.cpp" line="201"/>
         <source>The password contains less than %1 character classes</source>
-        <translation type="unfinished"/>
+        <translation>A jelszó kevesebb mint %1 karaktert tartalmaz</translation>
     </message>
     <message>
         <location filename="../src/modules/users/CheckPWQuality.cpp" line="202"/>
         <source>The password does not contain enough character classes</source>
-        <translation type="unfinished"/>
+        <translation>A jelszó nem tartalmaz elég karakterosztályt</translation>
     </message>
     <message>
         <location filename="../src/modules/users/CheckPWQuality.cpp" line="205"/>
         <source>The password contains more than %1 same characters consecutively</source>
-        <translation type="unfinished"/>
+        <translation>A jelszó több mint %1 egyező karaktert tartalmaz egymás után</translation>
     </message>
     <message>
         <location filename="../src/modules/users/CheckPWQuality.cpp" line="206"/>
         <source>The password contains too many same characters consecutively</source>
-        <translation type="unfinished"/>
+        <translation>A jelszó túl sok egyező karaktert tartalmaz egymás után</translation>
     </message>
     <message>
         <location filename="../src/modules/users/CheckPWQuality.cpp" line="209"/>
         <source>The password contains more than %1 characters of the same class consecutively</source>
-        <translation type="unfinished"/>
+        <translation>A jelszó több mint %1 karaktert tartalmaz ugyanabból a karakterosztályból egymás után</translation>
     </message>
     <message>
         <location filename="../src/modules/users/CheckPWQuality.cpp" line="210"/>
         <source>The password contains too many characters of the same class consecutively</source>
-        <translation type="unfinished"/>
+        <translation>A jelszó túl sok karaktert tartalmaz ugyanabból a karakterosztályból egymás után</translation>
     </message>
     <message>
         <location filename="../src/modules/users/CheckPWQuality.cpp" line="213"/>
         <source>The password contains monotonic sequence longer than %1 characters</source>
-        <translation type="unfinished"/>
+        <translation>A jelszó %1 karakternél hosszabb monoton sorozatot tartalmaz</translation>
     </message>
     <message>
         <location filename="../src/modules/users/CheckPWQuality.cpp" line="214"/>
         <source>The password contains too long of a monotonic character sequence</source>
-        <translation type="unfinished"/>
+        <translation>A jelszó túl hosszú monoton karaktersorozatot tartalmaz</translation>
     </message>
     <message>
         <location filename="../src/modules/users/CheckPWQuality.cpp" line="216"/>
         <source>No password supplied</source>
-        <translation type="unfinished"/>
+        <translation>Nincs jelszó megadva</translation>
     </message>
     <message>
         <location filename="../src/modules/users/CheckPWQuality.cpp" line="218"/>
         <source>Cannot obtain random numbers from the RNG device</source>
-        <translation type="unfinished"/>
+        <translation>Nem nyerhetőek ki véletlenszámok az RNG eszközből</translation>
     </message>
     <message>
         <location filename="../src/modules/users/CheckPWQuality.cpp" line="220"/>
         <source>Password generation failed - required entropy too low for settings</source>
-        <translation type="unfinished"/>
+        <translation>A jelszó előállítás meghiúsult – a szükséges entrópia túl alacsony a beállításokhoz</translation>
     </message>
     <message>
         <location filename="../src/modules/users/CheckPWQuality.cpp" line="225"/>
         <source>The password fails the dictionary check - %1</source>
-        <translation type="unfinished"/>
+        <translation>A jelszó megbukott a szótárellenőrzésen – %1</translation>
     </message>
     <message>
         <location filename="../src/modules/users/CheckPWQuality.cpp" line="227"/>
         <source>The password fails the dictionary check</source>
-        <translation type="unfinished"/>
+        <translation>A jelszó megbukott a szótárellenőrzésen</translation>
     </message>
     <message>
         <location filename="../src/modules/users/CheckPWQuality.cpp" line="231"/>
         <source>Unknown setting - %1</source>
-        <translation type="unfinished"/>
+        <translation>Ismeretlen beállítás – %1</translation>
     </message>
     <message>
         <location filename="../src/modules/users/CheckPWQuality.cpp" line="235"/>
         <source>Unknown setting</source>
-        <translation type="unfinished"/>
+        <translation>Ismeretlen beállítás</translation>
     </message>
     <message>
         <location filename="../src/modules/users/CheckPWQuality.cpp" line="239"/>
         <source>Bad integer value of setting - %1</source>
-        <translation type="unfinished"/>
+        <translation>Hibás egész érték a beállításnál – %1</translation>
     </message>
     <message>
         <location filename="../src/modules/users/CheckPWQuality.cpp" line="243"/>
         <source>Bad integer value</source>
-        <translation type="unfinished"/>
+        <translation>Hibás egész érték</translation>
     </message>
     <message>
         <location filename="../src/modules/users/CheckPWQuality.cpp" line="247"/>
         <source>Setting %1 is not of integer type</source>
-        <translation type="unfinished"/>
+        <translation>A(z) %1 beállítás nem egész típusú</translation>
     </message>
     <message>
         <location filename="../src/modules/users/CheckPWQuality.cpp" line="251"/>
         <source>Setting is not of integer type</source>
-        <translation type="unfinished"/>
+        <translation>A beállítás nem egész típusú</translation>
     </message>
     <message>
         <location filename="../src/modules/users/CheckPWQuality.cpp" line="255"/>
         <source>Setting %1 is not of string type</source>
-        <translation type="unfinished"/>
+        <translation>A(z) %1 beállítás nem karakterlánc típusú</translation>
     </message>
     <message>
         <location filename="../src/modules/users/CheckPWQuality.cpp" line="259"/>
         <source>Setting is not of string type</source>
-        <translation type="unfinished"/>
+        <translation>A beállítás nem karakterlánc típusú</translation>
     </message>
     <message>
         <location filename="../src/modules/users/CheckPWQuality.cpp" line="261"/>
         <source>Opening the configuration file failed</source>
-        <translation type="unfinished"/>
+        <translation>A konfigurációs fájl megnyitása meghiúsult</translation>
     </message>
     <message>
         <location filename="../src/modules/users/CheckPWQuality.cpp" line="263"/>
         <source>The configuration file is malformed</source>
-        <translation type="unfinished"/>
+        <translation>A konfigurációs fájl rosszul formázott</translation>
     </message>
     <message>
         <location filename="../src/modules/users/CheckPWQuality.cpp" line="265"/>
         <source>Fatal failure</source>
-        <translation type="unfinished"/>
+        <translation>Végzetes hiba</translation>
     </message>
     <message>
         <location filename="../src/modules/users/CheckPWQuality.cpp" line="267"/>
         <source>Unknown error</source>
-        <translation type="unfinished"/>
+        <translation>Ismeretlen hiba</translation>
     </message>
 </context>
 <context>
@@ -1711,7 +1711,7 @@ Telepítés nem folytatható. &lt;a href=&quot;#details&quot;&gt;Részletek...&l
     <message>
         <location filename="../src/modules/partition/gui/PartitionPage.ui" line="107"/>
         <source>Cre&amp;ate</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Létrehozás</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/PartitionPage.ui" line="114"/>
@@ -1726,27 +1726,27 @@ Telepítés nem folytatható. &lt;a href=&quot;#details&quot;&gt;Részletek...&l
     <message>
         <location filename="../src/modules/partition/gui/PartitionPage.ui" line="132"/>
         <source>New Volume Group</source>
-        <translation type="unfinished"/>
+        <translation>Új kötetcsoport</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/PartitionPage.ui" line="139"/>
         <source>Resize Volume Group</source>
-        <translation type="unfinished"/>
+        <translation>Kötetcsoport átméretezése</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/PartitionPage.ui" line="146"/>
         <source>Deactivate Volume Group</source>
-        <translation type="unfinished"/>
+        <translation>Kötetcsoport deaktiválása</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/PartitionPage.ui" line="153"/>
         <source>Remove Volume Group</source>
-        <translation type="unfinished"/>
+        <translation>Kötetcsoport eltávolítása</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/PartitionPage.ui" line="180"/>
         <source>I&amp;nstall boot loader on:</source>
-        <translation type="unfinished"/>
+        <translation>Rendszerbetöltő &amp;telepítése ide:</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="217"/>
@@ -1756,12 +1756,12 @@ Telepítés nem folytatható. &lt;a href=&quot;#details&quot;&gt;Részletek...&l
     <message>
         <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="241"/>
         <source>Can not create new partition</source>
-        <translation type="unfinished"/>
+        <translation>Nem hozható létre új partíció</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="242"/>
         <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"/>
+        <translation>A(z) %1 lemezen lévő partíciós táblában már %2 elsődleges partíció van, és több nem adható hozzá. Helyette távolítson el egy elsődleges partíciót, és adjon hozzá egy kiterjesztett partíciót.</translation>
     </message>
 </context>
 <context>
@@ -1867,13 +1867,13 @@ Telepítés nem folytatható. &lt;a href=&quot;#details&quot;&gt;Részletek...&l
     <message>
         <location filename="../src/modules/plasmalnf/PlasmaLnfJob.cpp" line="41"/>
         <source>Plasma Look-and-Feel Job</source>
-        <translation type="unfinished"/>
+        <translation>Plasma kinézet feladat</translation>
     </message>
     <message>
         <location filename="../src/modules/plasmalnf/PlasmaLnfJob.cpp" line="73"/>
         <location filename="../src/modules/plasmalnf/PlasmaLnfJob.cpp" line="74"/>
         <source>Could not select KDE Plasma Look-and-Feel package</source>
-        <translation type="unfinished"/>
+        <translation>A KDE Plasma kinézeti csomag nem válaszható ki</translation>
     </message>
 </context>
 <context>
@@ -1891,7 +1891,7 @@ Telepítés nem folytatható. &lt;a href=&quot;#details&quot;&gt;Részletek...&l
     <message>
         <location filename="../src/modules/plasmalnf/PlasmaLnfPage.cpp" line="67"/>
         <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"/>
+        <translation>Válasszon egy kinézetet a KDE Plasma asztali környezethez. Ki is hagyhatja ezt a lépést, és beállíthatja a kinézetet, ha a telepítés elkészült. A kinézetválasztóra kattintva élő előnézetet kaphat a kinézetről.</translation>
     </message>
 </context>
 <context>
@@ -1899,7 +1899,7 @@ Telepítés nem folytatható. &lt;a href=&quot;#details&quot;&gt;Részletek...&l
     <message>
         <location filename="../src/modules/plasmalnf/PlasmaLnfViewStep.cpp" line="68"/>
         <source>Look-and-Feel</source>
-        <translation type="unfinished"/>
+        <translation>Kinézet</translation>
     </message>
 </context>
 <context>
@@ -1907,17 +1907,17 @@ Telepítés nem folytatható. &lt;a href=&quot;#details&quot;&gt;Részletek...&l
     <message>
         <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="85"/>
         <source>Saving files for later ...</source>
-        <translation type="unfinished"/>
+        <translation>Fájlok mentése későbbre …</translation>
     </message>
     <message>
         <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="123"/>
         <source>No files configured to save for later.</source>
-        <translation type="unfinished"/>
+        <translation>Nincsenek fájlok beállítva elmentésre későbbre</translation>
     </message>
     <message>
         <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="177"/>
         <source>Not all of the configured files could be preserved.</source>
-        <translation type="unfinished"/>
+        <translation>Nem az összes beállított fájl örízhető meg.</translation>
     </message>
 </context>
 <context>
@@ -1926,14 +1926,17 @@ Telepítés nem folytatható. &lt;a href=&quot;#details&quot;&gt;Részletek...&l
         <location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="271"/>
         <source>
 There was no output from the command.</source>
-        <translation type="unfinished"/>
+        <translation>
+A parancsnak nem volt kimenete.</translation>
     </message>
     <message>
         <location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="272"/>
         <source>
 Output:
 </source>
-        <translation type="unfinished"/>
+        <translation>
+Kimenet:
+</translation>
     </message>
     <message>
         <location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="275"/>
@@ -1948,17 +1951,17 @@ Output:
     <message>
         <location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="281"/>
         <source>External command failed to start.</source>
-        <translation type="unfinished"/>
+        <translation>A külső parancsot nem sikerült elindítani.</translation>
     </message>
     <message>
         <location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="282"/>
         <source>Command &lt;i&gt;%1&lt;/i&gt; failed to start.</source>
-        <translation type="unfinished"/>
+        <translation>A(z) &lt;i&gt;%1&lt;/i&gt; parancsot nem sikerült elindítani.</translation>
     </message>
     <message>
         <location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="286"/>
         <source>Internal error when starting command.</source>
-        <translation type="unfinished"/>
+        <translation>Belső hiba a parancs végrehajtásakor.</translation>
     </message>
     <message>
         <location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="287"/>
@@ -1973,17 +1976,17 @@ Output:
     <message>
         <location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="291"/>
         <source>Command &lt;i&gt;%1&lt;/i&gt; failed to finish in %2 seconds.</source>
-        <translation type="unfinished"/>
+        <translation>A(z) &lt;i&gt;%1&lt;/i&gt; parancsot nem sikerült befejezni %2 másodperc alatt.</translation>
     </message>
     <message>
         <location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="297"/>
         <source>External command finished with errors.</source>
-        <translation type="unfinished"/>
+        <translation>A külső parancs hibával fejeződött be.</translation>
     </message>
     <message>
         <location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="298"/>
         <source>Command &lt;i&gt;%1&lt;/i&gt; finished with exit code %2.</source>
-        <translation type="unfinished"/>
+        <translation>A(z) &lt;i&gt;%1&lt;/i&gt; parancs hibakóddal lépett ki: %2.</translation>
     </message>
 </context>
 <context>
@@ -2031,17 +2034,17 @@ Output:
         <location filename="../src/modules/partition/jobs/RemoveVolumeGroupJob.cpp" line="34"/>
         <location filename="../src/modules/partition/jobs/RemoveVolumeGroupJob.cpp" line="48"/>
         <source>Remove Volume Group named %1.</source>
-        <translation type="unfinished"/>
+        <translation>A kötetcsoport eltávolítása: %1.</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/jobs/RemoveVolumeGroupJob.cpp" line="41"/>
         <source>Remove Volume Group named &lt;strong&gt;%1&lt;/strong&gt;.</source>
-        <translation type="unfinished"/>
+        <translation>Kötetcsoport eltávolítása: &lt;strong&gt;%1&lt;/strong&gt;.</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/jobs/RemoveVolumeGroupJob.cpp" line="61"/>
         <source>The installer failed to remove a volume group named &apos;%1&apos;.</source>
-        <translation type="unfinished"/>
+        <translation>A telepítő nem tudta eltávolítani a kötetcsoportot: „%1”.</translation>
     </message>
 </context>
 <context>
@@ -2182,29 +2185,29 @@ Output:
     <message>
         <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="130"/>
         <source>Resize Filesystem Job</source>
-        <translation type="unfinished"/>
+        <translation>Fájlrendszer átméretezési feladat</translation>
     </message>
     <message>
         <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="238"/>
         <source>Invalid configuration</source>
-        <translation type="unfinished"/>
+        <translation>Érvénytelen konfiguráció</translation>
     </message>
     <message>
         <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="239"/>
         <source>The file-system resize job has an invalid configuration and will not run.</source>
-        <translation type="unfinished"/>
+        <translation>A fájlrendszer átméretezési feladat konfigurációja érvénytelen, és nem fog futni.</translation>
     </message>
     <message>
         <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="253"/>
         <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="263"/>
         <source>KPMCore not Available</source>
-        <translation type="unfinished"/>
+        <translation>A KPMCore nem érhető el</translation>
     </message>
     <message>
         <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="254"/>
         <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="264"/>
         <source>Calamares cannot start KPMCore for the file-system resize job.</source>
-        <translation type="unfinished"/>
+        <translation>A Calamares nem tudja elindítani a KPMCore-t a fájlrendszer átméretezési feladathoz.</translation>
     </message>
     <message>
         <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="272"/>
@@ -2213,39 +2216,39 @@ Output:
         <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="303"/>
         <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="320"/>
         <source>Resize Failed</source>
-        <translation type="unfinished"/>
+        <translation>Az átméretezés meghiúsult</translation>
     </message>
     <message>
         <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="273"/>
         <source>The filesystem %1 could not be found in this system, and cannot be resized.</source>
-        <translation type="unfinished"/>
+        <translation>A(z) %1 fájlrendszer nem található a rendszeren, és nem méretezhető át.</translation>
     </message>
     <message>
         <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="274"/>
         <source>The device %1 could not be found in this system, and cannot be resized.</source>
-        <translation type="unfinished"/>
+        <translation>A(z) %1 eszköz nem található a rendszeren, és nem méretezhető át.</translation>
     </message>
     <message>
         <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="282"/>
         <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="295"/>
         <source>The filesystem %1 cannot be resized.</source>
-        <translation type="unfinished"/>
+        <translation>A(z) %1 fájlrendszer nem méretezhető át.</translation>
     </message>
     <message>
         <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="283"/>
         <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="296"/>
         <source>The device %1 cannot be resized.</source>
-        <translation type="unfinished"/>
+        <translation>A(z) %1 eszköz nem méretezhető át.</translation>
     </message>
     <message>
         <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="304"/>
         <source>The filesystem %1 must be resized, but cannot.</source>
-        <translation type="unfinished"/>
+        <translation>A(z) %1 fájlrendszert át kell méretezni, de nem lehet.</translation>
     </message>
     <message>
         <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="305"/>
         <source>The device %1 must be resized, but cannot</source>
-        <translation type="unfinished"/>
+        <translation>A(z) %1 eszközt át kell méretezni, de nem lehet</translation>
     </message>
 </context>
 <context>
@@ -2277,17 +2280,17 @@ Output:
         <location filename="../src/modules/partition/jobs/ResizeVolumeGroupJob.cpp" line="37"/>
         <location filename="../src/modules/partition/jobs/ResizeVolumeGroupJob.cpp" line="55"/>
         <source>Resize volume group named %1 from %2 to %3.</source>
-        <translation type="unfinished"/>
+        <translation>A(z) %1 kötet átméretezése ekkoráról: %2, ekkorára: %3.</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/jobs/ResizeVolumeGroupJob.cpp" line="46"/>
         <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"/>
+        <translation>A(z) &lt;strong&gt;%1&lt;/strong&gt; kötet átméretezése ekkoráról: &lt;strong&gt;%2&lt;/strong&gt;, ekkorára: &lt;strong&gt;%3&lt;/strong&gt;.</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/jobs/ResizeVolumeGroupJob.cpp" line="70"/>
         <source>The installer failed to resize a volume group named &apos;%1&apos;.</source>
-        <translation type="unfinished"/>
+        <translation>A telepítő nem tudta átméretezni a kötetcsoportot: „%1”.</translation>
     </message>
 </context>
 <context>
@@ -2532,7 +2535,7 @@ Output:
     <message>
         <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="51"/>
         <source>Shell Processes Job</source>
-        <translation type="unfinished"/>
+        <translation>Parancssori folyamatok feladat</translation>
     </message>
 </context>
 <context>
@@ -2541,7 +2544,7 @@ Output:
         <location filename="../src/qml/calamares/slideshow/SlideCounter.qml" line="36"/>
         <source>%L1 / %L2</source>
         <extracomment>slide counter, %1 of %2 (numeric)</extracomment>
-        <translation type="unfinished"/>
+        <translation>%L1 / %L2</translation>
     </message>
 </context>
 <context>
@@ -2725,27 +2728,27 @@ Calamares hiba %1.</translation>
     <message>
         <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="14"/>
         <source>VolumeGroupDialog</source>
-        <translation type="unfinished"/>
+        <translation>Kötetcsoport párbeszédablak</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="20"/>
         <source>List of Physical Volumes</source>
-        <translation type="unfinished"/>
+        <translation>Fizikai kötetek listája</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="30"/>
         <source>Volume Group Name:</source>
-        <translation type="unfinished"/>
+        <translation>Kötetcsoport neve:</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="43"/>
         <source>Volume Group Type:</source>
-        <translation type="unfinished"/>
+        <translation>Kötetcsoport típusa:</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="56"/>
         <source>Physical Extent Size:</source>
-        <translation type="unfinished"/>
+        <translation>Fizikai kiterjedés mérete:</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="66"/>
@@ -2755,7 +2758,7 @@ Calamares hiba %1.</translation>
     <message>
         <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="82"/>
         <source>Total Size:</source>
-        <translation type="unfinished"/>
+        <translation>Teljes méret:</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="92"/>
@@ -2763,22 +2766,22 @@ Calamares hiba %1.</translation>
         <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="132"/>
         <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="152"/>
         <source>---</source>
-        <translation type="unfinished"/>
+        <translation>---</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="102"/>
         <source>Used Size:</source>
-        <translation type="unfinished"/>
+        <translation>Használt méret:</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="122"/>
         <source>Total Sectors:</source>
-        <translation type="unfinished"/>
+        <translation>Szektorok összesen:</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="142"/>
         <source>Quantity of LVs:</source>
-        <translation type="unfinished"/>
+        <translation>Logkai kötetek száma:</translation>
     </message>
 </context>
 <context>
@@ -2831,7 +2834,7 @@ Calamares hiba %1.</translation>
     <message>
         <location filename="../src/modules/welcome/WelcomePage.cpp" line="75"/>
         <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;Copyright 2014-2017 Teo Mrnjavac &amp;lt;teo@kde.org&amp;gt;&lt;br/&gt;Copyright 2017 Adriaan de Groot &amp;lt;groot@kde.org&amp;gt;&lt;br/&gt;Thanks to: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg and the &lt;a href=&quot;https://www.transifex.com/calamares/calamares/&quot;&gt;Calamares translators team&lt;/a&gt;.&lt;br/&gt;&lt;br/&gt;&lt;a href=&quot;https://calamares.io/&quot;&gt;Calamares&lt;/a&gt; development is sponsored by &lt;br/&gt;&lt;a href=&quot;http://www.blue-systems.com/&quot;&gt;Blue Systems&lt;/a&gt; - Liberating Software.</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;Copyright 2014-2017 Teo Mrnjavac &amp;lt;teo@kde.org&amp;gt;&lt;br/&gt;Copyright 2017 Adriaan de Groot &amp;lt;groot@kde.org&amp;gt;&lt;br/&gt;Köszönet: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Lisa Vitolo, Philip Müller, Pier Luigi Fiorini, Rohan Garg és a &lt;a href=&quot;https://www.transifex.com/calamares/calamares/&quot;&gt;Calamares fordítócsapat&lt;/a&gt;.&lt;br/&gt;&lt;br/&gt;A &lt;a href=&quot;https://calamares.io/&quot;&gt;Calamares&lt;/a&gt; fejlesztését a &lt;br/&gt;&lt;a href=&quot;http://www.blue-systems.com/&quot;&gt;Blue Systems&lt;/a&gt; támogatja.</translation>
     </message>
     <message>
         <location filename="../src/modules/welcome/WelcomePage.cpp" line="290"/>
diff --git a/lang/calamares_ja.ts b/lang/calamares_ja.ts
index 673f3e4bb..1fb982825 100644
--- a/lang/calamares_ja.ts
+++ b/lang/calamares_ja.ts
@@ -14,7 +14,7 @@
     <message>
         <location filename="../src/modules/partition/gui/BootInfoWidget.cpp" line="91"/>
         <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>このシステムは &lt;strong&gt;BIOS&lt;/strong&gt; ブート環境で起動しました。&lt;br&gt;&lt;br&gt; BIOS環境からの起動について設定するためには、パーティションの開始位置あるいはパーティションテーブルの開始位置の近く(推奨)にある&lt;strong&gt;マスターブートレコード&lt;/strong&gt;に &lt;strong&gt;GRUB&lt;/strong&gt; のようなブートローダーをインストールしなければなりません。手動によるパーティショニングを選択する場合はユーザー自身で設定しなければなりません。そうでない場合は、この操作は自動的に行われます。</translation>
+        <translation>このシステムは &lt;strong&gt;BIOS&lt;/strong&gt; ブート環境で起動しました。&lt;br&gt;&lt;br&gt; BIOS環境からの起動について設定するためには、パーティションの開始位置あるいはパーティションテーブルの開始位置の近く (推奨) にある&lt;strong&gt;マスターブートレコード&lt;/strong&gt;に &lt;strong&gt;GRUB&lt;/strong&gt; のようなブートローダーをインストールしなければなりません。手動によるパーティショニングを選択する場合はユーザー自身で設定しなければなりません。そうでない場合は、この操作は自動的に行われます。</translation>
     </message>
 </context>
 <context>
@@ -169,19 +169,19 @@
     <message>
         <location filename="../src/libcalamaresui/ViewManager.cpp" line="74"/>
         <source>&amp;Back</source>
-        <translation>戻る（&amp;B）</translation>
+        <translation>戻る (&amp;B)</translation>
     </message>
     <message>
         <location filename="../src/libcalamaresui/ViewManager.cpp" line="75"/>
         <location filename="../src/libcalamaresui/ViewManager.cpp" line="279"/>
         <source>&amp;Next</source>
-        <translation>次へ（&amp;N）</translation>
+        <translation>次へ (&amp;N)</translation>
     </message>
     <message>
         <location filename="../src/libcalamaresui/ViewManager.cpp" line="76"/>
         <location filename="../src/libcalamaresui/ViewManager.cpp" line="288"/>
         <source>&amp;Cancel</source>
-        <translation>中止（&amp;C）</translation>
+        <translation>中止 (&amp;C)</translation>
     </message>
     <message>
         <location filename="../src/libcalamaresui/ViewManager.cpp" line="77"/>
@@ -197,7 +197,7 @@
     <message>
         <location filename="../src/libcalamaresui/ViewManager.cpp" line="180"/>
         <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>%1 はインストールできません。Calamares は全てのモジュールをロードすることをできませんでした。これは、Calamares のこのディストリビューションでの使用法による問題です。</translation>
+        <translation>%1 はインストールできません。Calamares はすべてのモジュールをロードすることをできませんでした。これは、Calamares のこのディストリビューションでの使用法による問題です。</translation>
     </message>
     <message>
         <location filename="../src/libcalamaresui/ViewManager.cpp" line="185"/>
@@ -207,7 +207,7 @@
     <message>
         <location filename="../src/libcalamaresui/ViewManager.cpp" line="277"/>
         <source>&amp;Install</source>
-        <translation>インストール（&amp;I）</translation>
+        <translation>インストール (&amp;I)</translation>
     </message>
     <message>
         <location filename="../src/libcalamaresui/ViewManager.cpp" line="325"/>
@@ -224,17 +224,17 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/libcalamaresui/ViewManager.cpp" line="331"/>
         <source>&amp;Yes</source>
-        <translation>はい（&amp;Y）</translation>
+        <translation>はい (&amp;Y)</translation>
     </message>
     <message>
         <location filename="../src/libcalamaresui/ViewManager.cpp" line="332"/>
         <source>&amp;No</source>
-        <translation>いいえ（&amp;N）</translation>
+        <translation>いいえ (&amp;N)</translation>
     </message>
     <message>
         <location filename="../src/libcalamaresui/ViewManager.cpp" line="163"/>
         <source>&amp;Close</source>
-        <translation>閉じる（&amp;C）</translation>
+        <translation>閉じる (&amp;C)</translation>
     </message>
     <message>
         <location filename="../src/libcalamaresui/ViewManager.cpp" line="237"/>
@@ -249,17 +249,17 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/libcalamaresui/ViewManager.cpp" line="243"/>
         <source>&amp;Install now</source>
-        <translation>今すぐインストール（&amp;I）</translation>
+        <translation>今すぐインストール (&amp;I)</translation>
     </message>
     <message>
         <location filename="../src/libcalamaresui/ViewManager.cpp" line="244"/>
         <source>Go &amp;back</source>
-        <translation>戻る（&amp;B）</translation>
+        <translation>戻る (&amp;B)</translation>
     </message>
     <message>
         <location filename="../src/libcalamaresui/ViewManager.cpp" line="283"/>
         <source>&amp;Done</source>
-        <translation>実行（&amp;D）</translation>
+        <translation>実行 (&amp;D)</translation>
     </message>
     <message>
         <location filename="../src/libcalamaresui/ViewManager.cpp" line="284"/>
@@ -371,7 +371,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="129"/>
         <source>Select storage de&amp;vice:</source>
-        <translation>ストレージデバイスを選択（&amp;V）:</translation>
+        <translation>ストレージデバイスを選択 (&amp;V):</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="130"/>
@@ -539,22 +539,22 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="55"/>
         <source>Partition &amp;Type:</source>
-        <translation>パーティションの種類（&amp;T）:</translation>
+        <translation>パーティションの種類 (&amp;T):</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="67"/>
         <source>&amp;Primary</source>
-        <translation>プライマリ（&amp;P）</translation>
+        <translation>プライマリ (&amp;P)</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="77"/>
         <source>E&amp;xtended</source>
-        <translation>拡張（&amp;x）</translation>
+        <translation>拡張 (&amp;X)</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="119"/>
         <source>Fi&amp;le System:</source>
-        <translation>ファイルシステム （&amp;L）:</translation>
+        <translation>ファイルシステム (&amp;L):</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="151"/>
@@ -569,17 +569,17 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="161"/>
         <source>&amp;Mount Point:</source>
-        <translation>マウントポイント（&amp;M）</translation>
+        <translation>マウントポイント (&amp;M)</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="38"/>
         <source>Si&amp;ze:</source>
-        <translation>サイズ（&amp;Z）</translation>
+        <translation>サイズ (&amp;Z)</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/CreatePartitionDialog.cpp" line="72"/>
         <source>En&amp;crypt</source>
-        <translation>暗号化（&amp;C）</translation>
+        <translation>暗号化 (&amp;C)</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/CreatePartitionDialog.cpp" line="151"/>
@@ -650,7 +650,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/modules/partition/gui/CreatePartitionTableDialog.ui" line="82"/>
         <source>GUID Partition Table (GPT)</source>
-        <translation>GUID パーティションテーブル(GPT)</translation>
+        <translation>GUID パーティションテーブル (GPT)</translation>
     </message>
 </context>
 <context>
@@ -784,7 +784,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/modules/partition/gui/DeviceInfoWidget.cpp" line="150"/>
         <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>選択したストレージデバイスにおける&lt;strong&gt; パーティションテーブル &lt;/strong&gt; の種類。 &lt;br&gt;&lt;br&gt; パーティションテーブルの種類を変更する唯一の方法は、パーティションテーブルを消去し、最初から再作成を行うことですが、この操作はストレージ上の全てのデータを破壊します。 &lt;br&gt; このインストーラーは、他の種類へ明示的に変更ししない限り、現在のパーティションテーブルが保持されます。よくわからない場合、最近のシステムではGPTが推奨されます。</translation>
+        <translation>選択したストレージデバイスにおける&lt;strong&gt; パーティションテーブル &lt;/strong&gt; の種類。 &lt;br&gt;&lt;br&gt; パーティションテーブルの種類を変更する唯一の方法は、パーティションテーブルを消去し、最初から再作成を行うことですが、この操作はストレージ上のすべてのデータを破壊します。 &lt;br&gt; このインストーラーは、他の種類へ明示的に変更ししない限り、現在のパーティションテーブルが保持されます。よくわからない場合、最近のシステムではGPTが推奨されます。</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/DeviceInfoWidget.cpp" line="107"/>
@@ -866,7 +866,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="60"/>
         <source>&amp;Keep</source>
-        <translation>保持（&amp;K）</translation>
+        <translation>保持 (&amp;K)</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="70"/>
@@ -881,12 +881,12 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="99"/>
         <source>&amp;Mount Point:</source>
-        <translation>マウントポイント（&amp;M）</translation>
+        <translation>マウントポイント (&amp;M)</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="119"/>
         <source>Si&amp;ze:</source>
-        <translation>サイズ（&amp;Z）:</translation>
+        <translation>サイズ (&amp;Z):</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="129"/>
@@ -896,7 +896,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="136"/>
         <source>Fi&amp;le System:</source>
-        <translation>ファイルシステム（&amp;L）</translation>
+        <translation>ファイルシステム (&amp;L)</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="149"/>
@@ -919,7 +919,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/modules/partition/gui/EncryptWidget.ui" line="32"/>
         <source>En&amp;crypt system</source>
-        <translation>システムを暗号化（&amp;C）</translation>
+        <translation>システムを暗号化 (&amp;C)</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/EncryptWidget.ui" line="42"/>
@@ -990,7 +990,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/modules/finished/FinishedPage.ui" line="98"/>
         <source>&amp;Restart now</source>
-        <translation>今すぐ再起動（&amp;R）</translation>
+        <translation>今すぐ再起動 (&amp;R)</translation>
     </message>
     <message>
         <location filename="../src/modules/finished/FinishedPage.cpp" line="51"/>
@@ -1107,12 +1107,12 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="66"/>
         <source>&amp;Cancel</source>
-        <translation>中止（&amp;C）</translation>
+        <translation>中止 (&amp;C)</translation>
     </message>
     <message>
         <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="67"/>
         <source>&amp;OK</source>
-        <translation>了解（&amp;O）</translation>
+        <translation>了解 (&amp;O)</translation>
     </message>
 </context>
 <context>
@@ -1219,7 +1219,7 @@ The installer will quit and all changes will be lost.</source>
         <location filename="../src/modules/locale/LocalePage.cpp" line="220"/>
         <location filename="../src/modules/locale/LocalePage.cpp" line="221"/>
         <source>&amp;Change...</source>
-        <translation>変更（&amp;C）...</translation>
+        <translation>変更 (&amp;C)...</translation>
     </message>
     <message>
         <location filename="../src/modules/locale/LocalePage.cpp" line="398"/>
@@ -1696,7 +1696,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/modules/partition/gui/PartitionPage.ui" line="22"/>
         <source>Storage de&amp;vice:</source>
-        <translation>ストレージデバイス （&amp;V）:</translation>
+        <translation>ストレージデバイス (&amp;V):</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/PartitionPage.ui" line="51"/>
@@ -1706,22 +1706,22 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/modules/partition/gui/PartitionPage.ui" line="87"/>
         <source>New Partition &amp;Table</source>
-        <translation>新しいパーティションテーブル（&amp;T）</translation>
+        <translation>新しいパーティションテーブル (&amp;T)</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/PartitionPage.ui" line="107"/>
         <source>Cre&amp;ate</source>
-        <translation>作成（&amp;a）</translation>
+        <translation>作成 (&amp;A)</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/PartitionPage.ui" line="114"/>
         <source>&amp;Edit</source>
-        <translation>編集（&amp;E）</translation>
+        <translation>編集 (&amp;E)</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/PartitionPage.ui" line="121"/>
         <source>&amp;Delete</source>
-        <translation>削除（&amp;D）</translation>
+        <translation>削除 (&amp;D)</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/PartitionPage.ui" line="132"/>
@@ -1859,7 +1859,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="451"/>
         <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>ブートパーティションは暗号化されたルートパーティションとともにセットアップされましたが、ブートパーティションは暗号化されていません。&lt;br/&gt;&lt;br/&gt;重要なシステムファイルが暗号化されていないパーティションに残されているため、このようなセットアップは安全上の懸念があります。&lt;br/&gt;セットアップを続行することはできますが、後でシステムの起動中にファイルシステムが解除されるおそれがあります。&lt;br/&gt;ブートパーティションを暗号化させるには、前の画面に戻って、再度パーティションを作成し、パーティション作成ウィンドウ内で&lt;strong&gt;Encrypt&lt;/strong&gt;（暗号化）を選択してください。</translation>
+        <translation>ブートパーティションは暗号化されたルートパーティションとともにセットアップされましたが、ブートパーティションは暗号化されていません。&lt;br/&gt;&lt;br/&gt;重要なシステムファイルが暗号化されていないパーティションに残されているため、このようなセットアップは安全上の懸念があります。&lt;br/&gt;セットアップを続行することはできますが、後でシステムの起動中にファイルシステムが解除されるおそれがあります。&lt;br/&gt;ブートパーティションを暗号化させるには、前の画面に戻って、再度パーティションを作成し、パーティション作成ウィンドウ内で&lt;strong&gt;Encrypt&lt;/strong&gt; (暗号化) を選択してください。</translation>
     </message>
 </context>
 <context>
@@ -1917,7 +1917,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="177"/>
         <source>Not all of the configured files could be preserved.</source>
-        <translation>設定ファイルは全て保護されるわけではありません。</translation>
+        <translation>設定ファイルはすべて保護されるわけではありません。</translation>
     </message>
 </context>
 <context>
@@ -2654,7 +2654,7 @@ Output:
     <message>
         <location filename="../src/modules/tracking/TrackingPage.cpp" line="44"/>
         <source>Install tracking helps %1 to see how many users they have, what hardware they install %1 to and (with the last two options below), get continuous information about preferred applications. To see what will be sent, please click the help icon next to each area.</source>
-        <translation>インストールトラッキングは %1 にとって、どれだけのユーザーが どのハードに %1 をインストールするのか(下記の2つのオプション)、どのようなアプリケーションが好まれているのかについての情報を把握することの補助を行っています。 どのような情報が送信されているのか確認したい場合は、以下の各エリアのヘルプのアイコンをクリックして下さい。</translation>
+        <translation>インストールトラッキングは %1 にとって、どれだけのユーザーが どのハードに %1 をインストールするのか (下記の2つのオプション)、どのようなアプリケーションが好まれているのかについての情報を把握することの補助を行っています。 どのような情報が送信されているのか確認したい場合は、以下の各エリアのヘルプのアイコンをクリックして下さい。</translation>
     </message>
     <message>
         <location filename="../src/modules/tracking/TrackingPage.cpp" line="45"/>
@@ -2757,7 +2757,7 @@ Output:
     <message>
         <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="82"/>
         <source>Total Size:</source>
-        <translation>全てのサイズ:</translation>
+        <translation>すべてのサイズ:</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="92"/>
@@ -2775,7 +2775,7 @@ Output:
     <message>
         <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="122"/>
         <source>Total Sectors:</source>
-        <translation>全てのセクター:</translation>
+        <translation>すべてのセクター:</translation>
     </message>
     <message>
         <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="142"/>
@@ -2793,17 +2793,17 @@ Output:
     <message>
         <location filename="../src/modules/welcome/WelcomePage.ui" line="75"/>
         <source>&amp;Language:</source>
-        <translation>言語（&amp;L）:</translation>
+        <translation>言語 (&amp;L):</translation>
     </message>
     <message>
         <location filename="../src/modules/welcome/WelcomePage.ui" line="176"/>
         <source>&amp;Release notes</source>
-        <translation>リリースノート（&amp;R）</translation>
+        <translation>リリースノート (&amp;R)</translation>
     </message>
     <message>
         <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
         <source>&amp;Known issues</source>
-        <translation>既知の問題（&amp;K）</translation>
+        <translation>既知の問題 (&amp;K)</translation>
     </message>
     <message>
         <location filename="../src/modules/welcome/WelcomePage.ui" line="156"/>
@@ -2813,7 +2813,7 @@ Output:
     <message>
         <location filename="../src/modules/welcome/WelcomePage.ui" line="146"/>
         <source>&amp;About</source>
-        <translation>説明（&amp;A）</translation>
+        <translation>説明 (&amp;A)</translation>
     </message>
     <message>
         <location filename="../src/modules/welcome/WelcomePage.cpp" line="60"/>
diff --git a/lang/calamares_mk.ts b/lang/calamares_mk.ts
index a1b95a0da..b6002eb4a 100644
--- a/lang/calamares_mk.ts
+++ b/lang/calamares_mk.ts
@@ -50,7 +50,7 @@
     <message>
         <location filename="../src/libcalamaresui/viewpages/BlankViewStep.cpp" line="69"/>
         <source>Blank Page</source>
-        <translation type="unfinished"/>
+        <translation>Празна Страна</translation>
     </message>
 </context>
 <context>
@@ -94,7 +94,7 @@
     <message>
         <location filename="../src/libcalamaresui/utils/DebugWindow.ui" line="93"/>
         <source>Tools</source>
-        <translation type="unfinished"/>
+        <translation>Алатки</translation>
     </message>
     <message>
         <location filename="../src/libcalamaresui/utils/DebugWindow.cpp" line="182"/>
@@ -107,7 +107,7 @@
     <message>
         <location filename="../src/libcalamaresui/ExecutionViewStep.cpp" line="79"/>
         <source>Install</source>
-        <translation type="unfinished"/>
+        <translation>Инсталирај</translation>
     </message>
 </context>
 <context>
@@ -115,7 +115,7 @@
     <message>
         <location filename="../src/libcalamares/JobQueue.cpp" line="101"/>
         <source>Done</source>
-        <translation type="unfinished"/>
+        <translation>Готово</translation>
     </message>
 </context>
 <context>
@@ -263,12 +263,12 @@ The installer will quit and all changes will be lost.</source>
     <message>
         <location filename="../src/libcalamaresui/ViewManager.cpp" line="284"/>
         <source>The installation is complete. Close the installer.</source>
-        <translation type="unfinished"/>
+        <translation>Инсталацијата е готова. Исклучете го инсталерот.</translation>
     </message>
     <message>
         <location filename="../src/libcalamaresui/ViewManager.cpp" line="160"/>
         <source>Error</source>
-        <translation type="unfinished"/>
+        <translation>Грешка</translation>
     </message>
     <message>
         <location filename="../src/libcalamaresui/ViewManager.cpp" line="161"/>

From 491202d75fff8a7ce6d9ae5ee9bedfbcf9f083a2 Mon Sep 17 00:00:00 2001
From: Calamares CI <groot@kde.org>
Date: Thu, 3 Jan 2019 15:06:54 +0100
Subject: [PATCH 51/74] i18n: [desktop] Automatic merge of Transifex
 translations

---
 calamares.desktop | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/calamares.desktop b/calamares.desktop
index c29b9b345..79180c475 100644
--- a/calamares.desktop
+++ b/calamares.desktop
@@ -13,7 +13,10 @@ StartupNotify=true
 Categories=Qt;System;
 X-AppStream-Ignore=true
 
-Name[ar]=نظام التثبيت
+Name[ar]=تثبيت النظام 
+Icon[ar]=كالامارس
+GenericName[ar]=مثبت النظام
+Comment[ar]=كالامارس - مثبت النظام
 Name[be]=Усталяваць сістэму
 Icon[be]=calamares
 GenericName[be]=Усталёўшчык сістэмы
@@ -51,6 +54,9 @@ Icon[et]=calamares
 GenericName[et]=Süsteemipaigaldaja
 Comment[et]=Calamares — süsteemipaigaldaja
 Name[eu]=Sistema instalatu
+Icon[eu]=calamares
+GenericName[eu]=Sistema instalatzailea
+Comment[eu]=Calamares - sistema instalatzailea
 Name[es_PR]=Instalar el sistema
 Name[fr]=Installer le système
 Icon[fr]=calamares

From e572784eb51ac99ea3f1ecc857626ee8da0fd08a Mon Sep 17 00:00:00 2001
From: Calamares CI <groot@kde.org>
Date: Thu, 3 Jan 2019 15:06:55 +0100
Subject: [PATCH 52/74] i18n: [dummypythonqt] Automatic merge of Transifex
 translations

---
 .../lang/ar/LC_MESSAGES/dummypythonqt.mo       | Bin 503 -> 1074 bytes
 .../lang/ar/LC_MESSAGES/dummypythonqt.po       |  16 ++++++++++------
 .../lang/eu/LC_MESSAGES/dummypythonqt.mo       | Bin 420 -> 926 bytes
 .../lang/eu/LC_MESSAGES/dummypythonqt.po       |  16 ++++++++++------
 4 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/src/modules/dummypythonqt/lang/ar/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/ar/LC_MESSAGES/dummypythonqt.mo
index b4977573454d2d0fc3f8f2dc0d430d30022ac6a0..9ccb135d00458ca953d3e9fab7a7970b5e3745e5 100644
GIT binary patch
delta 641
zcma)&O)ErE7{?#RYZ6(oKs~dgxOpidWMU-?GAS$0<r>4>xten)P12M`CMj9?3>tY?
z-qy-D&^a5Q!9pnu`5zi23#aot|L65Q_nw!)d0G0grf83_N<jk%g9@+>%(@1Z;082-
zdr%IZKpl7mwV<Yes0-Q*eFHO~3jTC}s0ZpntD!k)J@gjZNR*}r82t!5L(%iG3UR`v
zqEGkhEP-V{wAe&K9CucDd{o#@%z`I<;U^`#j+7$e@VuAc;iT)Pcr4{Fc=2(cM?Bl2
zp;&Zw2~|NdS@9!18Ff}Bd}o=$3(g;{2uCGj`+ue_Hf?hs6Bj+3rAWzMUR~Sm-Wia7
zYd9g|GA4X4(aRw_X^SP15D_nF^Az{x11Uu8!H6rOF>BUy2U@tJt-br~uCpNh`Jb!~
z)rsCxC#25Qh1%B{m1A{e486%nZRjmy+`!174#{J6rL!>duRv;FU8-AkWvWmUr0=%h
iwfvO}|GYDQ6_egnr)J2123xGNtPb?L&gzVL8F~jO3*Mjr

delta 70
zcmdnQ@txV?o)F7a1|VPrVi_P-0b*t#)&XJ=umIw{KuJp=4N?OGlj9ltH|sMQFaiK9
C^9QW}

diff --git a/src/modules/dummypythonqt/lang/ar/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/ar/LC_MESSAGES/dummypythonqt.po
index 950eb4583..91d430930 100644
--- a/src/modules/dummypythonqt/lang/ar/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/ar/LC_MESSAGES/dummypythonqt.po
@@ -3,6 +3,9 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
+# Translators:
+# Abubakaragoub Y <Abubakaryagob@gmail.com>, 2018
+# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -10,6 +13,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-10-05 11:34-0400\n"
 "PO-Revision-Date: 2016-12-16 12:18+0000\n"
+"Last-Translator: Abubakaragoub Y <Abubakaryagob@gmail.com>, 2018\n"
 "Language-Team: Arabic (https://www.transifex.com/calamares/teams/20061/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,24 +23,24 @@ msgstr ""
 
 #: src/modules/dummypythonqt/main.py:84
 msgid "Click me!"
-msgstr ""
+msgstr "اضغط علي!"
 
 #: src/modules/dummypythonqt/main.py:94
 msgid "A new QLabel."
-msgstr ""
+msgstr "QLabel جديد"
 
 #: src/modules/dummypythonqt/main.py:97
 msgid "Dummy PythonQt ViewStep"
-msgstr ""
+msgstr "دميه خطوة PythonQt "
 
 #: src/modules/dummypythonqt/main.py:183
 msgid "The Dummy PythonQt Job"
-msgstr ""
+msgstr "دميه عملية PythonQt "
 
 #: src/modules/dummypythonqt/main.py:186
 msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
-msgstr ""
+msgstr "هذة دميه عملية خطوة PythonQt. و تقول: {}"
 
 #: src/modules/dummypythonqt/main.py:190
 msgid "A status message for Dummy PythonQt Job."
-msgstr ""
+msgstr "رسالة حاله دميه عملية خطوة PythonQt"
diff --git a/src/modules/dummypythonqt/lang/eu/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/eu/LC_MESSAGES/dummypythonqt.mo
index 60bb83584c40a54105844f09ede4cdc6f7ff3318..d508e3fac6202393e92ad0a6f5f8fdef41766f3e 100644
GIT binary patch
delta 575
zcmZvX!Ab)$5QbA*Eh2g-q8E`7iYVAcMMZlnS`hJIY4L38#y0MDQ<5yD73m8I(t}q|
zK7`%{-$Hx@@#x7vTah9i_S-)*lRwEkr605X_gv<IA+lfz)W8h511_GyEO-HH;0;WJ
zPp}BS!2-yo7~6xcLkHjj%pw1pU@Q+!rHALNLYI;6K<63jvnm$5C^Vt)BmoaY$}+?B
z?>~i=d+4OAlqeD%s+{t=2t8!RavK|J31fIe(3R436t`MkI_uh|iYk^)RNZ5Tp}Y*R
zYlXQkA8DUU(WzR|X0@gmV?|jS!e_^}J#scbx$#=n$?&cz(#`E)|2}VQp{99cLT;5V
zQYrF<rgEsXRgteYXnS+(VDS3U9}Yuxp|#{*^1zYzg*@U~L?jwYXpRwjF*cPO(&xRH
zf=~v-nMN#a9vfAVL2TNhAvya$mOGLi^O%xGVZ`Y=<a6)W;nIM5?p|LiHy8T>!V#3d

delta 69
zcmbQozJ%H0o)F7a1|VPrVi_P-0b*t#)&XJ=umIvLprj>`2C0F8$?=T+lSP^C0ssK8
B2V?*M

diff --git a/src/modules/dummypythonqt/lang/eu/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/eu/LC_MESSAGES/dummypythonqt.po
index 9ac8d08f0..a336c22a0 100644
--- a/src/modules/dummypythonqt/lang/eu/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/eu/LC_MESSAGES/dummypythonqt.po
@@ -3,6 +3,9 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
+# Translators:
+# Ander Elortondo, 2019
+# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -10,6 +13,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-10-05 11:34-0400\n"
 "PO-Revision-Date: 2016-12-16 12:18+0000\n"
+"Last-Translator: Ander Elortondo, 2019\n"
 "Language-Team: Basque (https://www.transifex.com/calamares/teams/20061/eu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,24 +23,24 @@ msgstr ""
 
 #: src/modules/dummypythonqt/main.py:84
 msgid "Click me!"
-msgstr ""
+msgstr "Egidazu klik!"
 
 #: src/modules/dummypythonqt/main.py:94
 msgid "A new QLabel."
-msgstr ""
+msgstr "QLabel berria."
 
 #: src/modules/dummypythonqt/main.py:97
 msgid "Dummy PythonQt ViewStep"
-msgstr ""
+msgstr "Dummy PythonQt pauso-ikuspegia"
 
 #: src/modules/dummypythonqt/main.py:183
 msgid "The Dummy PythonQt Job"
-msgstr ""
+msgstr " Dummy PythonQt lana"
 
 #: src/modules/dummypythonqt/main.py:186
 msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
-msgstr ""
+msgstr "Hau  Dummy PythonQt lana da. Dummy lanak zera dio: {}"
 
 #: src/modules/dummypythonqt/main.py:190
 msgid "A status message for Dummy PythonQt Job."
-msgstr ""
+msgstr "Dummy PythonQt lanaren egoera mezua."

From 934e58ad54e6997154f84eec93485f3b3b7df801 Mon Sep 17 00:00:00 2001
From: Calamares CI <groot@kde.org>
Date: Thu, 3 Jan 2019 15:06:56 +0100
Subject: [PATCH 53/74] i18n: [python] Automatic merge of Transifex
 translations

---
 lang/python/ar/LC_MESSAGES/python.mo | Bin 503 -> 2015 bytes
 lang/python/ar/LC_MESSAGES/python.po |  36 ++++++++++---------
 lang/python/eu/LC_MESSAGES/python.mo | Bin 420 -> 2779 bytes
 lang/python/eu/LC_MESSAGES/python.po |  50 ++++++++++++++++-----------
 lang/python/fr/LC_MESSAGES/python.mo | Bin 2528 -> 2719 bytes
 lang/python/fr/LC_MESSAGES/python.po |   7 ++--
 6 files changed, 53 insertions(+), 40 deletions(-)

diff --git a/lang/python/ar/LC_MESSAGES/python.mo b/lang/python/ar/LC_MESSAGES/python.mo
index 05f9dbc339376dc40bfca358295b1e0b8085e931..43e3ffa7ede4b969ea8d128f4d47fd557a828a70 100644
GIT binary patch
literal 2015
zcma)6TW=dh6ked*+;XRa2apbegqUXS-6SoEQx`&#R;EcCrEUaIXuKY8w)O5>yJM0l
z^r7Hf2v0ol1Gq>DX-kxf(xyLvS6*jd5aN{|z#HP5UEczPW~Ae9=A7?bXFb0@f8;9-
z>p93PknbQbLHZxU57s*HW#H$)*MZ*v-vIs$d=vOb^ZdfYNsM9Oi_pK{#E+VK0aX60
zK;^#;RQ|sJUj_aNJOMoZNMauY9>=)?{0ligX`YuK)wEvdzXU4(d%(AVzctTCAJa6#
zc@U@ri_P<=Ko##>U>|S~m<Ik1><1ouJn4S~IE3>YP}#p|;vFE$(4K*)brkY61ZBrd
z%}*_a)1HEW-d;~)_bdc0Xiq?nK#oDwN<mP%rj0Yt^95PHS8?omz-h{{=f%Wy%dikQ
zg46kl={AK4$M>k>RQZ0+)CY$lCD9)k?9x=>KQm6$U3ZCUOJW{1T=7d8ZJ#C-yhh8{
zv~%3!0Yl*~v*sO->rOeN6}(WeYL#lty2@-GX0%RQaX+;DT6m4hJ`YLFgfBXw(7M|C
zAJV?I4(46(Tk|D5;9T&4oTMs_0%ro>;$i4`cDqLE>*=%nx+l_Q%2H3C@X<oLoYuMq
zba1-Mo~wKlLb!zKxab;bu5e4}g|a@!gAliwqnWYs^JC{GX>M}%QsLr-)GV+0fzYQz
z+bQes)$LF(`Z-F?TrBG20gpcceF6i{(STtN>!zU_C&@H(gG0J8WEddov;1R61@G|Q
z){SA^7$MUD?}UMsnqr~Qivjb(DieN?qp?!G#ICY{*?zr5AJXZTVhNhkySB@mYR2;2
zGyQR91n}%SZc{IE=E6N-CC8$^c_C_HE}LCgSjY$!-l_0K<(IWsmANe7VOGE+%nlgF
zDKpE0Y&tbvn4av6#LO6}ao-c%LxoE<v?}<b$kwXN@kYs-XF<qC{&MlGKHTA{R23fR
zlb+?5agjM1E;*uIWsX>onyJ<UR@Kk?fg9$?tHsAKe`=JHZQjf04SI(Rf;FEvu{D$J
z0JZ~a+hZEWnfxI2_9pw&c~f}|c5J5EWgHoSaR|nfqbV)AE`N*~B!7}y@^0&MY-;5;
zMW4xSxe43%6s<&!=z5EZKTGBiH1&Tu6fgP99EPgC^^7L>;(9hv7^>ThHsp<HJz6EX
z1N}y{)=g+DN&X=3g0{Bb2Tz3DhPr_$JLpsH$z9dyX4H^3qc!w@8w7bnZh^3!=x@o}
z(Teu3nIw;fybt28n%Fu5tjnE$5aU-QeqJ8PY(6CiksHwpsiFX=@D8?H?Msw5QTcAP
vp)9xJso<VfPjT&CZ%MZ6CE4Fm{H`33I}UXpDZcJb(DFx~XjR?=X+`@Rg)GfV

delta 70
zcmcc5|DD<5o)F7a1|VPrVi_P-0b*t#)&XJ=umIw{KuJp=4N?OGldGBgH+!=fFaiKP
ChzK13

diff --git a/lang/python/ar/LC_MESSAGES/python.po b/lang/python/ar/LC_MESSAGES/python.po
index 9c1c7bda4..0250a0690 100644
--- a/lang/python/ar/LC_MESSAGES/python.po
+++ b/lang/python/ar/LC_MESSAGES/python.po
@@ -3,6 +3,9 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
+# Translators:
+# Abubakaragoub Y <Abubakaryagob@gmail.com>, 2018
+# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -10,6 +13,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-10-05 11:34-0400\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
+"Last-Translator: Abubakaragoub Y <Abubakaryagob@gmail.com>, 2018\n"
 "Language-Team: Arabic (https://www.transifex.com/calamares/teams/20061/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,43 +23,43 @@ msgstr ""
 
 #: src/modules/displaymanager/main.py:380
 msgid "Cannot write KDM configuration file"
-msgstr ""
+msgstr "فشلت كتابة ملف ضبط KDM."
 
 #: src/modules/displaymanager/main.py:381
 msgid "KDM config file {!s} does not exist"
-msgstr ""
+msgstr "ملف ضبط KDM {!s} غير موجود"
 
 #: src/modules/displaymanager/main.py:442
 msgid "Cannot write LXDM configuration file"
-msgstr ""
+msgstr "فشلت كتابة ملف ضبط LXDM."
 
 #: src/modules/displaymanager/main.py:443
 msgid "LXDM config file {!s} does not exist"
-msgstr ""
+msgstr "ملف ضبط LXDM {!s} غير موجود"
 
 #: src/modules/displaymanager/main.py:517
 msgid "Cannot write LightDM configuration file"
-msgstr ""
+msgstr "فشلت كتابة ملف ضبط LightDM."
 
 #: src/modules/displaymanager/main.py:518
 msgid "LightDM config file {!s} does not exist"
-msgstr ""
+msgstr "ملف ضبط LightDM {!s} غير موجود"
 
 #: src/modules/displaymanager/main.py:592
 msgid "Cannot configure LightDM"
-msgstr ""
+msgstr "فشل ضبط LightDM"
 
 #: src/modules/displaymanager/main.py:593
 msgid "No LightDM greeter installed."
-msgstr ""
+msgstr "لم يتم تصيب LightDM"
 
 #: src/modules/displaymanager/main.py:624
 msgid "Cannot write SLIM configuration file"
-msgstr ""
+msgstr "فشلت كتابة ملف ضبط SLIM."
 
 #: src/modules/displaymanager/main.py:625
 msgid "SLIM config file {!s} does not exist"
-msgstr ""
+msgstr "ملف ضبط SLIM {!s} غير موجود"
 
 #: src/modules/displaymanager/main.py:740
 #: src/modules/displaymanager/main.py:772
@@ -78,28 +82,28 @@ msgstr ""
 
 #: src/modules/umount/main.py:40
 msgid "Unmount file systems."
-msgstr ""
+msgstr "الغاء تحميل ملف النظام"
 
 #: src/modules/dummypython/main.py:44
 msgid "Dummy python job."
-msgstr ""
+msgstr "عملية بايثون دميه"
 
 #: src/modules/dummypython/main.py:97
 msgid "Dummy python step {}"
-msgstr ""
+msgstr "عملية  دميه خطوه بايثون {}"
 
 #: src/modules/machineid/main.py:35
 msgid "Generate machine-id."
-msgstr ""
+msgstr "توليد معرف الجهاز"
 
 #: src/modules/packages/main.py:62
 #, python-format
 msgid "Processing packages (%(count)d / %(total)d)"
-msgstr ""
+msgstr "جاري تحميل الحزم (%(count)d/%(total)d)"
 
 #: src/modules/packages/main.py:64 src/modules/packages/main.py:74
 msgid "Install packages."
-msgstr ""
+msgstr "تثبيت الحزم"
 
 #: src/modules/packages/main.py:67
 #, python-format
diff --git a/lang/python/eu/LC_MESSAGES/python.mo b/lang/python/eu/LC_MESSAGES/python.mo
index 5c9c13e0c17d39d499e7b5a78b8ceeded773e0c7..5abe8e5b2a8cee2b7d97b89df7a89a1c3e7eec6a 100644
GIT binary patch
literal 2779
zcma)-&u<$=6vqcB(7NSUC=`ibuPqf0?b_=kh15|b+Qf;XCT*0Y6+%d8>>b<F-JLNz
zvrX)(5`RDsAjFZs0CC`e#DRZ+I|sP*#^2Bb7rwLhI(Fi;8EO3S%)Wgy?>leaKAt-9
zBSSlf{vP^Y=pUj#dJaEmC!c5R9q<%*5xf9?1g?M|gW+KO19%1F-@!M)f5EfhlL61X
z(4RjK&S8EQbpG0)^Y;jJ{(c4D2mb*Vz$f5kaP|aaKKM20?7suQ0)GQP2d7?S>@9E`
z{2qIk;JX<A_Yz~DfahNB`?&#@Fjj-{PoRhKpWqbu1aw*yPBQj7cmZ_tv)~N40#?B8
zVEi+9730U?Meyt?##X_3(CP6l=+^%QbnpKSHo(&b#@0a%egOUf4kTx9V~nubE9kD_
z6?O*Q#pm{drH0LEoHuNpy^8)O`fKQrAZu{VPNPFAhU3T@WXa-mF}m|&OI#^!si9R<
zw$en<x@@)W@<#q(H<4D*&E<`u3Aa)!YRX8A+pK?a9HYMXXFA(nUz@n%vNWBDcPZwI
zw?uNl&n`D4RYS*}NLay^(>U%@r)%5T@I75Gjn5b>I`rTnTNO$q98t!+(UwYhGAOY%
zWh{>(>hMO0mCSHPsupP_@&{w{mx?Nlr-S?%UfLHfQ;Z&*HxDV$!jMy4>`7zUh;UCa
z8WZklyIVRxL24xeDkM-O3q>F*JPpPbG-O018de0<)Ct+P$Srb-V;!WCD6!2%H-s@R
z{#+C)UMe<psw`qI)1{)-&}=%GW?LfG_YWyGoIR}5$ax<f+s>iQ8H%7FNkby;*e)T0
zR0X1mQw$I{)wON6B3<W^u{yyy5?8^2081|SOUyYRcgCAey+&I!LKljYXDDUvBTqye
z^&J&EDf-(tU1V2`S*Ugo@_K85cUL3^SEovw*OzWyU#-#I+Sc~k?OTN{(b0+ZHcU$f
z-i@?nyd7Po!shKAZz&Pkee;%)pjDdjEAw8(_x!6=sZ?j@Jb%vjVd!m%`_ehzxBJZV
z=RN-#Reac8_R$LK+*ofX;mSlDa#ZO$v`VNJVRfwneZ~2|1~b)4p_R8IcwD6$+<cP?
zDz>fdm}<GaySrPm&WUV_J%|^V8$9AMPlPF3ykW{SzW-^ZEYk9HVPkEhwjX$<<QJB-
zvO-}W-3|h>V$YUwqorDa(mXN3F5cN$@#gpK+)_=Ecr{$?00&W}`MR{jT~<k?h0Q2U
zc;v0<BsNu2oor|pXBMdccd@AG{32DR7YeM_Lt+Gccum4V>EkvXK6BT0INy^Rhidn5
z0xii&2Hf`K&@{Wf$F&_?;$xa;m*N?=n_O8gBTiu&AXR$!FUGdcNgHibYVrDkiWs4W
z9w>=vf<kDxtBTu5iWKRM+~*?|5h~&OhbSyOWSiL^s&ibytjJ&kLY3Iye)sLhA3aUk
ztT>9EJDjXCO6RR#9*<Jth*zGW^W?W`Zspc~{X{w@_%ICjpF*w71_B%wJ&_^tG<07Q
zr%>O(8$Fe*kRne*jj}M1kUEL(36tqIQcXvTDUHe;;_6J0csTvkl$jiMo<XB~^?Cxa
zD;z{SwFZ%8!iWH$4_92>!GvN$brqK9m2vR-$f_&*a+13|Wl{@CCQ8Oba#yZrou;lr
ZVNWHtlHWx#DE<N|id~r)wHIb3_CIxkLy`ah

delta 69
zcmcaDx`f%{o)F7a1|VPrVi_P-0b*t#)&XJ=umIvLprj>`2C0F8$r-HuljYd%0ss|L
B2gv{c

diff --git a/lang/python/eu/LC_MESSAGES/python.po b/lang/python/eu/LC_MESSAGES/python.po
index 57a4e1b84..dc5751b86 100644
--- a/lang/python/eu/LC_MESSAGES/python.po
+++ b/lang/python/eu/LC_MESSAGES/python.po
@@ -3,6 +3,9 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
+# Translators:
+# Ander Elortondo, 2019
+# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -10,6 +13,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-10-05 11:34-0400\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,98 +23,102 @@ msgstr ""
 
 #: src/modules/displaymanager/main.py:380
 msgid "Cannot write KDM configuration file"
-msgstr ""
+msgstr "Ezin da KDM konfigurazio fitxategia idatzi"
 
 #: src/modules/displaymanager/main.py:381
 msgid "KDM config file {!s} does not exist"
-msgstr ""
+msgstr "KDM konfigurazio fitxategia {!s} ez da existitzen"
 
 #: src/modules/displaymanager/main.py:442
 msgid "Cannot write LXDM configuration file"
-msgstr ""
+msgstr "Ezin da LXDM konfigurazio fitxategia idatzi"
 
 #: src/modules/displaymanager/main.py:443
 msgid "LXDM config file {!s} does not exist"
-msgstr ""
+msgstr "LXDM konfigurazio fitxategia {!s} ez da existitzen"
 
 #: src/modules/displaymanager/main.py:517
 msgid "Cannot write LightDM configuration file"
-msgstr ""
+msgstr "Ezin da LightDM konfigurazio fitxategia idatzi"
 
 #: src/modules/displaymanager/main.py:518
 msgid "LightDM config file {!s} does not exist"
-msgstr ""
+msgstr "LightDM konfigurazio fitxategia {!s} ez da existitzen"
 
 #: src/modules/displaymanager/main.py:592
 msgid "Cannot configure LightDM"
-msgstr ""
+msgstr "Ezin da LightDM konfiguratu"
 
 #: src/modules/displaymanager/main.py:593
 msgid "No LightDM greeter installed."
-msgstr ""
+msgstr "Ez dago LightDM harrera instalatua."
 
 #: src/modules/displaymanager/main.py:624
 msgid "Cannot write SLIM configuration file"
-msgstr ""
+msgstr "Ezin da SLIM konfigurazio fitxategia idatzi"
 
 #: src/modules/displaymanager/main.py:625
 msgid "SLIM config file {!s} does not exist"
-msgstr ""
+msgstr "SLIM konfigurazio fitxategia {!s} ez da existitzen"
 
 #: src/modules/displaymanager/main.py:740
 #: src/modules/displaymanager/main.py:772
 msgid "No display managers selected for the displaymanager module."
 msgstr ""
+"Ez da pantaila kudeatzailerik aukeratu pantaila-kudeatzaile modulurako."
 
 #: src/modules/displaymanager/main.py:741
 msgid ""
 "The displaymanagers list is empty or undefined in bothglobalstorage and "
 "displaymanager.conf."
 msgstr ""
+"Pantaila-kudeatzaile-zerrenda hutsik dago edo definitzeke bothglobalstorage "
+"eta displaymanager.conf"
 
 #: src/modules/displaymanager/main.py:773
 msgid "The list is empty after checking for installed display managers."
 msgstr ""
+"Zerrenda hutsik dago instalatutako pantaila-kudeatzaileak egiaztatu ondoren."
 
 #: src/modules/displaymanager/main.py:821
 msgid "Display manager configuration was incomplete"
-msgstr ""
+msgstr "Pantaila kudeatzaile konfigurazioa osotu gabe"
 
 #: src/modules/umount/main.py:40
 msgid "Unmount file systems."
-msgstr ""
+msgstr "Fitxategi sistemak desmuntatu."
 
 #: src/modules/dummypython/main.py:44
 msgid "Dummy python job."
-msgstr ""
+msgstr "Dummy python lana."
 
 #: src/modules/dummypython/main.py:97
 msgid "Dummy python step {}"
-msgstr ""
+msgstr "Dummy python urratsa {}"
 
 #: src/modules/machineid/main.py:35
 msgid "Generate machine-id."
-msgstr ""
+msgstr "Sortu makina-id."
 
 #: src/modules/packages/main.py:62
 #, python-format
 msgid "Processing packages (%(count)d / %(total)d)"
-msgstr ""
+msgstr "Paketeak prozesatzen (%(count)d/ %(total)d) "
 
 #: src/modules/packages/main.py:64 src/modules/packages/main.py:74
 msgid "Install packages."
-msgstr ""
+msgstr "Instalatu paketeak"
 
 #: src/modules/packages/main.py:67
 #, python-format
 msgid "Installing one package."
 msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Pakete bat instalatzen."
+msgstr[1] "%(num)dpakete instalatzen."
 
 #: src/modules/packages/main.py:70
 #, python-format
 msgid "Removing one package."
 msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Pakete bat kentzen."
+msgstr[1] "%(num)dpakete kentzen."
diff --git a/lang/python/fr/LC_MESSAGES/python.mo b/lang/python/fr/LC_MESSAGES/python.mo
index b612733eab2cdd4655d4fc9c898f2381799155af..21eee76c0163f4ea9c0cae8a2ae43aba64ce30b1 100644
GIT binary patch
delta 633
zcmajbPbh<79KiA4yUm~ZZw%$no<%AD(oiyGv7}5nP!1f1P0QLVTT;?4E^bQ7Mbr+?
z+R0%zXOg>!i;D{vPQK6k&cVsAe(&e`Jw5O9=l9fb?#(`WTqi<!$u{zaY$uZjAL0pH
z@EJSt8@sT>A<~UgsOwGa!y~N60yg4Z(bwYq7Y;LD>9qFCN{E5pU>)_rhZw|5?8O%x
z#9EigGKMgOXQ(gzh&e9xiHiEP)IQ)EN2uR%6uZjodIcw_kI^exkp~9)g>UFbN4ZFo
z{sG4@i27wa*pE5X>+Ug%A2@)EZu_7EOi~wc9(yY6&h4Q=T}SeZG?21DR+73^zoB2{
zA?cLxD5)aZ%W5kK4Url>AlTCi?k+skirV~@VHz{D;W@Qtrs9bW6;C8%YR{kESL<dh
ztx{%2#dZ_vj6|0HUzGPb-Hztzq`94lrqrYwkK4o5p^-o!A1=9d7?I<P(pHZ?Fx72s
U98+7-wCHJH^`E(Xefgd71NN(2Bme*a

delta 490
zcmX}oze~eF6u|M9G-~{TKT<0W6(SWJ6ty;@sQ6>n!Ntv`;1XIIX$}5ZIytDbZt5o8
z9OCFuLDxd3qJy~m7q}F^*Bm~0`P{qX?sD%T^_{GKIo6F3Nit17lN02w!H1~hIKE;A
zKXD4%IE@)Iu6J;j`Upqx4oC4x`=;kV&}04wxu+^_LS&7J4V=MqT);;>z!q+yXNjaR
z#2S}hqpRk-;{*3`iTVmxu&(Q0+@zlGiT4Mn9&~||+%NYG#?%H}#a3rQ#IZ&4)E>^^
zEvkdxv50Nl!$NP|nHS{0WRPU3(*=-z(oq8)s?)<H4G>GUVt{0?43R2$@PG8_5&tAS
wB#x+Q1V(h3u+8*#ST3C%2j#q9D!A(>z8~feE2qV5F1xrK)w&vH)U+GMALZ9I_W%F@

diff --git a/lang/python/fr/LC_MESSAGES/python.po b/lang/python/fr/LC_MESSAGES/python.po
index f4d4ef26c..f51f485b0 100644
--- a/lang/python/fr/LC_MESSAGES/python.po
+++ b/lang/python/fr/LC_MESSAGES/python.po
@@ -9,6 +9,7 @@
 # Aestan <anthony.margerand@protonmail.com>, 2018
 # Jeremy Gourmel <jgourmel@free.fr>, 2018
 # Aurnytoraink <wiiu3dsxl13127@gmail.com>, 2018
+# Florian B <florianb3522@gmail.com>, 2018
 # 
 #, fuzzy
 msgid ""
@@ -17,7 +18,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-10-05 11:34-0400\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
-"Last-Translator: Aurnytoraink <wiiu3dsxl13127@gmail.com>, 2018\n"
+"Last-Translator: Florian B <florianb3522@gmail.com>, 2018\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"
@@ -31,7 +32,7 @@ msgstr "Impossible d'écrire le fichier de configuration KDM"
 
 #: src/modules/displaymanager/main.py:381
 msgid "KDM config file {!s} does not exist"
-msgstr ""
+msgstr "Le fichier de configuration KDM n'existe pas"
 
 #: src/modules/displaymanager/main.py:442
 msgid "Cannot write LXDM configuration file"
@@ -39,7 +40,7 @@ msgstr "Impossible d'écrire le fichier de configuration LXDM"
 
 #: src/modules/displaymanager/main.py:443
 msgid "LXDM config file {!s} does not exist"
-msgstr ""
+msgstr "Le fichier de configuration LXDM n'existe pas"
 
 #: src/modules/displaymanager/main.py:517
 msgid "Cannot write LightDM configuration file"

From b1ea96e4639b916938718875ba9e52ece620fb71 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Fri, 2 Nov 2018 11:58:49 -0400
Subject: [PATCH 54/74] [partition] Don't autoremove the tempdir

 - Dangerout since we're mounting things inside that tempdir,
   and then doing a "weak" unmount
---
 src/modules/partition/core/PartUtils.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/modules/partition/core/PartUtils.cpp b/src/modules/partition/core/PartUtils.cpp
index 12aa489db..f080d97a4 100644
--- a/src/modules/partition/core/PartUtils.cpp
+++ b/src/modules/partition/core/PartUtils.cpp
@@ -163,6 +163,7 @@ lookForFstabEntries( const QString& partitionPath )
 {
     FstabEntryList fstabEntries;
     QTemporaryDir mountsDir;
+    mountsDir.setAutoRemove( false );
 
     int exit = QProcess::execute( "mount", { partitionPath, mountsDir.path() } );
     if ( !exit ) // if all is well

From dc06de58d86e50aaeb3c79ddd8e0b01680fedcbe Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Thu, 3 Jan 2019 15:29:04 +0100
Subject: [PATCH 55/74] Changes: document source of fix

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

diff --git a/CHANGES b/CHANGES
index d76ca0ea6..2cedfe508 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,11 +6,15 @@ website will have to do for older versions.
 = 3.2.3 (unreleased) =
 
 This release contains contributions from (alphabetically by first name):
+ - aliveafter1000
 
 == Core ==
 
 == Modules ==
 
+ * Fixed bug where, during detection of existing systems, the existing
+   system partitions may be mounted and then destroyed.
+
 = 3.2.2 (2018-09-04) =
 
 This release contains contributions from (alphabetically by first name):

From 59eaf18b9f878bf639bbd04d68868a961f34b329 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 4 Dec 2018 10:40:23 +0100
Subject: [PATCH 56/74] CMake: bump required Qt version

 - kpmcore will require Qt 5.10 shortly
 - KDE CI tests only Qt 5.10 and later
---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 47054bd8c..e3cffc383 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -113,7 +113,7 @@ set( _tx_bad eo kk kn uz ur mk lo gu fr_CH fa be )
 ### Required versions
 #
 # See DEPENDENCIES section below.
-set( QT_VERSION 5.7.0 )
+set( QT_VERSION 5.10.0 )
 set( YAMLCPP_VERSION 0.5.1 )
 set( ECM_VERSION 5.18 )
 set( PYTHONLIBS_VERSION 3.3 )

From e52f0318fe8e71b83c216bdfa78d7231d4d68309 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Mon, 7 Jan 2019 15:16:37 +0100
Subject: [PATCH 57/74] [locale] Call timedatectl only when needed

 - When testing and running not-as-root, only call the timedatectl
   when the settings actually change; this reduces the number of
   times kauth pops up.
---
 src/modules/locale/LocalePage.cpp | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/modules/locale/LocalePage.cpp b/src/modules/locale/LocalePage.cpp
index 9aad283c6..f9e2aa515 100644
--- a/src/modules/locale/LocalePage.cpp
+++ b/src/modules/locale/LocalePage.cpp
@@ -484,19 +484,22 @@ LocalePage::prettyLCLocale( const QString& lcLocale ) const
 void
 LocalePage::updateGlobalStorage()
 {
+    auto *gs = Calamares::JobQueue::instance()->globalStorage();
+
     LocaleGlobal::Location location = m_tzWidget->getCurrentLocation();
-    Calamares::JobQueue::instance()->globalStorage()
-            ->insert( "locationRegion", location.region );
-    Calamares::JobQueue::instance()->globalStorage()
-            ->insert( "locationZone", location.zone );
+    bool locationChanged = ( location.region != gs->value( "locationRegion" ) ) ||
+                           ( location.zone != gs->value( "locationZone" ) );
+
+    gs->insert( "locationRegion", location.region );
+    gs->insert( "locationZone", location.zone );
 
     const QString bcp47 = m_selectedLocaleConfiguration.toBcp47();
-    Calamares::JobQueue::instance()->globalStorage()->insert( "locale", bcp47 );
+    gs->insert( "locale", bcp47 );
 
     // If we're in chroot mode (normal install mode), then we immediately set the
     // timezone on the live system. When debugging timezones, don't bother.
 #ifndef DEBUG_TIMEZONES
-    if ( Calamares::Settings::instance()->doChroot() )
+    if ( locationChanged && Calamares::Settings::instance()->doChroot() )
     {
         QProcess::execute( "timedatectl",  // depends on systemd
                             { "set-timezone",

From 3ff480eaa9566bba95e6beaa4e9a43d843694574 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Mon, 7 Jan 2019 17:29:54 +0100
Subject: [PATCH 58/74] [locale] Refactor to make updating global locale
 setting easier.

---
 src/modules/locale/LocalePage.cpp | 13 +++++++++++--
 src/modules/locale/LocalePage.h   |  6 ++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/modules/locale/LocalePage.cpp b/src/modules/locale/LocalePage.cpp
index f9e2aa515..d5bd8147a 100644
--- a/src/modules/locale/LocalePage.cpp
+++ b/src/modules/locale/LocalePage.cpp
@@ -481,6 +481,16 @@ LocalePage::prettyLCLocale( const QString& lcLocale ) const
                           .arg( QLocale::countryToString( locale.country() ) );
 }
 
+
+void
+LocalePage::updateGlobalLocale()
+{
+    auto *gs = Calamares::JobQueue::instance()->globalStorage();
+    const QString bcp47 = m_selectedLocaleConfiguration.toBcp47();
+    gs->insert( "locale", bcp47 );
+}
+
+
 void
 LocalePage::updateGlobalStorage()
 {
@@ -493,8 +503,7 @@ LocalePage::updateGlobalStorage()
     gs->insert( "locationRegion", location.region );
     gs->insert( "locationZone", location.zone );
 
-    const QString bcp47 = m_selectedLocaleConfiguration.toBcp47();
-    gs->insert( "locale", bcp47 );
+    updateGlobalLocale();
 
     // If we're in chroot mode (normal install mode), then we immediately set the
     // timezone on the live system. When debugging timezones, don't bother.
diff --git a/src/modules/locale/LocalePage.h b/src/modules/locale/LocalePage.h
index c4ca20503..4b93c690e 100644
--- a/src/modules/locale/LocalePage.h
+++ b/src/modules/locale/LocalePage.h
@@ -57,6 +57,12 @@ private:
     // the settings for language and numbers.
     std::pair< QString, QString > prettyLocaleStatus( const LocaleConfiguration& ) const;
 
+    /** @brief Update the GS *locale* key with the selected system language.
+     *
+     * This uses whatever is set in m_selectedLocaleConfiguration as the language,
+     * and writes it to GS *locale* key (as a string, in BCP47 format).
+     */
+    void updateGlobalLocale();
     void updateGlobalStorage();
     void updateLocaleLabels();
 

From bc398756f51822b75d3fa46f9a9e795600d72565 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Mon, 7 Jan 2019 18:34:25 +0100
Subject: [PATCH 59/74] [locale] Debugging support for Location

 - code formatting
 - provide an operator << for debugging TZ widget
---
 src/modules/locale/timezonewidget/localeglobal.h | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/modules/locale/timezonewidget/localeglobal.h b/src/modules/locale/timezonewidget/localeglobal.h
index 5452b0b09..88a8ae125 100644
--- a/src/modules/locale/timezonewidget/localeglobal.h
+++ b/src/modules/locale/timezonewidget/localeglobal.h
@@ -38,11 +38,13 @@
 class LocaleGlobal
 {
 public:
-    struct Locale {
+    struct Locale
+    {
         QString description, locale;
     };
 
-    struct Location {
+    struct Location
+    {
         QString region, zone, country;
         double latitude, longitude;
         static QString pretty( const QString& s );
@@ -59,7 +61,12 @@ private:
 
     static void initLocales();
     static void initLocations();
-    static double getRightGeoLocation(QString str);
+    static double getRightGeoLocation( QString str );
 };
 
+inline QDebug& operator <<( QDebug& s, const LocaleGlobal::Location& l )
+{
+    return s << l.region << '/' << l.zone << '(' << l.country << ") @N" << l.latitude  << 'E' << l.longitude;
+}
+
 #endif // LOCALEGLOBAL_H

From 9d871fb9dbf7e3af3589d28a945c900994203769 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Mon, 7 Jan 2019 18:49:08 +0100
Subject: [PATCH 60/74] [locale] Update global locale setting when it changes

 - use debugging to be a little more chatty
 - when changing the system language on the locale page,
   the global locale setting should change, too.
---
 src/modules/locale/LocalePage.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/modules/locale/LocalePage.cpp b/src/modules/locale/LocalePage.cpp
index d5bd8147a..cfd7eb2fa 100644
--- a/src/modules/locale/LocalePage.cpp
+++ b/src/modules/locale/LocalePage.cpp
@@ -137,6 +137,7 @@ LocalePage::LocalePage( QWidget* parent )
     connect( m_tzWidget, &TimeZoneWidget::locationChanged,
              [this]( LocaleGlobal::Location location )
     {
+        cDebug() << "Updating location from TZ widget to" << location;
         m_blockTzWidgetSet = true;
 
         // Set region index
@@ -173,6 +174,7 @@ LocalePage::LocalePage( QWidget* parent )
         {
             m_selectedLocaleConfiguration.lang = dlg->selectedLCLocale();
             m_selectedLocaleConfiguration.explicit_lang = true;
+            this->updateGlobalLocale();
             this->updateLocaleLabels();
         }
 
@@ -441,6 +443,7 @@ LocalePage::onActivate()
     {
         auto newLocale = guessLocaleConfiguration();
         m_selectedLocaleConfiguration.lang = newLocale.lang;
+        updateGlobalLocale();
         updateLocaleLabels();
     }
 }
@@ -487,6 +490,7 @@ LocalePage::updateGlobalLocale()
 {
     auto *gs = Calamares::JobQueue::instance()->globalStorage();
     const QString bcp47 = m_selectedLocaleConfiguration.toBcp47();
+    cDebug() << "Updating global locale setting to" << bcp47;
     gs->insert( "locale", bcp47 );
 }
 

From 093240c131148dbb720c3c8a5df2a706ad54179f Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 8 Jan 2019 10:51:53 +0100
Subject: [PATCH 61/74] [libcalamares] Be less chatty in Python scripts

 - When finding the gettext path, the debug output was very
   chatty and didn't include an indication that it was looking
   for translations.
---
 src/libcalamares/PythonJobApi.cpp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/libcalamares/PythonJobApi.cpp b/src/libcalamares/PythonJobApi.cpp
index f540c2683..19670b87f 100644
--- a/src/libcalamares/PythonJobApi.cpp
+++ b/src/libcalamares/PythonJobApi.cpp
@@ -275,16 +275,21 @@ gettext_path()
     }
     _add_localedirs( candidatePaths, QDir().canonicalPath() ); // .
 
-    cDebug() << "Standard paths" << candidatePaths;
+    cDebug() << "Determining gettext path from" << candidatePaths;
 
-    for ( auto lang : _gettext_languages() )
+    QStringList candidateLanguages = _gettext_languages();
+
+    for ( const auto& lang : candidateLanguages )
         for ( auto localedir : candidatePaths )
         {
             QDir ldir( localedir );
-            cDebug() << "Checking" << lang << "in" <<ldir.canonicalPath();
             if ( ldir.cd( lang ) )
+            {
+                cDebug() << " .. Found" << lang << "in" << ldir.canonicalPath();
                 return bp::object( localedir.toStdString() );
+            }
         }
+    cDebug() << " .. None found for" << candidateLanguages;
     return bp::object();  // None
 }
 

From 50e6f0fcbffcfb0fefe804eb2d150a1ee794464b Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 8 Jan 2019 11:10:16 +0100
Subject: [PATCH 62/74] [locale] Replace weird static-constructor

 - Replace createDefault() with a constructor that takes a
   locale name; use it with en_US.UTF-8 in those places where
   createDefault was previously used.
---
 src/modules/locale/LocaleConfiguration.cpp | 12 +++++-------
 src/modules/locale/LocaleConfiguration.h   |  4 +++-
 src/modules/locale/LocalePage.cpp          |  6 ++++--
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/modules/locale/LocaleConfiguration.cpp b/src/modules/locale/LocaleConfiguration.cpp
index 7c8ad3305..f980b850c 100644
--- a/src/modules/locale/LocaleConfiguration.cpp
+++ b/src/modules/locale/LocaleConfiguration.cpp
@@ -27,14 +27,12 @@ LocaleConfiguration::LocaleConfiguration()
 }
 
 
-LocaleConfiguration
-LocaleConfiguration::createDefault()
+LocaleConfiguration::LocaleConfiguration( const QString& localeName )
+    : LocaleConfiguration()
 {
-    LocaleConfiguration lc = LocaleConfiguration();
-    lc.lang = lc.lc_numeric = lc.lc_time = lc.lc_monetary = lc.lc_paper = lc.lc_name
-            = lc.lc_address = lc.lc_telephone = lc.lc_measurement
-            = lc.lc_identification = "en_US.UTF-8";
-    return lc;
+    lang = lc_numeric = lc_time = lc_monetary = lc_paper = lc_name
+            = lc_address = lc_telephone = lc_measurement
+            = lc_identification = localeName;
 }
 
 
diff --git a/src/modules/locale/LocaleConfiguration.h b/src/modules/locale/LocaleConfiguration.h
index c077ef6f7..a4753e221 100644
--- a/src/modules/locale/LocaleConfiguration.h
+++ b/src/modules/locale/LocaleConfiguration.h
@@ -26,9 +26,11 @@
 class LocaleConfiguration
 {
 public:
+    /// @brief Create an empty locale, with nothing set
     explicit LocaleConfiguration();
+    /// @brief Create a locale with everything set to the given @p localeName
+    explicit LocaleConfiguration( const QString& localeName /* "en_US.UTF-8" */ );
 
-    static LocaleConfiguration createDefault();
     static LocaleConfiguration fromLanguageAndLocation( const QString& language,
                                                         const QStringList& availableLocales,
                                                         const QString& countryCode );
diff --git a/src/modules/locale/LocalePage.cpp b/src/modules/locale/LocalePage.cpp
index cfd7eb2fa..45397b1ab 100644
--- a/src/modules/locale/LocalePage.cpp
+++ b/src/modules/locale/LocalePage.cpp
@@ -452,18 +452,20 @@ LocalePage::onActivate()
 LocaleConfiguration
 LocalePage::guessLocaleConfiguration() const
 {
+    static QString defaultLocale = QStringLiteral( "en_US.UTF-8" );
+
     QLocale myLocale;   // User-selected language
 
     // If we cannot say anything about available locales
     if ( m_localeGenLines.isEmpty() )
     {
         cWarning() << "guessLocaleConfiguration can't guess from an empty list.";
-        return LocaleConfiguration::createDefault();
+        return LocaleConfiguration( defaultLocale );
     }
 
     QString myLanguageLocale = myLocale.name();
     if ( myLanguageLocale.isEmpty() )
-        return LocaleConfiguration::createDefault();
+        return LocaleConfiguration( defaultLocale );
 
     return LocaleConfiguration::fromLanguageAndLocation( myLanguageLocale,
                                                          m_localeGenLines,

From b1921cced9c392d2c8afc4565005448489a5d16b Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 8 Jan 2019 11:30:49 +0100
Subject: [PATCH 63/74] [locale] Add tests for some of the data classes

---
 src/modules/locale/CMakeLists.txt | 11 +++++++
 src/modules/locale/Tests.cpp      | 53 +++++++++++++++++++++++++++++++
 src/modules/locale/Tests.h        | 39 +++++++++++++++++++++++
 3 files changed, 103 insertions(+)
 create mode 100644 src/modules/locale/Tests.cpp
 create mode 100644 src/modules/locale/Tests.h

diff --git a/src/modules/locale/CMakeLists.txt b/src/modules/locale/CMakeLists.txt
index 24259d797..e6da9db73 100644
--- a/src/modules/locale/CMakeLists.txt
+++ b/src/modules/locale/CMakeLists.txt
@@ -59,6 +59,17 @@ if( ECM_FOUND AND BUILD_TESTING )
             ${YAMLCPP_LIBRARY}
     )
     set_target_properties( geoiptest PROPERTIES AUTOMOC TRUE )
+
+    ecm_add_test(
+            Tests.cpp
+            LocaleConfiguration.cpp
+        TEST_NAME
+            localetest
+        LINK_LIBRARIES
+            calamares
+            Qt5::Test
+    )
+    set_target_properties( localetest PROPERTIES AUTOMOC TRUE )
 endif()
 
 if( BUILD_TESTING )
diff --git a/src/modules/locale/Tests.cpp b/src/modules/locale/Tests.cpp
new file mode 100644
index 000000000..32a10e250
--- /dev/null
+++ b/src/modules/locale/Tests.cpp
@@ -0,0 +1,53 @@
+/* === This file is part of Calamares - <http://github.com/calamares> ===
+ *
+ *   Copyright 2019, Adriaan de Groot <groot@kde.org>
+ *
+ *   Calamares is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   Calamares is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#include "Tests.h"
+#include "LocaleConfiguration.h"
+
+#include <QtTest/QtTest>
+
+QTEST_GUILESS_MAIN( LocaleTests )
+
+
+LocaleTests::LocaleTests()
+{
+}
+
+LocaleTests::~LocaleTests()
+{
+}
+
+void LocaleTests::initTestCase()
+{
+}
+
+void LocaleTests::testEmptyLocaleConfiguration()
+{
+    LocaleConfiguration lc;
+
+    QVERIFY( lc.isEmpty() );
+    QCOMPARE( lc.toBcp47(), QString() );
+}
+
+void LocaleTests::testDefaultLocaleConfiguration()
+{
+    LocaleConfiguration lc( "en_US.UTF-8" );
+    QVERIFY( !lc.isEmpty() );
+    QCOMPARE( lc.toBcp47(), "en_US" );
+}
diff --git a/src/modules/locale/Tests.h b/src/modules/locale/Tests.h
new file mode 100644
index 000000000..acb3ab309
--- /dev/null
+++ b/src/modules/locale/Tests.h
@@ -0,0 +1,39 @@
+/* === This file is part of Calamares - <http://github.com/calamares> ===
+ *
+ *   Copyright 2019, Adriaan de Groot <groot@kde.org>
+ *
+ *   Calamares is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   Calamares is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#ifndef TESTS_H
+#define TESTS_H
+
+#include <QObject>
+
+class LocaleTests : public QObject
+{
+    Q_OBJECT
+public:
+    LocaleTests();
+    ~LocaleTests() override;
+
+private Q_SLOTS:
+    void initTestCase();
+    // Check the sample config file is processed correctly
+    void testEmptyLocaleConfiguration();
+    void testDefaultLocaleConfiguration();
+};
+
+#endif

From 0a526febae9cfe761cb427c285165fc1a07c8dff Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 8 Jan 2019 11:39:15 +0100
Subject: [PATCH 64/74] [locale] Refactor setting the BCP47 name and update
 test

---
 src/modules/locale/LocaleConfiguration.cpp | 17 ++++++++++++-----
 src/modules/locale/LocaleConfiguration.h   |  8 ++++++++
 src/modules/locale/Tests.cpp               |  2 +-
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/modules/locale/LocaleConfiguration.cpp b/src/modules/locale/LocaleConfiguration.cpp
index f980b850c..ca0a707ad 100644
--- a/src/modules/locale/LocaleConfiguration.cpp
+++ b/src/modules/locale/LocaleConfiguration.cpp
@@ -30,9 +30,19 @@ LocaleConfiguration::LocaleConfiguration()
 LocaleConfiguration::LocaleConfiguration( const QString& localeName )
     : LocaleConfiguration()
 {
-    lang = lc_numeric = lc_time = lc_monetary = lc_paper = lc_name
+    lc_numeric = lc_time = lc_monetary = lc_paper = lc_name
             = lc_address = lc_telephone = lc_measurement
             = lc_identification = localeName;
+
+    (void) setLanguage( localeName );
+}
+
+QString
+LocaleConfiguration::setLanguage(const QString& localeName )
+{
+    QString language = localeName.split( '_' ).first();
+    myLanguageLocaleBcp47 = QLocale( language ).bcp47Name().toLower();
+    return language;
 }
 
 
@@ -42,10 +52,7 @@ LocaleConfiguration::fromLanguageAndLocation( const QString& languageLocale,
                                               const QString& countryCode )
 {
     LocaleConfiguration lc;
-
-    // Note that the documentation how this works is in packages.conf
-    QString language = languageLocale.split( '_' ).first();
-    lc.myLanguageLocaleBcp47 = QLocale(language).bcp47Name().toLower();
+    QString language = lc.setLanguage( languageLocale );
 
     QStringList linesForLanguage;
     for ( const QString &line : availableLocales )
diff --git a/src/modules/locale/LocaleConfiguration.h b/src/modules/locale/LocaleConfiguration.h
index a4753e221..95dadd5c3 100644
--- a/src/modules/locale/LocaleConfiguration.h
+++ b/src/modules/locale/LocaleConfiguration.h
@@ -51,6 +51,14 @@ public:
     bool explicit_lang, explicit_lc;
 
 private:
+    /** @brief sets lang and the BCP47 representation
+     *
+     * Note that the documentation how this works is in packages.conf
+     *
+     * @return The language part of the locale (e.g. before _)
+     */
+    QString setLanguage( const QString& localeName );
+
     QString myLanguageLocaleBcp47;
 };
 
diff --git a/src/modules/locale/Tests.cpp b/src/modules/locale/Tests.cpp
index 32a10e250..6cad2ef74 100644
--- a/src/modules/locale/Tests.cpp
+++ b/src/modules/locale/Tests.cpp
@@ -49,5 +49,5 @@ void LocaleTests::testDefaultLocaleConfiguration()
 {
     LocaleConfiguration lc( "en_US.UTF-8" );
     QVERIFY( !lc.isEmpty() );
-    QCOMPARE( lc.toBcp47(), "en_US" );
+    QCOMPARE( lc.toBcp47(), "en" );
 }

From dbe50fe3db0ca1ba2993500ee7110fd7a8faf8bc Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 8 Jan 2019 13:23:16 +0100
Subject: [PATCH 65/74] [locale] Improve LocaleConfiguration constructors

 - Allow split-setting of the language and formats
 - Test new constructors
 - Since fromLanguageAndLocation can handle empty localeGen
   lists just fine, skip all the weird checks that return
   invalid guessed locale configurations.
---
 src/modules/locale/LocaleConfiguration.cpp | 15 +++++---------
 src/modules/locale/LocaleConfiguration.h   |  5 ++++-
 src/modules/locale/LocalePage.cpp          | 17 +---------------
 src/modules/locale/Tests.cpp               | 23 ++++++++++++++++++++++
 src/modules/locale/Tests.h                 |  1 +
 5 files changed, 34 insertions(+), 27 deletions(-)

diff --git a/src/modules/locale/LocaleConfiguration.cpp b/src/modules/locale/LocaleConfiguration.cpp
index ca0a707ad..2e0689090 100644
--- a/src/modules/locale/LocaleConfiguration.cpp
+++ b/src/modules/locale/LocaleConfiguration.cpp
@@ -27,16 +27,17 @@ LocaleConfiguration::LocaleConfiguration()
 }
 
 
-LocaleConfiguration::LocaleConfiguration( const QString& localeName )
+LocaleConfiguration::LocaleConfiguration( const QString& localeName, const QString& formatsName )
     : LocaleConfiguration()
 {
     lc_numeric = lc_time = lc_monetary = lc_paper = lc_name
             = lc_address = lc_telephone = lc_measurement
-            = lc_identification = localeName;
+            = lc_identification = formatsName;
 
     (void) setLanguage( localeName );
 }
 
+
 QString
 LocaleConfiguration::setLanguage(const QString& localeName )
 {
@@ -51,8 +52,7 @@ LocaleConfiguration::fromLanguageAndLocation( const QString& languageLocale,
                                               const QStringList& availableLocales,
                                               const QString& countryCode )
 {
-    LocaleConfiguration lc;
-    QString language = lc.setLanguage( languageLocale );
+    QString language = languageLocale.split( '_' ).first();
 
     QStringList linesForLanguage;
     for ( const QString &line : availableLocales )
@@ -269,12 +269,7 @@ LocaleConfiguration::fromLanguageAndLocation( const QString& languageLocale,
     if ( lc_formats.isEmpty() )
         lc_formats = lang;
 
-    lc.lang = lang;
-    lc.lc_address = lc.lc_identification = lc.lc_measurement = lc.lc_monetary
-                  = lc.lc_name = lc.lc_numeric = lc.lc_paper = lc.lc_telephone
-                  = lc.lc_time = lc_formats;
-
-    return lc;
+    return LocaleConfiguration( lang, lc_formats );
 }
 
 
diff --git a/src/modules/locale/LocaleConfiguration.h b/src/modules/locale/LocaleConfiguration.h
index 95dadd5c3..0bd310d9d 100644
--- a/src/modules/locale/LocaleConfiguration.h
+++ b/src/modules/locale/LocaleConfiguration.h
@@ -29,7 +29,10 @@ public:
     /// @brief Create an empty locale, with nothing set
     explicit LocaleConfiguration();
     /// @brief Create a locale with everything set to the given @p localeName
-    explicit LocaleConfiguration( const QString& localeName /* "en_US.UTF-8" */ );
+    explicit LocaleConfiguration( const QString& localeName /* "en_US.UTF-8" */ )
+        : LocaleConfiguration( localeName, localeName ) { };
+    /// @brief Create a locale with language and formats separate
+    explicit LocaleConfiguration( const QString& localeName, const QString& formatsName );
 
     static LocaleConfiguration fromLanguageAndLocation( const QString& language,
                                                         const QStringList& availableLocales,
diff --git a/src/modules/locale/LocalePage.cpp b/src/modules/locale/LocalePage.cpp
index 45397b1ab..c456ef940 100644
--- a/src/modules/locale/LocalePage.cpp
+++ b/src/modules/locale/LocalePage.cpp
@@ -452,22 +452,7 @@ LocalePage::onActivate()
 LocaleConfiguration
 LocalePage::guessLocaleConfiguration() const
 {
-    static QString defaultLocale = QStringLiteral( "en_US.UTF-8" );
-
-    QLocale myLocale;   // User-selected language
-
-    // If we cannot say anything about available locales
-    if ( m_localeGenLines.isEmpty() )
-    {
-        cWarning() << "guessLocaleConfiguration can't guess from an empty list.";
-        return LocaleConfiguration( defaultLocale );
-    }
-
-    QString myLanguageLocale = myLocale.name();
-    if ( myLanguageLocale.isEmpty() )
-        return LocaleConfiguration( defaultLocale );
-
-    return LocaleConfiguration::fromLanguageAndLocation( myLanguageLocale,
+    return LocaleConfiguration::fromLanguageAndLocation( QLocale().name(),
                                                          m_localeGenLines,
                                                          m_tzWidget->getCurrentLocation().country );
 }
diff --git a/src/modules/locale/Tests.cpp b/src/modules/locale/Tests.cpp
index 6cad2ef74..91fea42b8 100644
--- a/src/modules/locale/Tests.cpp
+++ b/src/modules/locale/Tests.cpp
@@ -50,4 +50,27 @@ void LocaleTests::testDefaultLocaleConfiguration()
     LocaleConfiguration lc( "en_US.UTF-8" );
     QVERIFY( !lc.isEmpty() );
     QCOMPARE( lc.toBcp47(), "en" );
+
+    LocaleConfiguration lc2( "de_DE.UTF-8" );
+    QVERIFY( !lc2.isEmpty() );
+    QCOMPARE( lc2.toBcp47(), "de" );
+}
+
+void LocaleTests::testSplitLocaleConfiguration()
+{
+    LocaleConfiguration lc( "en_US.UTF-8", "de_DE.UTF-8" );
+    QVERIFY( !lc.isEmpty() );
+    QCOMPARE( lc.toBcp47(), "en" );
+    QCOMPARE( lc.lc_numeric, QStringLiteral( "de_DE.UTF-8" ) );
+
+    LocaleConfiguration lc2( "de_DE.UTF-8", "da_DK.UTF-8" );
+    QVERIFY( !lc2.isEmpty() );
+    QCOMPARE( lc2.toBcp47(), "de" );
+    QCOMPARE( lc2.lc_numeric, "da_DK.UTF-8" );
+
+    LocaleConfiguration lc3( "da_DK.UTF-8", "de_DE.UTF-8" );
+    QVERIFY( !lc3.isEmpty() );
+    QCOMPARE( lc3.toBcp47(), "da" );
+    QCOMPARE( lc3.lc_numeric, "de_DE.UTF-8" );
+
 }
diff --git a/src/modules/locale/Tests.h b/src/modules/locale/Tests.h
index acb3ab309..299eac61d 100644
--- a/src/modules/locale/Tests.h
+++ b/src/modules/locale/Tests.h
@@ -34,6 +34,7 @@ private Q_SLOTS:
     // Check the sample config file is processed correctly
     void testEmptyLocaleConfiguration();
     void testDefaultLocaleConfiguration();
+    void testSplitLocaleConfiguration();
 };
 
 #endif

From 2345b933cdb520d0a3659071734c6c4f0d89a57c Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 8 Jan 2019 13:40:20 +0100
Subject: [PATCH 66/74] [locale] Add operator << for LocaleConfiguration, for
 debugging

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

diff --git a/src/modules/locale/LocaleConfiguration.h b/src/modules/locale/LocaleConfiguration.h
index 0bd310d9d..7e835084f 100644
--- a/src/modules/locale/LocaleConfiguration.h
+++ b/src/modules/locale/LocaleConfiguration.h
@@ -20,6 +20,7 @@
 #ifndef LOCALECONFIGURATION_H
 #define LOCALECONFIGURATION_H
 
+#include <QDebug>
 #include <QString>
 #include <QMap>
 
@@ -65,4 +66,9 @@ private:
     QString myLanguageLocaleBcp47;
 };
 
+inline QDebug& operator <<( QDebug& s, const LocaleConfiguration& l )
+{
+    return s << l.lang << '(' << l.toBcp47() << ") +" << l.lc_numeric;
+}
+
 #endif // LOCALECONFIGURATION_H

From 8cc0e1f5f9390c6c92bdd5a32168fa2753622883 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 8 Jan 2019 14:39:40 +0100
Subject: [PATCH 67/74] [locale] Expand tests to check lang

 - This shows that one constructor isn't doing it right.
---
 src/modules/locale/Tests.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/modules/locale/Tests.cpp b/src/modules/locale/Tests.cpp
index 91fea42b8..889519ca8 100644
--- a/src/modules/locale/Tests.cpp
+++ b/src/modules/locale/Tests.cpp
@@ -49,10 +49,12 @@ void LocaleTests::testDefaultLocaleConfiguration()
 {
     LocaleConfiguration lc( "en_US.UTF-8" );
     QVERIFY( !lc.isEmpty() );
+    QCOMPARE( lc.lang, "en_US.UTF-8" );
     QCOMPARE( lc.toBcp47(), "en" );
 
     LocaleConfiguration lc2( "de_DE.UTF-8" );
     QVERIFY( !lc2.isEmpty() );
+    QCOMPARE( lc2.lang, "de_DE.UTF-8" );
     QCOMPARE( lc2.toBcp47(), "de" );
 }
 
@@ -60,11 +62,13 @@ void LocaleTests::testSplitLocaleConfiguration()
 {
     LocaleConfiguration lc( "en_US.UTF-8", "de_DE.UTF-8" );
     QVERIFY( !lc.isEmpty() );
+    QCOMPARE( lc.lang, "en_US.UTF-8" );
     QCOMPARE( lc.toBcp47(), "en" );
     QCOMPARE( lc.lc_numeric, QStringLiteral( "de_DE.UTF-8" ) );
 
     LocaleConfiguration lc2( "de_DE.UTF-8", "da_DK.UTF-8" );
     QVERIFY( !lc2.isEmpty() );
+    QCOMPARE( lc2.lang, "de_DE.UTF-8" );
     QCOMPARE( lc2.toBcp47(), "de" );
     QCOMPARE( lc2.lc_numeric, "da_DK.UTF-8" );
 

From f1cbd5fcbf109ea50b96a7da35beb59e7baa2732 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 8 Jan 2019 18:09:34 +0100
Subject: [PATCH 68/74] [locale] Provide API for setting language

 - The language and BCP need to be in-sync
 - Existing code was inconsistent in setting things, which is why
   you could get through the locale page without setting a locale
   (at all) or it would keep English in spite of picking Germand on
   the welcome page.
 - Patch tests to use that API.
---
 src/modules/locale/LocaleConfiguration.cpp | 17 +++++---------
 src/modules/locale/LocaleConfiguration.h   | 27 +++++++++++-----------
 src/modules/locale/LocalePage.cpp          | 12 +++++-----
 src/modules/locale/Tests.cpp               |  8 +++----
 4 files changed, 30 insertions(+), 34 deletions(-)

diff --git a/src/modules/locale/LocaleConfiguration.cpp b/src/modules/locale/LocaleConfiguration.cpp
index 2e0689090..64d9971a7 100644
--- a/src/modules/locale/LocaleConfiguration.cpp
+++ b/src/modules/locale/LocaleConfiguration.cpp
@@ -38,12 +38,12 @@ LocaleConfiguration::LocaleConfiguration( const QString& localeName, const QStri
 }
 
 
-QString
+void
 LocaleConfiguration::setLanguage(const QString& localeName )
 {
     QString language = localeName.split( '_' ).first();
-    myLanguageLocaleBcp47 = QLocale( language ).bcp47Name().toLower();
-    return language;
+    m_languageLocaleBcp47 = QLocale( language ).bcp47Name().toLower();
+    m_lang = localeName;
 }
 
 
@@ -276,7 +276,7 @@ LocaleConfiguration::fromLanguageAndLocation( const QString& languageLocale,
 bool
 LocaleConfiguration::isEmpty() const
 {
-    return lang.isEmpty() &&
+    return m_lang.isEmpty() &&
          lc_numeric.isEmpty() &&
          lc_time.isEmpty() &&
          lc_monetary.isEmpty() &&
@@ -294,8 +294,8 @@ LocaleConfiguration::toMap() const
 {
     QMap< QString, QString > map;
 
-    if ( !lang.isEmpty() )
-        map.insert( "LANG", lang );
+    if ( !m_lang.isEmpty() )
+        map.insert( "LANG", m_lang );
 
     if ( !lc_numeric.isEmpty() )
         map.insert( "LC_NUMERIC", lc_numeric );
@@ -327,8 +327,3 @@ LocaleConfiguration::toMap() const
     return map;
 }
 
-QString
-LocaleConfiguration::toBcp47() const
-{
-    return myLanguageLocaleBcp47;
-}
diff --git a/src/modules/locale/LocaleConfiguration.h b/src/modules/locale/LocaleConfiguration.h
index 7e835084f..e408d8ecb 100644
--- a/src/modules/locale/LocaleConfiguration.h
+++ b/src/modules/locale/LocaleConfiguration.h
@@ -41,13 +41,21 @@ public:
 
     bool isEmpty() const;
 
-    QMap< QString, QString > toMap() const;
+    /** @brief sets lang and the BCP47 representation
+     *
+     * Note that the documentation how this works is in packages.conf
+     */
+    void setLanguage( const QString& localeName );
+    QString language() const { return m_lang; }
+
     // Note that the documentation how this works is in packages.conf
-    QString toBcp47() const;
+    QString toBcp47() const { return m_languageLocaleBcp47; }
+
+    QMap< QString, QString > toMap() const;
 
     // These become all uppercase in locale.conf, but we keep them lowercase here to
     // avoid confusion with locale.h.
-    QString lang, lc_numeric, lc_time, lc_monetary, lc_paper, lc_name, lc_address,
+    QString lc_numeric, lc_time, lc_monetary, lc_paper, lc_name, lc_address,
             lc_telephone, lc_measurement, lc_identification;
 
     // If the user has explicitly selected language (from the dialog)
@@ -55,20 +63,13 @@ public:
     bool explicit_lang, explicit_lc;
 
 private:
-    /** @brief sets lang and the BCP47 representation
-     *
-     * Note that the documentation how this works is in packages.conf
-     *
-     * @return The language part of the locale (e.g. before _)
-     */
-    QString setLanguage( const QString& localeName );
-
-    QString myLanguageLocaleBcp47;
+    QString m_lang;
+    QString m_languageLocaleBcp47;
 };
 
 inline QDebug& operator <<( QDebug& s, const LocaleConfiguration& l )
 {
-    return s << l.lang << '(' << l.toBcp47() << ") +" << l.lc_numeric;
+    return s << l.language() << '(' << l.toBcp47() << ") +" << l.lc_numeric;
 }
 
 #endif // LOCALECONFIGURATION_H
diff --git a/src/modules/locale/LocalePage.cpp b/src/modules/locale/LocalePage.cpp
index c456ef940..65d681f37 100644
--- a/src/modules/locale/LocalePage.cpp
+++ b/src/modules/locale/LocalePage.cpp
@@ -164,15 +164,15 @@ LocalePage::LocalePage( QWidget* parent )
     {
         LCLocaleDialog* dlg =
                 new LCLocaleDialog( m_selectedLocaleConfiguration.isEmpty() ?
-                                        guessLocaleConfiguration().lang :
-                                        m_selectedLocaleConfiguration.lang,
+                                        guessLocaleConfiguration().language() :
+                                        m_selectedLocaleConfiguration.language(),
                                     m_localeGenLines,
                                     this );
         dlg->exec();
         if ( dlg->result() == QDialog::Accepted &&
              !dlg->selectedLCLocale().isEmpty() )
         {
-            m_selectedLocaleConfiguration.lang = dlg->selectedLCLocale();
+            m_selectedLocaleConfiguration.setLanguage( dlg->selectedLCLocale() );
             m_selectedLocaleConfiguration.explicit_lang = true;
             this->updateGlobalLocale();
             this->updateLocaleLabels();
@@ -387,7 +387,7 @@ std::pair< QString, QString > LocalePage::prettyLocaleStatus( const LocaleConfig
 {
     return std::make_pair< QString, QString >(
         tr( "The system language will be set to %1." )
-            .arg( prettyLCLocale( lc.lang ) ),
+            .arg( prettyLCLocale( lc.language() ) ),
         tr( "The numbers and dates locale will be set to %1." )
                             .arg( prettyLCLocale( lc.lc_numeric ) )
                                              );
@@ -442,7 +442,7 @@ LocalePage::onActivate()
          !m_selectedLocaleConfiguration.explicit_lang )
     {
         auto newLocale = guessLocaleConfiguration();
-        m_selectedLocaleConfiguration.lang = newLocale.lang;
+        m_selectedLocaleConfiguration.setLanguage( newLocale.language() );
         updateGlobalLocale();
         updateLocaleLabels();
     }
@@ -511,7 +511,7 @@ LocalePage::updateGlobalStorage()
     auto newLocale = guessLocaleConfiguration();
     if ( !m_selectedLocaleConfiguration.isEmpty() &&
          m_selectedLocaleConfiguration.explicit_lang )
-        newLocale.lang = m_selectedLocaleConfiguration.lang;
+        newLocale.setLanguage( m_selectedLocaleConfiguration.language() );
     if ( !m_selectedLocaleConfiguration.isEmpty() &&
          m_selectedLocaleConfiguration.explicit_lc )
     {
diff --git a/src/modules/locale/Tests.cpp b/src/modules/locale/Tests.cpp
index 889519ca8..0e1a3eb48 100644
--- a/src/modules/locale/Tests.cpp
+++ b/src/modules/locale/Tests.cpp
@@ -49,12 +49,12 @@ void LocaleTests::testDefaultLocaleConfiguration()
 {
     LocaleConfiguration lc( "en_US.UTF-8" );
     QVERIFY( !lc.isEmpty() );
-    QCOMPARE( lc.lang, "en_US.UTF-8" );
+    QCOMPARE( lc.language(), "en_US.UTF-8" );
     QCOMPARE( lc.toBcp47(), "en" );
 
     LocaleConfiguration lc2( "de_DE.UTF-8" );
     QVERIFY( !lc2.isEmpty() );
-    QCOMPARE( lc2.lang, "de_DE.UTF-8" );
+    QCOMPARE( lc2.language(), "de_DE.UTF-8" );
     QCOMPARE( lc2.toBcp47(), "de" );
 }
 
@@ -62,13 +62,13 @@ void LocaleTests::testSplitLocaleConfiguration()
 {
     LocaleConfiguration lc( "en_US.UTF-8", "de_DE.UTF-8" );
     QVERIFY( !lc.isEmpty() );
-    QCOMPARE( lc.lang, "en_US.UTF-8" );
+    QCOMPARE( lc.language(), "en_US.UTF-8" );
     QCOMPARE( lc.toBcp47(), "en" );
     QCOMPARE( lc.lc_numeric, QStringLiteral( "de_DE.UTF-8" ) );
 
     LocaleConfiguration lc2( "de_DE.UTF-8", "da_DK.UTF-8" );
     QVERIFY( !lc2.isEmpty() );
-    QCOMPARE( lc2.lang, "de_DE.UTF-8" );
+    QCOMPARE( lc2.language(), "de_DE.UTF-8" );
     QCOMPARE( lc2.toBcp47(), "de" );
     QCOMPARE( lc2.lc_numeric, "da_DK.UTF-8" );
 

From 200f68ae48f450aca1d6c6a81065e14aecd26848 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 8 Jan 2019 22:18:01 +0100
Subject: [PATCH 69/74] [locale] Reduce debug-chattiness

---
 src/modules/locale/LocalePage.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/modules/locale/LocalePage.cpp b/src/modules/locale/LocalePage.cpp
index 65d681f37..e64740574 100644
--- a/src/modules/locale/LocalePage.cpp
+++ b/src/modules/locale/LocalePage.cpp
@@ -137,7 +137,6 @@ LocalePage::LocalePage( QWidget* parent )
     connect( m_tzWidget, &TimeZoneWidget::locationChanged,
              [this]( LocaleGlobal::Location location )
     {
-        cDebug() << "Updating location from TZ widget to" << location;
         m_blockTzWidgetSet = true;
 
         // Set region index
@@ -318,7 +317,7 @@ LocalePage::init( const QString& initialRegion,
         }
         else
         {
-            cDebug() << "Cannot open file" << localeGenPath
+            cWarning() << "Cannot open file" << localeGenPath
                      << ". Assuming the supported languages are already built into "
                         "the locale archive.";
             QProcess localeA;
@@ -477,7 +476,6 @@ LocalePage::updateGlobalLocale()
 {
     auto *gs = Calamares::JobQueue::instance()->globalStorage();
     const QString bcp47 = m_selectedLocaleConfiguration.toBcp47();
-    cDebug() << "Updating global locale setting to" << bcp47;
     gs->insert( "locale", bcp47 );
 }
 

From ba82526449dbadc5a658185f1b56ae50ae60b327 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 8 Jan 2019 22:25:25 +0100
Subject: [PATCH 70/74] CMake: drop RC version for release

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f241cedd0..fa550f3c3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -75,7 +75,7 @@ set( CALAMARES_DESCRIPTION_SUMMARY
 set( CALAMARES_VERSION_MAJOR 3 )
 set( CALAMARES_VERSION_MINOR 2 )
 set( CALAMARES_VERSION_PATCH 3 )
-set( CALAMARES_VERSION_RC 1 )
+set( CALAMARES_VERSION_RC 0 )
 
 ### Transifex (languages) info
 #

From 527392f0afa550fd16ba51e4897f14d5afe2a492 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 8 Jan 2019 22:29:55 +0100
Subject: [PATCH 71/74] [libcalamares] Update Copyright statement

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

diff --git a/src/libcalamares/PythonJobApi.cpp b/src/libcalamares/PythonJobApi.cpp
index 19670b87f..b953f821a 100644
--- a/src/libcalamares/PythonJobApi.cpp
+++ b/src/libcalamares/PythonJobApi.cpp
@@ -1,7 +1,7 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2014-2016, Teo Mrnjavac <teo@kde.org>
- *   Copyright 2017-2018, Adriaan de Groot <groot@kde.org>
+ *   Copyright 2017-2019, Adriaan de Groot <groot@kde.org>
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by

From 4b1b71dd3e8bc800bcd1ff22ca6c8adee8d1b195 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 8 Jan 2019 22:30:12 +0100
Subject: [PATCH 72/74] [locale] Update Copyright statements

---
 src/modules/locale/LocaleConfiguration.cpp       | 2 +-
 src/modules/locale/LocaleConfiguration.h         | 2 +-
 src/modules/locale/LocalePage.cpp                | 2 +-
 src/modules/locale/LocalePage.h                  | 1 +
 src/modules/locale/timezonewidget/localeglobal.h | 1 +
 5 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/modules/locale/LocaleConfiguration.cpp b/src/modules/locale/LocaleConfiguration.cpp
index 64d9971a7..8bc2b2c77 100644
--- a/src/modules/locale/LocaleConfiguration.cpp
+++ b/src/modules/locale/LocaleConfiguration.cpp
@@ -1,7 +1,7 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2016, Teo Mrnjavac <teo@kde.org>
- *   Copyright 2017-2018, Adriaan de Groot <groot@kde.org>
+ *   Copyright 2017-2019, Adriaan de Groot <groot@kde.org>
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
diff --git a/src/modules/locale/LocaleConfiguration.h b/src/modules/locale/LocaleConfiguration.h
index e408d8ecb..abe90ffcb 100644
--- a/src/modules/locale/LocaleConfiguration.h
+++ b/src/modules/locale/LocaleConfiguration.h
@@ -1,7 +1,7 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2016, Teo Mrnjavac <teo@kde.org>
- *   Copyright 2017-2018, Adriaan de Groot <groot@kde.org>
+ *   Copyright 2017-2019, Adriaan de Groot <groot@kde.org>
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
diff --git a/src/modules/locale/LocalePage.cpp b/src/modules/locale/LocalePage.cpp
index e64740574..41ce488e3 100644
--- a/src/modules/locale/LocalePage.cpp
+++ b/src/modules/locale/LocalePage.cpp
@@ -1,7 +1,7 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2014-2016, Teo Mrnjavac <teo@kde.org>
- *   Copyright 2017-2018, Adriaan de Groot <groot@kde.org>
+ *   Copyright 2017-2019, Adriaan de Groot <groot@kde.org>
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
diff --git a/src/modules/locale/LocalePage.h b/src/modules/locale/LocalePage.h
index 4b93c690e..741a5d2e9 100644
--- a/src/modules/locale/LocalePage.h
+++ b/src/modules/locale/LocalePage.h
@@ -1,6 +1,7 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2014, Teo Mrnjavac <teo@kde.org>
+ *   Copyright 2019, Adriaan de Groot <groot@kde.org>
  *
  *   Calamares is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
diff --git a/src/modules/locale/timezonewidget/localeglobal.h b/src/modules/locale/timezonewidget/localeglobal.h
index 88a8ae125..1a8f796d4 100644
--- a/src/modules/locale/timezonewidget/localeglobal.h
+++ b/src/modules/locale/timezonewidget/localeglobal.h
@@ -1,6 +1,7 @@
 /* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2014-2016, Teo Mrnjavac <teo@kde.org>
+ *   Copyright 2019, Adriaan de Groot <groot@kde.org>
  *
  *   Originally from the Manjaro Installation Framework
  *   by Roland Singer <roland@manjaro.org>

From 2d2454025de098605c7ee9a4d057899ebf1ab974 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Wed, 9 Jan 2019 12:58:31 +0100
Subject: [PATCH 73/74] Changes: document locale fix

FIXES #1064
---
 CHANGES | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGES b/CHANGES
index 2cedfe508..2b649b772 100644
--- a/CHANGES
+++ b/CHANGES
@@ -14,6 +14,11 @@ This release contains contributions from (alphabetically by first name):
 
  * Fixed bug where, during detection of existing systems, the existing
    system partitions may be mounted and then destroyed.
+ * *locale* It was possible to set the installer and system language
+   (e.g. to German) while the global storage value for *locale*
+   remained set to English. Then no localization packages are installed
+   (see feature `${LOCALE}` in `packages.conf`). Reported downstream
+   in Netrunner.
 
 = 3.2.2 (2018-09-04) =
 

From b18ba3d66292e8fd3848f074d3a4d6fe3381d403 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Wed, 9 Jan 2019 13:00:52 +0100
Subject: [PATCH 74/74] Changes: polish the change-notes a bit

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

diff --git a/CHANGES b/CHANGES
index 2b649b772..ae2ca240b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,23 +3,29 @@ contributors are listed. Note that Calamares does not have a historical
 changelog -- this log starts with version 3.2.0. The release notes on the
 website will have to do for older versions.
 
-= 3.2.3 (unreleased) =
+= 3.2.3 (2019-01-09) =
 
 This release contains contributions from (alphabetically by first name):
  - aliveafter1000
 
 == Core ==
 
+There are no core changes in this release.
+
 == Modules ==
 
- * Fixed bug where, during detection of existing systems, the existing
-   system partitions may be mounted and then destroyed.
+ * *partition* Fixed bug where, during detection of existing systems, the
+   existing system partitions may be mounted and then files deleted.
+   This is a **limited** version of the patch from aliveafter1000
+   that will be in 3.2.4, which tries harder to mount filesystems
+   read-only and unmodifiable.
  * *locale* It was possible to set the installer and system language
    (e.g. to German) while the global storage value for *locale*
    remained set to English. Then no localization packages are installed
    (see feature `${LOCALE}` in `packages.conf`). Reported downstream
    in Netrunner.
 
+
 = 3.2.2 (2018-09-04) =
 
 This release contains contributions from (alphabetically by first name):