Merge branch 'master' of https://github.com/calamares/calamares into development

2017-06-07 00:02:52 +02:00 · 2017-06-07 00:02:52 +02:00 · 8d4a98d5f9
commit 8d4a98d5f9
parent acb0a6aeba 56dec8f575
107 changed files with 402 additions and 217 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -20,4 +20,4 @@ install:

 script:
  - docker run -v $PWD:/build calamares bash -lc "cd /build && cmake -DWEBVIEW_FORCE_WEBKIT=1 -DKDE_INSTALL_USE_QT_SYS_PATHS=ON . && make -j2"
-  - pycodestyle $PWD
+  - pycodestyle --exclude=thirdparty,.git $PWD
--- a/1
+++ b/1
@ -1,2 +1,3 @@
 FROM debian:testing
+RUN sed -i 's,deb.debian.org,ftp.debian.org,g' /etc/apt/sources.list
 RUN apt-get update && apt-get -y install build-essential cmake extra-cmake-modules gettext kio-dev libatasmart-dev libboost-python-dev libkf5config-dev libkf5coreaddons-dev libkf5i18n-dev libkf5iconthemes-dev libkf5parts-dev libkf5service-dev libkf5solid-dev libkpmcore4-dev libparted-dev libpolkit-qt5-1-dev libqt5svg5-dev libqt5webkit5-dev libyaml-cpp-dev os-prober pkg-config python3-dev qtbase5-dev qtdeclarative5-dev qttools5-dev qttools5-dev-tools 
--- a/HACKING.md
+++ b/HACKING.md
@ -26,10 +26,21 @@ Example:
 *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
 */
 ```
-Copyright holders must be physical or legal personalities. A statement such as `Copyright 2014, The FooBarQuux project` has no legal value if "The FooBarQuux project" is not the legal name of a person, company, incorporated organization, etc.
+Copyright holders must be physical or legal personalities. A statement such as
+`Copyright 2014, The FooBarQuux project` has no legal value if "The FooBarQuux
+project" is not the legal name of a person, company, incorporated
+organization, etc.
+
+Please add your name to files you touch when making any contribution (even if
+it's just a typo-fix which might not be copyrightable in all jurisdictions).

 Formatting
 ----------
+
+This formatting guide applies to C++ code only; for Python modules, we use
+[pycodestyle][https://github.com/PyCQA/pycodestyle] to apply a check of
+some PEP8 guidelines.
+
 * Spaces, not tabs.
 * Indentation is 4 spaces.
 * Lines should be limited to 90 characters.
@ -70,7 +81,9 @@ You can use the `hacking/calamaresstyle` script to run
 [astyle](http://astyle.sf.net) on your code and have it formatted the right
 way.

-**NOTE:** An .editorconfig file is included to assist with formatting. In order to take advantage of this functionality you will need to acquire the [EditorConfig](http://editorconfig.org/#download) plug-in for your editor.
+**NOTE:** An .editorconfig file is included to assist with formatting. In
+order to take advantage of this functionality you will need to acquire the
+[EditorConfig](http://editorconfig.org/#download) plug-in for your editor.

 Naming
 ------
--- a/lang/calamares_lt.ts
+++ b/lang/calamares_lt.ts
@ -1812,17 +1812,17 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.</translation>
    <message>
        <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="122"/>
        <source>is plugged in to a power source</source>
-        <translation>yra įjungtas į maitinimo šaltinį</translation>
+        <translation>prijungta prie maitinimo šaltinio</translation>
    </message>
    <message>
        <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="123"/>
        <source>The system is not plugged in to a power source.</source>
-        <translation>Sistema nėra įjungta į maitinimo šaltinį.</translation>
+        <translation>Sistema nėra prijungta prie maitinimo šaltinio.</translation>
    </message>
    <message>
        <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="130"/>
        <source>is connected to the Internet</source>
-        <translation>yra prijungtas prie Interneto</translation>
+        <translation>prijungta prie Interneto</translation>
    </message>
    <message>
        <location filename="../src/modules/welcome/checker/RequirementsChecker.cpp" line="131"/>
@ -2240,7 +2240,7 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.</translation>
    <message>
        <location filename="../src/modules/welcome/WelcomePage.cpp" line="56"/>
        <source>&lt;h1&gt;Welcome to the %1 installer.&lt;/h1&gt;</source>
-        <translation>&lt;h1&gt;Sveiki atvykę į %1 diegimo programą.&lt;/h1&gt;</translation>
+        <translation>&lt;h1&gt;Jus sveikina %1 diegimo programa.&lt;/h1&gt;</translation>
    </message>
    <message>
        <location filename="../src/modules/welcome/WelcomePage.cpp" line="70"/>
--- a/src/libcalamares/GlobalStorage.cpp
+++ b/src/libcalamares/GlobalStorage.cpp
@ -18,6 +18,8 @@

 #include "GlobalStorage.h"

+#include "utils/Logger.h"
+
 #ifdef WITH_PYTHON
 #include "PythonHelper.h"

@ -80,6 +82,15 @@ GlobalStorage::value( const QString& key ) const
    return m.value( key );
 }

+void
+GlobalStorage::debugDump() const
+{
+    for ( auto it = m.cbegin(); it != m.cend(); ++it )
+    {
+        cDebug() << it.key() << '\t' << it.value();
+    }
+}
+
 } // namespace Calamares

 #ifdef WITH_PYTHON
--- a/src/libcalamares/GlobalStorage.h
+++ b/src/libcalamares/GlobalStorage.h
@ -57,6 +57,8 @@ public:
    int remove( const QString& key );
    QVariant value( const QString& key ) const;

+    void debugDump() const;
+
 signals:
    void changed();

--- a/src/libcalamaresui/modulesystem/ViewModule.cpp
+++ b/src/libcalamaresui/modulesystem/ViewModule.cpp
@ -1,6 +1,7 @@
 /* === This file is part of Calamares - <http://github.com/calamares> ===
 *
 *   Copyright 2014, Teo Mrnjavac <teo@kde.org>
+ *   Copyright 2017, 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
@ -51,14 +52,14 @@ ViewModule::loadSelf()
        PluginFactory* pf = qobject_cast< PluginFactory* >( m_loader->instance() );
        if ( !pf )
        {
-            cDebug() << Q_FUNC_INFO << m_loader->errorString();
+            cDebug() << Q_FUNC_INFO << "No factory:" << m_loader->errorString();
            return;
        }

        m_viewStep = pf->create< Calamares::ViewStep >();
        if ( !m_viewStep )
        {
-            cDebug() << Q_FUNC_INFO << m_loader->errorString();
+            cDebug() << Q_FUNC_INFO << "create() failed" << m_loader->errorString();
            return;
        }
 //        cDebug() << "ViewModule loading self for instance" << instanceKey()
--- a/src/modules/dummypythonqt/lang/ar/LC_MESSAGES/dummypythonqt.mo
+++ b/src/modules/dummypythonqt/lang/ar/LC_MESSAGES/dummypythonqt.mo
--- a/src/modules/dummypythonqt/lang/ar/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/ar/LC_MESSAGES/dummypythonqt.po
@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-06-03 01:25+0000\n"
+"POT-Creation-Date: 2017-06-06 01:23+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Arabic (https://www.transifex.com/calamares/teams/20061/ar/)\n"
 "MIME-Version: 1.0\n"
--- a/src/modules/dummypythonqt/lang/ast/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/ast/LC_MESSAGES/dummypythonqt.po
@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-06-03 01:25+0000\n"
+"POT-Creation-Date: 2017-06-06 01:23+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: enolp <enolp@softastur.org>, 2017\n"
 "Language-Team: Asturian (https://www.transifex.com/calamares/teams/20061/ast/)\n"
--- a/src/modules/dummypythonqt/lang/bg/LC_MESSAGES/dummypythonqt.mo
+++ b/src/modules/dummypythonqt/lang/bg/LC_MESSAGES/dummypythonqt.mo
--- a/src/modules/dummypythonqt/lang/bg/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/bg/LC_MESSAGES/dummypythonqt.po
@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-06-03 01:25+0000\n"
+"POT-Creation-Date: 2017-06-06 01:23+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Bulgarian (https://www.transifex.com/calamares/teams/20061/bg/)\n"
 "MIME-Version: 1.0\n"
--- a/src/modules/dummypythonqt/lang/ca/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/ca/LC_MESSAGES/dummypythonqt.po
@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-06-03 01:25+0000\n"
+"POT-Creation-Date: 2017-06-06 01:23+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Davidmp <medipas@gmail.com>, 2016\n"
 "Language-Team: Catalan (https://www.transifex.com/calamares/teams/20061/ca/)\n"
--- a/src/modules/dummypythonqt/lang/cs_CZ/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/cs_CZ/LC_MESSAGES/dummypythonqt.po
@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-06-03 01:25+0000\n"
+"POT-Creation-Date: 2017-06-06 01:23+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: pavelrz <pavel@rzehak.cz>, 2016\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/calamares/teams/20061/cs_CZ/)\n"
--- a/src/modules/dummypythonqt/lang/da/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/da/LC_MESSAGES/dummypythonqt.po
@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-06-03 01:25+0000\n"
+"POT-Creation-Date: 2017-06-06 01:23+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: scootergrisen <scootergrisen@gmail.com>, 2017\n"
 "Language-Team: Danish (https://www.transifex.com/calamares/teams/20061/da/)\n"
--- a/src/modules/dummypythonqt/lang/de/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/de/LC_MESSAGES/dummypythonqt.po
@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-06-03 01:25+0000\n"
+"POT-Creation-Date: 2017-06-06 01:23+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Christian Spaan <gyges@gmx.net>, 2017\n"
 "Language-Team: German (https://www.transifex.com/calamares/teams/20061/de/)\n"
--- a/src/modules/dummypythonqt/lang/el/LC_MESSAGES/dummypythonqt.mo
+++ b/src/modules/dummypythonqt/lang/el/LC_MESSAGES/dummypythonqt.mo
--- a/src/modules/dummypythonqt/lang/el/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/el/LC_MESSAGES/dummypythonqt.po
@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-06-03 01:25+0000\n"
+"POT-Creation-Date: 2017-06-06 01:23+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Greek (https://www.transifex.com/calamares/teams/20061/el/)\n"
 "MIME-Version: 1.0\n"
--- a/src/modules/dummypythonqt/lang/en_GB/LC_MESSAGES/dummypythonqt.mo
+++ b/src/modules/dummypythonqt/lang/en_GB/LC_MESSAGES/dummypythonqt.mo
--- a/src/modules/dummypythonqt/lang/en_GB/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/en_GB/LC_MESSAGES/dummypythonqt.po
@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-06-03 01:25+0000\n"
+"POT-Creation-Date: 2017-06-06 01:23+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: English (United Kingdom) (https://www.transifex.com/calamares/teams/20061/en_GB/)\n"
 "MIME-Version: 1.0\n"
--- a/src/modules/dummypythonqt/lang/es/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/es/LC_MESSAGES/dummypythonqt.po
@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-06-03 01:25+0000\n"
+"POT-Creation-Date: 2017-06-06 01:23+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: strel <strelnic@gmail.com>, 2016\n"
 "Language-Team: Spanish (https://www.transifex.com/calamares/teams/20061/es/)\n"
--- a/src/modules/dummypythonqt/lang/es_ES/LC_MESSAGES/dummypythonqt.mo
+++ b/src/modules/dummypythonqt/lang/es_ES/LC_MESSAGES/dummypythonqt.mo
--- a/src/modules/dummypythonqt/lang/es_ES/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/es_ES/LC_MESSAGES/dummypythonqt.po
@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-06-03 01:25+0000\n"
+"POT-Creation-Date: 2017-06-06 01:23+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Spanish (Spain) (https://www.transifex.com/calamares/teams/20061/es_ES/)\n"
 "MIME-Version: 1.0\n"
--- a/src/modules/dummypythonqt/lang/es_MX/LC_MESSAGES/dummypythonqt.mo
+++ b/src/modules/dummypythonqt/lang/es_MX/LC_MESSAGES/dummypythonqt.mo
--- a/src/modules/dummypythonqt/lang/es_MX/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/es_MX/LC_MESSAGES/dummypythonqt.po
@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-06-03 01:25+0000\n"
+"POT-Creation-Date: 2017-06-06 01:23+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Spanish (Mexico) (https://www.transifex.com/calamares/teams/20061/es_MX/)\n"
 "MIME-Version: 1.0\n"
--- a/src/modules/dummypythonqt/lang/es_PR/LC_MESSAGES/dummypythonqt.mo
+++ b/src/modules/dummypythonqt/lang/es_PR/LC_MESSAGES/dummypythonqt.mo
--- a/src/modules/dummypythonqt/lang/es_PR/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/es_PR/LC_MESSAGES/dummypythonqt.po
@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-06-03 01:25+0000\n"
+"POT-Creation-Date: 2017-06-06 01:23+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Spanish (Puerto Rico) (https://www.transifex.com/calamares/teams/20061/es_PR/)\n"
 "MIME-Version: 1.0\n"
--- a/src/modules/dummypythonqt/lang/et/LC_MESSAGES/dummypythonqt.mo
+++ b/src/modules/dummypythonqt/lang/et/LC_MESSAGES/dummypythonqt.mo
--- a/src/modules/dummypythonqt/lang/et/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/et/LC_MESSAGES/dummypythonqt.po
@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-06-03 01:25+0000\n"
+"POT-Creation-Date: 2017-06-06 01:23+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Estonian (https://www.transifex.com/calamares/teams/20061/et/)\n"
 "MIME-Version: 1.0\n"
--- a/src/modules/dummypythonqt/lang/eu/LC_MESSAGES/dummypythonqt.mo
+++ b/src/modules/dummypythonqt/lang/eu/LC_MESSAGES/dummypythonqt.mo
--- a/src/modules/dummypythonqt/lang/eu/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/eu/LC_MESSAGES/dummypythonqt.po
@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-06-03 01:25+0000\n"
+"POT-Creation-Date: 2017-06-06 01:23+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Basque (https://www.transifex.com/calamares/teams/20061/eu/)\n"
 "MIME-Version: 1.0\n"
--- a/src/modules/dummypythonqt/lang/fa/LC_MESSAGES/dummypythonqt.mo
+++ b/src/modules/dummypythonqt/lang/fa/LC_MESSAGES/dummypythonqt.mo
--- a/src/modules/dummypythonqt/lang/fa/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/fa/LC_MESSAGES/dummypythonqt.po
@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-06-03 01:25+0000\n"
+"POT-Creation-Date: 2017-06-06 01:23+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Persian (https://www.transifex.com/calamares/teams/20061/fa/)\n"
 "MIME-Version: 1.0\n"
--- a/src/modules/dummypythonqt/lang/fi_FI/LC_MESSAGES/dummypythonqt.mo
+++ b/src/modules/dummypythonqt/lang/fi_FI/LC_MESSAGES/dummypythonqt.mo
--- a/src/modules/dummypythonqt/lang/fi_FI/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/fi_FI/LC_MESSAGES/dummypythonqt.po
@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-06-03 01:25+0000\n"
+"POT-Creation-Date: 2017-06-06 01:23+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/calamares/teams/20061/fi_FI/)\n"
 "MIME-Version: 1.0\n"
--- a/src/modules/dummypythonqt/lang/fr/LC_MESSAGES/dummypythonqt.mo
+++ b/src/modules/dummypythonqt/lang/fr/LC_MESSAGES/dummypythonqt.mo
--- a/src/modules/dummypythonqt/lang/fr/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/fr/LC_MESSAGES/dummypythonqt.po
@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-06-03 01:25+0000\n"
+"POT-Creation-Date: 2017-06-06 01:23+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: French (https://www.transifex.com/calamares/teams/20061/fr/)\n"
 "MIME-Version: 1.0\n"
--- a/src/modules/dummypythonqt/lang/fr_CH/LC_MESSAGES/dummypythonqt.mo
+++ b/src/modules/dummypythonqt/lang/fr_CH/LC_MESSAGES/dummypythonqt.mo
--- a/src/modules/dummypythonqt/lang/fr_CH/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/fr_CH/LC_MESSAGES/dummypythonqt.po
@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-06-03 01:25+0000\n"
+"POT-Creation-Date: 2017-06-06 01:23+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: French (Switzerland) (https://www.transifex.com/calamares/teams/20061/fr_CH/)\n"
 "MIME-Version: 1.0\n"
--- a/src/modules/dummypythonqt/lang/gl/LC_MESSAGES/dummypythonqt.mo
+++ b/src/modules/dummypythonqt/lang/gl/LC_MESSAGES/dummypythonqt.mo
--- a/src/modules/dummypythonqt/lang/gl/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/gl/LC_MESSAGES/dummypythonqt.po
@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-06-03 01:25+0000\n"
+"POT-Creation-Date: 2017-06-06 01:23+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Galician (https://www.transifex.com/calamares/teams/20061/gl/)\n"
 "MIME-Version: 1.0\n"
--- a/src/modules/dummypythonqt/lang/gu/LC_MESSAGES/dummypythonqt.mo
+++ b/src/modules/dummypythonqt/lang/gu/LC_MESSAGES/dummypythonqt.mo
--- a/src/modules/dummypythonqt/lang/gu/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/gu/LC_MESSAGES/dummypythonqt.po
@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-06-03 01:25+0000\n"
+"POT-Creation-Date: 2017-06-06 01:23+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Gujarati (https://www.transifex.com/calamares/teams/20061/gu/)\n"
 "MIME-Version: 1.0\n"
--- a/src/modules/dummypythonqt/lang/hi/LC_MESSAGES/dummypythonqt.mo
+++ b/src/modules/dummypythonqt/lang/hi/LC_MESSAGES/dummypythonqt.mo
--- a/src/modules/dummypythonqt/lang/hi/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/hi/LC_MESSAGES/dummypythonqt.po
@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-06-03 01:25+0000\n"
+"POT-Creation-Date: 2017-06-06 01:23+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Hindi (https://www.transifex.com/calamares/teams/20061/hi/)\n"
 "MIME-Version: 1.0\n"
--- a/src/modules/dummypythonqt/lang/hr/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/hr/LC_MESSAGES/dummypythonqt.po
@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-06-03 01:25+0000\n"
+"POT-Creation-Date: 2017-06-06 01:23+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Lovro Kudelić <lovro.kudelic@outlook.com>, 2016\n"
 "Language-Team: Croatian (https://www.transifex.com/calamares/teams/20061/hr/)\n"
--- a/src/modules/dummypythonqt/lang/hu/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/hu/LC_MESSAGES/dummypythonqt.po
@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-06-03 01:25+0000\n"
+"POT-Creation-Date: 2017-06-06 01:23+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Lajos Pasztor <mrlajos@gmail.com>, 2016\n"
 "Language-Team: Hungarian (https://www.transifex.com/calamares/teams/20061/hu/)\n"
--- a/src/modules/dummypythonqt/lang/id/LC_MESSAGES/dummypythonqt.mo
+++ b/src/modules/dummypythonqt/lang/id/LC_MESSAGES/dummypythonqt.mo
--- a/src/modules/dummypythonqt/lang/id/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/id/LC_MESSAGES/dummypythonqt.po
@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-06-03 01:25+0000\n"
+"POT-Creation-Date: 2017-06-06 01:23+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Kukuh Syafaat <syafaatkukuh@gmail.com>, 2016\n"
 "Language-Team: Indonesian (https://www.transifex.com/calamares/teams/20061/id/)\n"
--- a/src/modules/dummypythonqt/lang/is/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/is/LC_MESSAGES/dummypythonqt.po
@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-06-03 01:25+0000\n"
+"POT-Creation-Date: 2017-06-06 01:23+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Kristján Magnússon <kristjanmagnus@gmail.com>, 2017\n"
 "Language-Team: Icelandic (https://www.transifex.com/calamares/teams/20061/is/)\n"
--- a/src/modules/dummypythonqt/lang/it_IT/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/it_IT/LC_MESSAGES/dummypythonqt.po
@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-06-03 01:25+0000\n"
+"POT-Creation-Date: 2017-06-06 01:23+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Saverio <saverio.brancaccio@gmail.com>, 2016\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/calamares/teams/20061/it_IT/)\n"
--- a/src/modules/dummypythonqt/lang/ja/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/ja/LC_MESSAGES/dummypythonqt.po
@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-06-03 01:25+0000\n"
+"POT-Creation-Date: 2017-06-06 01:23+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Takefumi Nagata <take1975@kumamoto.email.ne.jp>, 2016\n"
 "Language-Team: Japanese (https://www.transifex.com/calamares/teams/20061/ja/)\n"
--- a/src/modules/dummypythonqt/lang/kk/LC_MESSAGES/dummypythonqt.mo
+++ b/src/modules/dummypythonqt/lang/kk/LC_MESSAGES/dummypythonqt.mo
--- a/src/modules/dummypythonqt/lang/kk/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/kk/LC_MESSAGES/dummypythonqt.po
@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-06-03 01:25+0000\n"
+"POT-Creation-Date: 2017-06-06 01:23+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Kazakh (https://www.transifex.com/calamares/teams/20061/kk/)\n"
 "MIME-Version: 1.0\n"
--- a/src/modules/dummypythonqt/lang/lo/LC_MESSAGES/dummypythonqt.mo
+++ b/src/modules/dummypythonqt/lang/lo/LC_MESSAGES/dummypythonqt.mo
--- a/src/modules/dummypythonqt/lang/lo/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/lo/LC_MESSAGES/dummypythonqt.po
@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-06-03 01:25+0000\n"
+"POT-Creation-Date: 2017-06-06 01:23+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Lao (https://www.transifex.com/calamares/teams/20061/lo/)\n"
 "MIME-Version: 1.0\n"
--- a/src/modules/dummypythonqt/lang/lt/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/lt/LC_MESSAGES/dummypythonqt.po
@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-06-03 01:25+0000\n"
+"POT-Creation-Date: 2017-06-06 01:23+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Moo <moose@mail.ru>, 2016\n"
 "Language-Team: Lithuanian (https://www.transifex.com/calamares/teams/20061/lt/)\n"
--- a/src/modules/dummypythonqt/lang/mr/LC_MESSAGES/dummypythonqt.mo
+++ b/src/modules/dummypythonqt/lang/mr/LC_MESSAGES/dummypythonqt.mo
--- a/src/modules/dummypythonqt/lang/mr/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/mr/LC_MESSAGES/dummypythonqt.po
@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-06-03 01:25+0000\n"
+"POT-Creation-Date: 2017-06-06 01:23+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Marathi (https://www.transifex.com/calamares/teams/20061/mr/)\n"
 "MIME-Version: 1.0\n"
--- a/src/modules/dummypythonqt/lang/nb/LC_MESSAGES/dummypythonqt.mo
+++ b/src/modules/dummypythonqt/lang/nb/LC_MESSAGES/dummypythonqt.mo
--- a/src/modules/dummypythonqt/lang/nb/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/nb/LC_MESSAGES/dummypythonqt.po
@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-06-03 01:25+0000\n"
+"POT-Creation-Date: 2017-06-06 01:23+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/calamares/teams/20061/nb/)\n"
 "MIME-Version: 1.0\n"
--- a/src/modules/dummypythonqt/lang/nl/LC_MESSAGES/dummypythonqt.mo
+++ b/src/modules/dummypythonqt/lang/nl/LC_MESSAGES/dummypythonqt.mo
--- a/src/modules/dummypythonqt/lang/nl/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/nl/LC_MESSAGES/dummypythonqt.po
@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-06-03 01:25+0000\n"
+"POT-Creation-Date: 2017-06-06 01:23+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: De Zeeappel <zeeappel@gmail.com>, 2016\n"
 "Language-Team: Dutch (https://www.transifex.com/calamares/teams/20061/nl/)\n"
--- a/src/modules/dummypythonqt/lang/pl/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/pl/LC_MESSAGES/dummypythonqt.po
@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-06-03 01:25+0000\n"
+"POT-Creation-Date: 2017-06-06 01:23+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: m4sk1n <m4sk1n@vivaldi.net>, 2016\n"
 "Language-Team: Polish (https://www.transifex.com/calamares/teams/20061/pl/)\n"
--- a/src/modules/dummypythonqt/lang/pl_PL/LC_MESSAGES/dummypythonqt.mo
+++ b/src/modules/dummypythonqt/lang/pl_PL/LC_MESSAGES/dummypythonqt.mo
--- a/src/modules/dummypythonqt/lang/pl_PL/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/pl_PL/LC_MESSAGES/dummypythonqt.po
@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-06-03 01:25+0000\n"
+"POT-Creation-Date: 2017-06-06 01:23+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Polish (Poland) (https://www.transifex.com/calamares/teams/20061/pl_PL/)\n"
 "MIME-Version: 1.0\n"
--- a/src/modules/dummypythonqt/lang/pt_BR/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/pt_BR/LC_MESSAGES/dummypythonqt.po
@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-06-03 01:25+0000\n"
+"POT-Creation-Date: 2017-06-06 01:23+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Rodrigo de Almeida Sottomaior Macedo <rmsolucoeseminformatic4@gmail.com>, 2017\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/calamares/teams/20061/pt_BR/)\n"
--- a/src/modules/dummypythonqt/lang/pt_PT/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/pt_PT/LC_MESSAGES/dummypythonqt.po
@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-06-03 01:25+0000\n"
+"POT-Creation-Date: 2017-06-06 01:23+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Ricardo Simões <xmcorporation@gmail.com>, 2016\n"
 "Language-Team: Portuguese (Portugal) (https://www.transifex.com/calamares/teams/20061/pt_PT/)\n"
--- a/src/modules/dummypythonqt/lang/ro/LC_MESSAGES/dummypythonqt.mo
+++ b/src/modules/dummypythonqt/lang/ro/LC_MESSAGES/dummypythonqt.mo
--- a/src/modules/dummypythonqt/lang/ro/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/ro/LC_MESSAGES/dummypythonqt.po
@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-06-03 01:25+0000\n"
+"POT-Creation-Date: 2017-06-06 01:23+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Baadur Jobava <jobaval10n@gmail.com>, 2016\n"
 "Language-Team: Romanian (https://www.transifex.com/calamares/teams/20061/ro/)\n"
--- a/src/modules/dummypythonqt/lang/ru/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/ru/LC_MESSAGES/dummypythonqt.po
@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-06-03 01:25+0000\n"
+"POT-Creation-Date: 2017-06-06 01:23+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Вадим Сабынич <vadim@sabini.ch>, 2017\n"
 "Language-Team: Russian (https://www.transifex.com/calamares/teams/20061/ru/)\n"
--- a/src/modules/dummypythonqt/lang/sk/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/sk/LC_MESSAGES/dummypythonqt.po
@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-06-03 01:25+0000\n"
+"POT-Creation-Date: 2017-06-06 01:23+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Dušan Kazik <prescott66@gmail.com>, 2016\n"
 "Language-Team: Slovak (https://www.transifex.com/calamares/teams/20061/sk/)\n"
--- a/src/modules/dummypythonqt/lang/sl/LC_MESSAGES/dummypythonqt.mo
+++ b/src/modules/dummypythonqt/lang/sl/LC_MESSAGES/dummypythonqt.mo
--- a/src/modules/dummypythonqt/lang/sl/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/sl/LC_MESSAGES/dummypythonqt.po
@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-06-03 01:25+0000\n"
+"POT-Creation-Date: 2017-06-06 01:23+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Slovenian (https://www.transifex.com/calamares/teams/20061/sl/)\n"
 "MIME-Version: 1.0\n"
--- a/src/modules/dummypythonqt/lang/sr/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/sr/LC_MESSAGES/dummypythonqt.po
@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-06-03 01:25+0000\n"
+"POT-Creation-Date: 2017-06-06 01:23+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Slobodan Simić <slsimic@gmail.com>, 2017\n"
 "Language-Team: Serbian (https://www.transifex.com/calamares/teams/20061/sr/)\n"
--- a/src/modules/dummypythonqt/lang/sr@latin/LC_MESSAGES/dummypythonqt.mo
+++ b/src/modules/dummypythonqt/lang/sr@latin/LC_MESSAGES/dummypythonqt.mo
--- a/src/modules/dummypythonqt/lang/sr@latin/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/sr@latin/LC_MESSAGES/dummypythonqt.po
@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-06-03 01:25+0000\n"
+"POT-Creation-Date: 2017-06-06 01:23+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Serbian (Latin) (https://www.transifex.com/calamares/teams/20061/sr@latin/)\n"
 "MIME-Version: 1.0\n"
--- a/src/modules/dummypythonqt/lang/sv/LC_MESSAGES/dummypythonqt.mo
+++ b/src/modules/dummypythonqt/lang/sv/LC_MESSAGES/dummypythonqt.mo
--- a/src/modules/dummypythonqt/lang/sv/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/sv/LC_MESSAGES/dummypythonqt.po
@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-06-03 01:25+0000\n"
+"POT-Creation-Date: 2017-06-06 01:23+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Swedish (https://www.transifex.com/calamares/teams/20061/sv/)\n"
 "MIME-Version: 1.0\n"
--- a/src/modules/dummypythonqt/lang/th/LC_MESSAGES/dummypythonqt.mo
+++ b/src/modules/dummypythonqt/lang/th/LC_MESSAGES/dummypythonqt.mo
--- a/src/modules/dummypythonqt/lang/th/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/th/LC_MESSAGES/dummypythonqt.po
@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-06-03 01:25+0000\n"
+"POT-Creation-Date: 2017-06-06 01:23+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Thai (https://www.transifex.com/calamares/teams/20061/th/)\n"
 "MIME-Version: 1.0\n"
--- a/src/modules/dummypythonqt/lang/tr_TR/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/tr_TR/LC_MESSAGES/dummypythonqt.po
@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-06-03 01:25+0000\n"
+"POT-Creation-Date: 2017-06-06 01:23+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Demiray Muhterem <mdemiray@msn.com>, 2016\n"
 "Language-Team: Turkish (Turkey) (https://www.transifex.com/calamares/teams/20061/tr_TR/)\n"
--- a/src/modules/dummypythonqt/lang/uk/LC_MESSAGES/dummypythonqt.mo
+++ b/src/modules/dummypythonqt/lang/uk/LC_MESSAGES/dummypythonqt.mo
--- a/src/modules/dummypythonqt/lang/uk/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/uk/LC_MESSAGES/dummypythonqt.po
@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-06-03 01:25+0000\n"
+"POT-Creation-Date: 2017-06-06 01:23+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Ukrainian (https://www.transifex.com/calamares/teams/20061/uk/)\n"
 "MIME-Version: 1.0\n"
--- a/src/modules/dummypythonqt/lang/ur/LC_MESSAGES/dummypythonqt.mo
+++ b/src/modules/dummypythonqt/lang/ur/LC_MESSAGES/dummypythonqt.mo
--- a/src/modules/dummypythonqt/lang/ur/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/ur/LC_MESSAGES/dummypythonqt.po
@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-06-03 01:25+0000\n"
+"POT-Creation-Date: 2017-06-06 01:23+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Urdu (https://www.transifex.com/calamares/teams/20061/ur/)\n"
 "MIME-Version: 1.0\n"
--- a/src/modules/dummypythonqt/lang/uz/LC_MESSAGES/dummypythonqt.mo
+++ b/src/modules/dummypythonqt/lang/uz/LC_MESSAGES/dummypythonqt.mo
--- a/src/modules/dummypythonqt/lang/uz/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/uz/LC_MESSAGES/dummypythonqt.po
@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-06-03 01:25+0000\n"
+"POT-Creation-Date: 2017-06-06 01:23+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uzbek (https://www.transifex.com/calamares/teams/20061/uz/)\n"
 "MIME-Version: 1.0\n"
--- a/src/modules/dummypythonqt/lang/zh_CN/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/zh_CN/LC_MESSAGES/dummypythonqt.po
@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-06-03 01:25+0000\n"
+"POT-Creation-Date: 2017-06-06 01:23+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Mingcong Bai <jeffbai@aosc.xyz>, 2017\n"
 "Language-Team: Chinese (China) (https://www.transifex.com/calamares/teams/20061/zh_CN/)\n"
--- a/src/modules/dummypythonqt/lang/zh_TW/LC_MESSAGES/dummypythonqt.po
+++ b/src/modules/dummypythonqt/lang/zh_TW/LC_MESSAGES/dummypythonqt.po
@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-06-03 01:25+0000\n"
+"POT-Creation-Date: 2017-06-06 01:23+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Jeff Huang <s8321414@gmail.com>, 2016\n"
 "Language-Team: Chinese (Taiwan) (https://www.transifex.com/calamares/teams/20061/zh_TW/)\n"
--- a/src/modules/fstab/main.py
+++ b/src/modules/fstab/main.py
@ -5,6 +5,7 @@
 #
 #   Copyright 2014, Aurélien Gâteau <agateau@kde.org>
 #   Copyright 2016, Teo Mrnjavac <teo@kde.org>
+#   Copyright 2017, Alf Gaida <agaida@siduction.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
@ -32,7 +33,7 @@ FSTAB_HEADER = """# /etc/fstab: static file system information.
 # be used with UUID= as a more robust way to name devices that works even if
 # disks are added and removed. See fstab(5).
 #
-# <file system>                           <mount point>  <type>  <options>  <dump>  <pass>"""
+# <file system>             <mount point>  <type>  <options>  <dump>  <pass>"""

 CRYPTTAB_HEADER = """# /etc/crypttab: mappings for encrypted partitions.
 #
@ -46,7 +47,7 @@ CRYPTTAB_HEADER = """# /etc/crypttab: mappings for encrypted partitions.
 #       to encrypted swap, which should be set up with mkinitcpio-openswap
 #       for resume support.
 #
-# <name>               <device>                                     <password> <options>"""
+# <name>               <device>                         <password> <options>"""

 # Turn Parted filesystem names into fstab names
 FS_MAP = {
@ -168,7 +169,7 @@ class FstabGenerator(object):
                                           dct["device"],
                                           dct["password"],
                                           dct["options"],
-                                          )
+                                           )

        print(line, file=file)

@ -181,8 +182,10 @@ class FstabGenerator(object):
            print(FSTAB_HEADER, file=fstab_file)

            for partition in self.partitions:
-                # Special treatment for a btrfs root with @ and @home subvolumes
-                if partition["fs"] == "btrfs" and partition["mountPoint"] == "/":
+                # Special treatment for a btrfs root with @ and @home
+                # subvolumes
+                if (partition["fs"] == "btrfs"
+                   and partition["mountPoint"] == "/"):
                    output = subprocess.check_output(['btrfs',
                                                      'subvolume',
                                                      'list',
@ -216,7 +219,7 @@ class FstabGenerator(object):
                           fs="tmpfs",
                           options="defaults,noatime,mode=1777",
                           check=0,
-                          )
+                           )
                self.print_fstab_line(dct, file=fstab_file)

    def generate_fstab_line_info(self, partition):
@ -249,13 +252,15 @@ class FstabGenerator(object):
            self.root_is_ssd = is_ssd

        if filesystem == "btrfs" and "subvol" in partition:
-            return dict(device="UUID=" + partition["uuid"],
-                        mount_point=mount_point,
-                        fs=filesystem,
-                        options=",".join(["subvol={}".format(partition["subvol"]),
-                                          options]),
-                        check=check,
-                        )
+            return dict(
+                device="UUID=" + partition["uuid"],
+                mount_point=mount_point,
+                fs=filesystem,
+                options=",".join(
+                    ["subvol={}".format(partition["subvol"]), options]
+                    ),
+                check=check,
+                )

        return dict(device="UUID=" + partition["uuid"],
                    mount_point=mount_point or "swap",
@ -266,12 +271,12 @@ class FstabGenerator(object):

    def print_fstab_line(self, dct, file=None):
        """ Prints line to '/etc/fstab' file. """
-        line = "{:41} {:<14} {:<7} {:<10} 0       {}".format(dct["device"],
-                                                             dct["mount_point"],
-                                                             dct["fs"],
-                                                             dct["options"],
-                                                             dct["check"],
-                                                            )
+        line = "{:41} {:<14} {:<7} {:<10} 0 {}".format(dct["device"],
+                                                       dct["mount_point"],
+                                                       dct["fs"],
+                                                       dct["options"],
+                                                       dct["check"],
+                                                       )
        print(line, file=file)

    def create_mount_points(self):
--- a/src/modules/grubcfg/main.py
+++ b/src/modules/grubcfg/main.py
@ -5,6 +5,7 @@
 #
 #   Copyright 2014-2015, Philip Müller <philm@manjaro.org>
 #   Copyright 2015-2017, Teo Mrnjavac <teo@kde.org>
+#   Copyright 2017, Alf Gaida <agaida@siduction.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
@ -25,7 +26,8 @@ import re


 def modify_grub_default(partitions, root_mount_point, distributor):
-    """ Configures '/etc/default/grub' for hibernation and plymouth.
+    """
+    Configures '/etc/default/grub' for hibernation and plymouth.

    :param partitions:
    :param root_mount_point:
@ -35,7 +37,9 @@ def modify_grub_default(partitions, root_mount_point, distributor):
    default_dir = os.path.join(root_mount_point, "etc/default")
    default_grub = os.path.join(default_dir, "grub")
    distributor_replace = distributor.replace("'", "'\\''")
-    dracut_bin = libcalamares.utils.target_env_call(["sh", "-c", "which dracut"])
+    dracut_bin = libcalamares.utils.target_env_call(
+        ["sh", "-c", "which dracut"]
+        )
    use_splash = ""
    swap_uuid = ""
    swap_outer_uuid = ""
@ -51,20 +55,26 @@ def modify_grub_default(partitions, root_mount_point, distributor):
            if partition["fs"] == "linuxswap":
                swap_uuid = partition["uuid"]

-            if partition["fs"] == "linuxswap" and "luksMapperName" in partition:
+            if (partition["fs"] == "linuxswap"
+                    and "luksMapperName" in partition):
                swap_outer_uuid = partition["luksUuid"]

-            if partition["mountPoint"] == "/" and "luksMapperName" in partition:
-                cryptdevice_params = ["rd.luks.uuid={!s}".format(partition["luksUuid"])]
+            if (partition["mountPoint"] == "/"
+                    and "luksMapperName" in partition):
+                cryptdevice_params = [
+                    "rd.luks.uuid={!s}".format(partition["luksUuid"])
+                    ]
    else:
        for partition in partitions:
            if partition["fs"] == "linuxswap":
                swap_uuid = partition["uuid"]

-            if partition["mountPoint"] == "/" and "luksMapperName" in partition:
+            if (partition["mountPoint"] == "/"
+                    and "luksMapperName" in partition):
                cryptdevice_params = [
-                    "cryptdevice=UUID={!s}:{!s}".format(partition["luksUuid"],
-                                                        partition["luksMapperName"]),
+                    "cryptdevice=UUID={!s}:{!s}".format(
+                        partition["luksUuid"], partition["luksMapperName"]
+                        ),
                    "root=/dev/mapper/{!s}".format(partition["luksMapperName"])
                ]

@ -101,7 +111,9 @@ def modify_grub_default(partitions, root_mount_point, distributor):

        for i in range(len(lines)):
            if lines[i].startswith("#GRUB_CMDLINE_LINUX_DEFAULT"):
-                kernel_cmd = "GRUB_CMDLINE_LINUX_DEFAULT=\"{!s}\"".format(" ".join(kernel_params))
+                kernel_cmd = "GRUB_CMDLINE_LINUX_DEFAULT=\"{!s}\"".format(
+                    " ".join(kernel_params)
+                    )
                lines[i] = kernel_cmd
                have_kernel_cmd = True
            elif lines[i].startswith("GRUB_CMDLINE_LINUX_DEFAULT"):
@ -118,20 +130,26 @@ def modify_grub_default(partitions, root_mount_point, distributor):
                for existing_param in existing_params:
                    existing_param_name = existing_param.split("=")[0]

-                    if existing_param_name not in ["quiet", "resume", "splash"]:  # the only ones we ever add
+                    # the only ones we ever add
+                    if existing_param_name not in [
+                            "quiet", "resume", "splash"]:
                        kernel_params.append(existing_param)

-                kernel_cmd = "GRUB_CMDLINE_LINUX_DEFAULT=\"{!s}\"".format(" ".join(kernel_params))
+                kernel_cmd = "GRUB_CMDLINE_LINUX_DEFAULT=\"{!s}\"".format(
+                    " ".join(kernel_params)
+                    )
                lines[i] = kernel_cmd
                have_kernel_cmd = True
-            elif lines[i].startswith("#GRUB_DISTRIBUTOR") or lines[i].startswith("GRUB_DISTRIBUTOR"):
+            elif (lines[i].startswith("#GRUB_DISTRIBUTOR")
+                  or lines[i].startswith("GRUB_DISTRIBUTOR")):
                lines[i] = distributor_line
                have_distributor_line = True
    else:
        lines = []

        if "defaults" in libcalamares.job.configuration:
-            for key, value in libcalamares.job.configuration["defaults"].items():
+            for key, value in libcalamares.job.configuration[
+                    "defaults"].items():
                if value.__class__.__name__ == "bool":
                    if value:
                        escaped_value = "true"
@ -143,7 +161,9 @@ def modify_grub_default(partitions, root_mount_point, distributor):
                lines.append("{!s}='{!s}'".format(key, escaped_value))

    if not have_kernel_cmd:
-        kernel_cmd = "GRUB_CMDLINE_LINUX_DEFAULT=\"{!s}\"".format(" ".join(kernel_params))
+        kernel_cmd = "GRUB_CMDLINE_LINUX_DEFAULT=\"{!s}\"".format(
+            " ".join(kernel_params)
+            )
        lines.append(kernel_cmd)

    if not have_distributor_line:
@ -159,14 +179,16 @@ def modify_grub_default(partitions, root_mount_point, distributor):


 def run():
-    """ Calls routine with given parameters to modify '/etc/default/grub'.
+    """
+    Calls routine with given parameters to modify '/etc/default/grub'.

    :return:
    """

    fw_type = libcalamares.globalstorage.value("firmwareType")

-    if libcalamares.globalstorage.value("bootLoader") is None and fw_type != "efi":
+    if (libcalamares.globalstorage.value("bootLoader") is None
+            and fw_type != "efi"):
        return None

    partitions = libcalamares.globalstorage.value("partitions")
@ -175,7 +197,8 @@ def run():
        esp_found = False

        for partition in partitions:
-            if partition["mountPoint"] == libcalamares.globalstorage.value("efiSystemPartition"):
+            if (partition["mountPoint"]
+                    == libcalamares.globalstorage.value("efiSystemPartition")):
                esp_found = True

        if not esp_found:
--- a/src/modules/hwclock/main.py
+++ b/src/modules/hwclock/main.py
@ -5,6 +5,7 @@
 #
 #   Copyright 2014 - 2015, Philip Müller <philm@manjaro.org>
 #   Copyright 2014, Teo Mrnjavac <teo@kde.org>
+#   Copyright 2017. Alf Gaida <agaida@siduction.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
@ -26,13 +27,18 @@ import libcalamares


 def run():
-    """ Set hardware clock """
+    """
+    Set hardware clock
+    """

    root_mount_point = libcalamares.globalstorage.value("rootMountPoint")
    try:
        subprocess.check_call(["hwclock", "--systohc", "--utc"])
    except subprocess.CalledProcessError as e:
-        return "Cannot set hardware clock.", "hwclock terminated with exit code {}.".format(e.returncode)
+        return (
+            "Cannot set hardware clock.",
+            "hwclock terminated with exit code {}.".format(e.returncode)
+            )

    shutil.copy2("/etc/adjtime", "{!s}/etc/".format(root_mount_point))

--- a/src/modules/initcpiocfg/main.py
+++ b/src/modules/initcpiocfg/main.py
@ -5,6 +5,7 @@
 #
 #   Copyright 2014, Rohan Garg <rohan@kde.org>
 #   Copyright 2015, Philip Müller <philm@manjaro.org>
+#   Copyright 2017, Alf Gaida <agaida@sidution.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
@ -25,7 +26,9 @@ from collections import OrderedDict


 def cpuinfo():
-    """ Return the information in /proc/cpuinfo as a dictionary in the following format:
+    """
+    Return the information in /proc/cpuinfo as a dictionary in the following
+    format:

    cpu_info['proc0']={...}
    cpu_info['proc1']={...}
@ -45,7 +48,8 @@ def cpuinfo():
                procinfo = OrderedDict()
            else:
                if len(line.split(':')) == 2:
-                    procinfo[line.split(':')[0].strip()] = line.split(':')[1].strip()
+                    splitted_line = line.split(':')[1].strip()
+                    procinfo[line.split(':')[0].strip()] = splitted_line
                else:
                    procinfo[line.split(':')[0].strip()] = ''

@ -53,7 +57,8 @@ def cpuinfo():


 def write_mkinitcpio_lines(hooks, modules, files, root_mount_point):
-    """ Set up mkinitcpio.conf.
+    """
+    Set up mkinitcpio.conf.

    :param hooks:
    :param modules:
@ -81,7 +86,8 @@ def write_mkinitcpio_lines(hooks, modules, files, root_mount_point):


 def modify_mkinitcpio_conf(partitions, root_mount_point):
-    """ Modifies mkinitcpio.conf
+    """
+    Modifies mkinitcpio.conf

    :param partitions:
    :param root_mount_point:
@ -89,7 +95,8 @@ def modify_mkinitcpio_conf(partitions, root_mount_point):
    cpu = cpuinfo()
    swap_uuid = ""
    btrfs = ""
-    hooks = ["base", "udev", "autodetect", "modconf", "block", "keyboard", "keymap"]
+    hooks = ["base", "udev", "autodetect", "modconf", "block", "keyboard",
+             "keymap"]
    modules = []
    files = []
    encrypt_hook = False
@ -113,25 +120,29 @@ def modify_mkinitcpio_conf(partitions, root_mount_point):
        if partition["mountPoint"] == "/" and "luksMapperName" in partition:
            encrypt_hook = True

-        if partition["mountPoint"] == "/boot" and "luksMapperName" not in partition:
+        if (partition["mountPoint"] == "/boot"
+                and "luksMapperName" not in partition):
            unencrypted_separate_boot = True

    if encrypt_hook:
        hooks.append("encrypt")
        if not unencrypted_separate_boot and \
-           os.path.isfile(os.path.join(root_mount_point, "crypto_keyfile.bin")):
+           os.path.isfile(
+               os.path.join(root_mount_point, "crypto_keyfile.bin")
+               ):
            files.append("/crypto_keyfile.bin")

-    if swap_uuid is not "":
+    if swap_uuid != "":
        if encrypt_hook and openswap_hook:
            hooks.extend(["openswap"])
        hooks.extend(["resume", "filesystems"])
    else:
        hooks.extend(["filesystems"])

-    if btrfs is "yes" and cpu['proc0']['vendor_id'].lower() != "genuineintel":
+    if btrfs == "yes" and cpu['proc0']['vendor_id'].lower() != "genuineintel":
        modules.append("crc32c")
-    elif btrfs is "yes" and cpu['proc0']['vendor_id'].lower() == "genuineintel":
+    elif (btrfs == "yes"
+          and cpu['proc0']['vendor_id'].lower() == "genuineintel"):
        modules.append("crc32c-intel")
    else:
        hooks.append("fsck")
@ -140,7 +151,8 @@ def modify_mkinitcpio_conf(partitions, root_mount_point):


 def run():
-    """ Calls routine with given parameters to modify '/etc/mkinitcpio.conf'.
+    """
+    Calls routine with given parameters to modify '/etc/mkinitcpio.conf'.

    :return:
    """
--- a/src/modules/initramfs/main.py
+++ b/src/modules/initramfs/main.py
@ -4,6 +4,7 @@
 # === This file is part of Calamares - <http://github.com/calamares> ===
 #
 #   Copyright 2014, Philip Müller <philm@manjaro.org>
+#   Copyright 2017, Alf Gaida <agaida@siduction.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
@ -29,4 +30,7 @@ def run():
    return_code = target_env_call(["update-initramfs", "-k", "all", "-u"])

    if return_code != 0:
-        return "Failed to run update-initramfs on the target", "The exit code was {}".format(return_code)
+        return (
+            "Failed to run update-initramfs on the target",
+            "The exit code was {}".format(return_code)
+            )
--- a/src/modules/initramfscfg/main.py
+++ b/src/modules/initramfscfg/main.py
@ -7,6 +7,7 @@
 #   Copyright 2015, Philip Müller <philm@manjaro.org>
 #   Copyright 2016, David McKinney <mckinney@subgraph.com>
 #   Copyright 2016, Kevin Kofler <kevin.kofler@chello.at>
+#   Copyright 2017, Alf Gaida <agaida@siduction.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
@ -25,8 +26,10 @@ import libcalamares
 import os
 import shutil

+
 def copy_initramfs_hooks(partitions, root_mount_point):
-    """ Copies initramfs hooks so they are picked up by update-initramfs
+    """
+    Copies initramfs hooks so they are picked up by update-initramfs

    :param partitions:
    :param root_mount_point:
@ -38,18 +41,29 @@ def copy_initramfs_hooks(partitions, root_mount_point):
        if partition["mountPoint"] == "/" and "luksMapperName" in partition:
            encrypt_hook = True

-        if partition["mountPoint"] == "/boot" and "luksMapperName" not in partition:
+        if (partition["mountPoint"] == "/boot"
+                and "luksMapperName" not in partition):
            unencrypted_separate_boot = True

    if encrypt_hook:
+        target = "{!s}/usr/share/initramfs-tools/hooks/encrypt_hook".format(
+                    root_mount_point)
        if unencrypted_separate_boot:
-            shutil.copy2("/usr/lib/calamares/modules/initramfscfg/encrypt_hook_nokey", "{!s}/usr/share/initramfs-tools/hooks/encrypt_hook".format(root_mount_point))
+            shutil.copy2(
+                "/usr/lib/calamares/modules/initramfscfg/encrypt_hook_nokey",
+                target
+                )
        else:
-            shutil.copy2("/usr/lib/calamares/modules/initramfscfg/encrypt_hook", "{!s}/usr/share/initramfs-tools/hooks/".format(root_mount_point))
-        os.chmod("{!s}/usr/share/initramfs-tools/hooks/encrypt_hook".format(root_mount_point), 0o755)
+            shutil.copy2(
+                "/usr/lib/calamares/modules/initramfscfg/encrypt_hook",
+                target
+                )
+        os.chmod(target, 0o755)
+

 def run():
-    """ Calls routine with given parameters to configure initramfs
+    """
+    Calls routine with given parameters to configure initramfs

    :return:
    """
--- a/src/modules/keyboard/KeyboardPage.cpp
+++ b/src/modules/keyboard/KeyboardPage.cpp
@ -323,6 +323,7 @@ KeyboardPage::onListVariantCurrentItemChanged( QListWidgetItem* current, QListWi
        QProcess::execute( QString( "setxkbmap -layout \"%1\" -variant \"%2\"" )
                           .arg( layout, variant ).toUtf8() );
        cDebug() << "xkbmap selection changed to: " << layout << "-" << variant;
+        m_setxkbmapTimer.disconnect( this );
    } );
    m_setxkbmapTimer.start( QApplication::keyboardInputInterval() );

--- a/src/modules/locale/LCLocaleDialog.cpp
+++ b/src/modules/locale/LCLocaleDialog.cpp
@ -69,6 +69,8 @@ LCLocaleDialog::LCLocaleDialog( const QString& guessedLCLocale,
    connect( dbb->button( QDialogButtonBox::Cancel ), &QPushButton::clicked,
             this, &QDialog::reject );

+    connect( m_localesWidget, &QListWidget::itemDoubleClicked,
+             this, &QDialog::accept );
    connect( m_localesWidget, &QListWidget::itemSelectionChanged,
             [this, dbb]()
    {
--- a/src/modules/locale/LocaleConfiguration.cpp
+++ b/src/modules/locale/LocaleConfiguration.cpp
@ -1,6 +1,7 @@
 /* === This file is part of Calamares - <http://github.com/calamares> ===
 *
 *   Copyright 2016, Teo Mrnjavac <teo@kde.org>
+ *   Copyright 2017, 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
@ -20,6 +21,8 @@
 #include <QLocale>

 LocaleConfiguration::LocaleConfiguration()
+    : explicit_lang( false )
+    , explicit_lc( false )
 {
 }

--- a/src/modules/locale/LocaleConfiguration.h
+++ b/src/modules/locale/LocaleConfiguration.h
@ -1,6 +1,7 @@
 /* === This file is part of Calamares - <http://github.com/calamares> ===
 *
 *   Copyright 2016, Teo Mrnjavac <teo@kde.org>
+ *   Copyright 2017, 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
@ -40,6 +41,10 @@ public:
            lc_telephone, lc_measurement, lc_identification;
    QString myLanguageLocaleBcp47;
    QMap< QString, QString > toMap();
+
+    // If the user has explicitly selected language (from the dialog)
+    // or numbers format, set these to avoid implicit changes to them.
+    bool explicit_lang, explicit_lc;
 };

 #endif // LOCALECONFIGURATION_H
--- a/Show More
+++ b/Show More