Update upstream source from tag 'upstream/3.2.15'

Update to upstream version '3.2.15'
with Debian dir 6f98580458

.clang-format

@@ -1,33 +1,32 @@
----
+---
 BasedOnStyle: WebKit
 
 AlignAfterOpenBracket: Align
-AllowAllParametersOfDeclarationOnNextLine: 'false'
+AlignEscapedNewlines: DontAlign
+AllowAllParametersOfDeclarationOnNextLine: "false"
 AllowShortFunctionsOnASingleLine: Inline
-AllowShortIfStatementsOnASingleLine: 'false'
-AllowShortLoopsOnASingleLine: 'false'
+AllowShortIfStatementsOnASingleLine: "false"
+AllowShortLoopsOnASingleLine: "false"
 AlwaysBreakAfterReturnType: TopLevelDefinitions
 AlwaysBreakTemplateDeclarations: Yes
-BinPackArguments: 'false'
-BinPackParameters: 'false'
+BinPackArguments: "false"
+BinPackParameters: "false"
 BreakBeforeBraces: Allman
-BreakBeforeTernaryOperators: 'true'
+BreakBeforeTernaryOperators: "true"
 BreakConstructorInitializers: BeforeComma
 ColumnLimit: 120
-Cpp11BracedListStyle: 'false'
-FixNamespaceComments: 'true'
+Cpp11BracedListStyle: "false"
+FixNamespaceComments: "true"
 IncludeBlocks: Preserve
-IndentWidth: '4'
-MaxEmptyLinesToKeep: '2'
+IndentWidth: "4"
+MaxEmptyLinesToKeep: "2"
 NamespaceIndentation: None
 PointerAlignment: Left
-ReflowComments: 'false'
-SortIncludes: 'true'
-SpaceAfterCStyleCast: 'false'
-SpacesBeforeTrailingComments: '2'
-SpacesInAngles: 'true'
-SpacesInParentheses: 'true'
-SpacesInSquareBrackets: 'true'
+ReflowComments: "false"
+SortIncludes: "true"
+SpaceAfterCStyleCast: "false"
+SpacesBeforeTrailingComments: "2"
+SpacesInAngles: "true"
+SpacesInParentheses: "true"
+SpacesInSquareBrackets: "true"
 Standard: Cpp11
-
-...

src/libcalamares/kdsingleapplicationguard/kdlockedsharedmemorypointer.cpp → 3rdparty/kdsingleapplicationguard/kdlockedsharedmemorypointer.cpp

@@ -1,3 +1,9 @@
+/*
+ *   SPDX-License-Identifier: LGPL-2.0-only
+ *   License-Filename: LICENSES/LGPLv2-KDAB
+ *
+ *   The KD Tools Library is Copyright (C) 2001-2010 Klaralvdalens Datakonsult AB.
+ */
 #include "kdlockedsharedmemorypointer.h"
 
 #if QT_VERSION >= 0x040400 || defined( DOXYGEN_RUN )

src/libcalamares/kdsingleapplicationguard/kdlockedsharedmemorypointer.h → 3rdparty/kdsingleapplicationguard/kdlockedsharedmemorypointer.h

@@ -1,3 +1,9 @@
+/*
+ *   SPDX-License-Identifier: LGPL-2.0-only
+ *   License-Filename: LICENSES/LGPLv2-KDAB
+ *
+ *   The KD Tools Library is Copyright (C) 2001-2010 Klaralvdalens Datakonsult AB.
+ */
 #ifndef __KDTOOLS__CORE__KDLOCKEDSHAREDMEMORYPOINTER_H__
 #define __KDTOOLS__CORE__KDLOCKEDSHAREDMEMORYPOINTER_H__
 
@@ -74,7 +80,7 @@ public:
     typedef const T* const_iterator;
     typedef std::reverse_iterator< const_iterator > const_reverse_iterator;
     typedef std::reverse_iterator< iterator > reverse_iterator;
-    
+
     iterator begin() { return get(); }
     const_iterator begin() const { return get(); }
 

src/libcalamares/kdsingleapplicationguard/kdsharedmemorylocker.cpp → 3rdparty/kdsingleapplicationguard/kdsharedmemorylocker.cpp

@@ -1,3 +1,9 @@
+/*
+ *   SPDX-License-Identifier: LGPL-2.0-only
+ *   License-Filename: LICENSES/LGPLv2-KDAB
+ *
+ *   The KD Tools Library is Copyright (C) 2001-2010 Klaralvdalens Datakonsult AB.
+ */
 #include "kdsharedmemorylocker.h"
 
 #if QT_VERSION >= 0x040400 || defined( DOXYGEN_RUN )

src/libcalamares/kdsingleapplicationguard/kdsharedmemorylocker.h → 3rdparty/kdsingleapplicationguard/kdsharedmemorylocker.h

@@ -1,3 +1,9 @@
+/*
+ *   SPDX-License-Identifier: LGPL-2.0-only
+ *   License-Filename: LICENSES/LGPLv2-KDAB
+ *
+ *   The KD Tools Library is Copyright (C) 2001-2010 Klaralvdalens Datakonsult AB.
+ */
 #ifndef __KDTOOLS__CORE__KDSHAREDMEMORYLOCKER_H
 #define __KDTOOLS__CORE__KDSHAREDMEMORYLOCKER_H
 

src/libcalamares/kdsingleapplicationguard/kdsingleapplicationguard.cpp → 3rdparty/kdsingleapplicationguard/kdsingleapplicationguard.cpp

@@ -1,3 +1,9 @@
+/*
+ *   SPDX-License-Identifier: LGPL-2.0-only
+ *   License-Filename: LICENSES/LGPLv2-KDAB
+ *
+ *   The KD Tools Library is Copyright (C) 2001-2010 Klaralvdalens Datakonsult AB.
+ */
 #include "kdsingleapplicationguard.h"
 
 #if QT_VERSION >= 0x040400 || defined(DOXYGEN_RUN)

src/libcalamares/kdsingleapplicationguard/kdsingleapplicationguard.h → 3rdparty/kdsingleapplicationguard/kdsingleapplicationguard.h

@@ -1,3 +1,9 @@
+/*
+ *   SPDX-License-Identifier: LGPL-2.0-only
+ *   License-Filename: LICENSES/LGPLv2-KDAB
+ *
+ *   The KD Tools Library is Copyright (C) 2001-2010 Klaralvdalens Datakonsult AB.
+ */
 #ifndef KDTOOLSCORE_KDSINGLEAPPLICATIONGUARD_H
 #define KDTOOLSCORE_KDSINGLEAPPLICATIONGUARD_H
 

src/libcalamares/kdsingleapplicationguard/kdtoolsglobal.cpp → 3rdparty/kdsingleapplicationguard/kdtoolsglobal.cpp

@@ -1,3 +1,9 @@
+/*
+ *   SPDX-License-Identifier: LGPL-2.0-only
+ *   License-Filename: LICENSES/LGPLv2-KDAB
+ *
+ *   The KD Tools Library is Copyright (C) 2001-2010 Klaralvdalens Datakonsult AB.
+ */
 #include "kdtoolsglobal.h"
 
 #include <QByteArray>

src/libcalamares/kdsingleapplicationguard/kdtoolsglobal.h → 3rdparty/kdsingleapplicationguard/kdtoolsglobal.h

@@ -1,3 +1,9 @@
+/*
+ *   SPDX-License-Identifier: LGPL-2.0-only
+ *   License-Filename: LICENSES/LGPLv2-KDAB
+ *
+ *   The KD Tools Library is Copyright (C) 2001-2010 Klaralvdalens Datakonsult AB.
+ */
 #ifndef KDTOOLS_KDTOOLSGLOBAL_H
 #define KDTOOLS_KDTOOLSGLOBAL_H
 

src/libcalamares/kdsingleapplicationguard/pimpl_ptr.cpp → 3rdparty/kdsingleapplicationguard/pimpl_ptr.cpp

@@ -1,3 +1,9 @@
+/*
+ *   SPDX-License-Identifier: LGPL-2.0-only
+ *   License-Filename: LICENSES/LGPLv2-KDAB
+ *
+ *   The KD Tools Library is Copyright (C) 2001-2010 Klaralvdalens Datakonsult AB.
+ */
 #include "pimpl_ptr.h"
 
 /*!
@@ -9,7 +15,7 @@
   (The exception safety of this class has not been evaluated yet.)
 
   pimpl_ptr is a smart immutable pointer, which owns the contained object. Unlike other smart pointers,
-  it creates a standard constructed object when instanciated via the 
+  it creates a standard constructed object when instanciated via the
   \link pimpl_ptr() standard constructor\endlink.
   Additionally, pimpl_ptr respects constness of the pointer object and returns \c const \c T* for
   a const pimpl_ptr object.
@@ -126,7 +132,7 @@
 */
 
 /*!
-  \fn T * pimpl_ptr::operator->() 
+  \fn T * pimpl_ptr::operator->()
 
   Member-by-pointer operator. Returns get().
 */
@@ -163,7 +169,7 @@ KDAB_UNITTEST_SIMPLE( pimpl_ptr, "kdcoretools" ) {
     }
 
 
-    {   
+    {
         QPointer< QObject > o;
         {
             kdtools::pimpl_ptr< QObject > qobject( new QObject );
@@ -174,7 +180,7 @@ KDAB_UNITTEST_SIMPLE( pimpl_ptr, "kdcoretools" ) {
         assertNull( o );
     }
 
-    {   
+    {
         const kdtools::pimpl_ptr< QObject > qobject( new QObject );
         const QObject* o = qobject.get();
         assertEqual( o, qobject.operator->() );

src/libcalamares/kdsingleapplicationguard/pimpl_ptr.h → 3rdparty/kdsingleapplicationguard/pimpl_ptr.h

@@ -1,3 +1,9 @@
+/*
+ *   SPDX-License-Identifier: LGPL-2.0-only
+ *   License-Filename: LICENSES/LGPLv2-KDAB
+ *
+ *   The KD Tools Library is Copyright (C) 2001-2010 Klaralvdalens Datakonsult AB.
+ */
 #ifndef KDTOOLSCORE_PIMPL_PTR_H
 #define KDTOOLSCORE_PIMPL_PTR_H
 

src/libcalamaresui/widgets/waitingspinnerwidget.cpp → 3rdparty/waitingspinnerwidget.cpp

@@ -1,5 +1,4 @@
-/* === This file is part of Calamares - <https://github.com/calamares> ===
- *
+/*
  *   SPDX-License-Identifier: MIT
  *   License-Filename: LICENSES/MIT-QtWaitingSpinner
  */

src/libcalamaresui/widgets/waitingspinnerwidget.h → 3rdparty/waitingspinnerwidget.h

@@ -1,5 +1,4 @@
-/* === This file is part of Calamares - <https://github.com/calamares> ===
- *
+/*
  *   SPDX-License-Identifier: MIT
  *   License-Filename: LICENSES/MIT-QtWaitingSpinner
  */

CHANGES

@@ -3,7 +3,125 @@ 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.11 (unreleased) #
+# 3.2.15 (2019-10-11) #
+
+This release contains contributions from (alphabetically by first name):
+ - No other contributors this time around.
+
+## Core ##
+ - No changes to core functionality
+
+## Modules ##
+
+ - *displaymanager* module now treats *sysconfig* as a regular entry in the
+   *displaymanagers* list, and the *sysconfigSetup* key is used as a
+   shorthand to force **only** that entry in the list. #1253
+ - *machineid* module has been re-written in C++ and extended with
+   a new configuration key to generate urandom pool data. #1252
+ - *unpackfs* now supports a special *sourcefs* value of `file`
+   for copying single files (optionally with renaming) or directory
+   trees to the target system.
+ - *unpackfs* now support an *exclude* and *excludeFile* setting for
+   excluding particular files or patters from unpacking. #1229
+
+
+# 3.2.14 (2019-09-30) #
+
+This release contains contributions from (alphabetically by first name):
+ - Andrius Štikonas
+ - Harald Sitter
+
+## Core ##
+ - No changes to core functionality
+
+## Modules ##
+
+ - *locale* module no longer recognizes the legacy GeoIP configuration.
+   This has been deprecated since Calamares 3.2.8 and is now removed.
+ - *packagechooser* module can now be custom-labeled in the overall
+   progress (left-hand column). #1228
+ - *displaymanager* module now recognizes KDE Plasma 5.17.
+ - *displaymanager* module now can handle Wayland sessions and can detect
+   sessions from their .desktop files. #1247 #1248
+ - *unpackfs* now has special handling for *sourcefs* setting "file"
+   (so you can copy single files or directories that are on the source
+   system, directly to the target). #1188 #1181
+
+
+# 3.2.13 (2019-08-30) #
+
+This release contains contributions from (alphabetically by first name):
+ - Arnaud Ferraris
+ - Arnaud Rebillout
+ - Bill Auger
+ - Kevin Kofler
+
+## Core ##
+
+- The Calamares standard coding style -- embodied in `ci/calamaresstyle`
+  has had a few updates and has now been consistently applied across
+  the core codebase (e.g. libcalamares, libcalamaresui, calamares, but
+  not the modules).
+- *KCoreAddons* is now a required dependency. This lets us drop a chunk
+  of code that was copied from KCoreAddons years ago, and use the
+  (maintained!) upstream version instead. It also gives us KMacroExpander
+  everywhere, which will simplify code for handling substitutions
+  in configuration files.
+- *Slideshows* now have a new property *activatedInCalamares* which
+  controls the keyboard shortcuts (and can control timers and other
+  properties of the slideshow, too).
+
+## Modules ##
+
+- The *packagechooser* module can load data from the config-file,
+  from AppData XML files referred by the config-file, and (new) also
+  from AppStream caches by referring to an application's AppStream id. #1212
+- The *partition* module now understands the units *KB*, *MB*, *GB* which
+  are powers-of-ten sizes, alongside the powers-of-two sizes that it already
+  used. (thanks to Arnaud)
+- The *welcome* module now supports a *Donate* button if *showDonateUrl*
+  is set to a non-empty URL. #1197
+- The *welcome* module can have URLs for the various buttons configured
+  directly in the module configuration (rather than in `branding.desc`).
+
+
+# 3.2.12 (2019-08-07) #
+
+This release contains contributions from (alphabetically by first name):
+ - apt-ghetto
+ - Bill Auger
+ - embar
+
+## Core ##
+
+ - Preliminary work to allow jobs to have a *weight* assigned to them
+   has been added. This will allow the progress bar to better reflect
+   progress by the amount of work done rather than purely by the
+   number of jobs. (Thanks to Bill Auger)
+ - Preliminary work has been added to post the installation log to a
+   pastebin for bug reporting. (Thanks to Bill Auger)
+ - Support for translated human-readable strings in Calamares
+   config files has been added. This is used only in the *packagechooser*
+   module (see below) but will expand to those modules that need
+   user-visible strings from the configuration file (existing
+   solutions need either gettext or Qt support).
+ - Esperanto is now available when Qt version 5.12.2 or later is used.
+
+## Modules ##
+
+ - *fstab* A new configuration key *efiMountOptions* has been added, to
+   allow setting filesystem options specifically for the EFI partition.
+   (Thanks to apt-ghetto)
+ - *packagechooser* is a new module for low-density package choices,
+   e.g. for selecting a default desktop environment, or adding some
+   proprietary drivers, or chosing browsers of office suites. It presents
+   **one** collection of items -- at most ten or so, because of the UI --
+   and the user can select zero or more of them. The behavior is
+   configurable, and package information can be set through the Calamares
+   configuration file or by reading AppData files for the packages. #426
+
+
+# 3.2.11 (2019-07-06) #
 
 This release contains contributions from (alphabetically by first name):
  - No other contributors this time around.

CMakeLists.txt

@@ -25,6 +25,9 @@
 #   SKIP_MODULES    : a space or semicolon-separated list of directory names
 #                     under src/modules that should not be built.
 #   USE_<foo>       : fills in SKIP_MODULES for modules called <foo>-<something>
+#   WITH_<foo>      : try to enable <foo> (these usually default to ON). For
+#                     a list of WITH_<foo> grep CMakeCache.txt after running
+#                     CMake once.
 #   BUILD_<foo>     : choose additional things to build
 #   DEBUG_<foo>     : special developer flags for debugging
 #
@@ -35,9 +38,9 @@
 # One special target is "show-version", which can be built
 # to obtain the version number from here.
 
-cmake_minimum_required( VERSION 3.2 FATAL_ERROR )
+cmake_minimum_required( VERSION 3.3 FATAL_ERROR )
 project( CALAMARES
-    VERSION 3.2.11
+    VERSION 3.2.15
     LANGUAGES C CXX )
 
 set( CALAMARES_VERSION_RC 0 )  # Set to 0 during release cycle, 1 during development
@@ -96,21 +99,23 @@ set( CALAMARES_DESCRIPTION_SUMMARY
 # (sr@latin in particular) may need special handling in CalamaresUtils.cpp.
 #
 # TODO: drop the es_ES translation from Transifex
-# TODO: move eo (Esperanto) to _ok once Qt can actually create a
-#       locale for it.
 #
-# NOTE: when updating the list from Transifex, copy these four lines
+# NOTE: move eo (Esperanto) to _ok once Qt can actually create a
+#       locale for it. (Qt 5.12.2 can, see check later on).
+# NOTE: update these lines by running txstats.py, or copy these four lines
 #       and prefix each variable name with "p", so that the automatic
 #       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 cs_CZ da de fr he hr hu ko lt pt_BR sq tr_TR
-    zh_TW )
-set( _tx_good ast en_GB es es_MX et fi_FI gl id it_IT ja nl pl
-    pt_PT ro ru sk zh_CN )
-set( _tx_ok ar bg el es_PR eu hi is mr nb sl sr sr@latin sv th
-    uk )
-set( _tx_incomplete be ca@valencia eo fa fr_CH gu kk kn lo mk ne_NP ur uz )
+#
+# Total 61 languages
+set( _tx_complete ca cs_CZ da fi_FI he hr ja lt pt_BR sq )
+set( _tx_good ast de es es_MX et fr gl hi hu id it_IT ko nl pl
+    pt_PT ru sk tr_TR zh_TW )
+set( _tx_ok ar be bg el en_GB es_PR eu is ml mr nb ro sl sr
+    sr@latin sv th uk zh_CN )
+set( _tx_incomplete ca@valencia eo fa fr_CH gu kk kn lo mk ne_NP ur
+    uz )
 
 ### Required versions
 #
@@ -126,6 +131,10 @@ set( BOOSTPYTHON_VERSION 1.55.0 )
 #
 set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMakeModules" )
 
+# Enable IN_LIST
+if( POLICY CMP0057 )
+    cmake_policy( SET CMP0057 NEW )
+endif()
 # CMake 3.9, 3.10 compatibility
 if( POLICY CMP0071 )
     cmake_policy( SET CMP0071 NEW )
@@ -189,10 +198,11 @@ if( CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
         -Wno-missing-prototypes
         -Wno-documentation-unknown-command
         -Wno-unknown-warning-option
+        -Werror=return-type
     )
         string( APPEND CMAKE_CXX_FLAGS " ${CLANG_WARNINGS}" )
     endforeach()
-    set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNOTREACHED='//'" )
+    set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNOTREACHED='//' -DFALLTHRU='[[clang::fallthrough]]'")
 
     # Third-party code where we don't care so much about compiler warnings
     # (because it's uncomfortable to patch) get different flags; use
@@ -219,7 +229,7 @@ else()
     set( SUPPRESS_3RDPARTY_WARNINGS "" )
     set( SUPPRESS_BOOST_WARNINGS "" )
 
-    set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNOTREACHED='__builtin_unreachable();'" )
+    set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNOTREACHED='__builtin_unreachable();' -DFALLTHRU='/* */'" )
 endif()
 
 # Use mark_thirdparty_code() to reduce warnings from the compiler
@@ -247,6 +257,17 @@ include( CMakeColors )
 ### DEPENDENCIES
 #
 find_package( Qt5 ${QT_VERSION} CONFIG REQUIRED Concurrent Core Gui Widgets LinguistTools Svg Quick QuickWidgets )
+if( Qt5_VERSION VERSION_GREATER 5.12.1 )
+    # At least Qt 5.12.2 seems to support Esperanto in QLocale
+    if( "eo" IN_LIST _tx_incomplete )
+        message(STATUS "Esperanto support since Qt 5.12.2, enabling Esperanto locale")
+        list( REMOVE_ITEM _tx_incomplete "eo" )
+        list( APPEND _tx_ok "eo" )
+    endif()
+endif()
+# Optional Qt parts
+find_package( Qt5DBus CONFIG )
+
 find_package( YAMLCPP ${YAMLCPP_VERSION} REQUIRED )
 if( INSTALL_POLKIT )
     find_package( PolkitQt5-1 REQUIRED )
@@ -276,7 +297,14 @@ if( ECM_FOUND )
     include(KDEInstallDirs)
 endif()
 
-find_package( KF5 COMPONENTS CoreAddons Crash )
+find_package( KF5 QUIET COMPONENTS CoreAddons Crash )
+set_package_properties(
+    KF5::CoreAddons PROPERTIES
+    TYPE REQUIRED
+    DESCRIPTION "Classes built on QtCore for About Data"
+    URL "https://api.kde.org/frameworks/kcoreaddons/"
+    PURPOSE "About Calamares"
+)
 if( NOT KF5Crash_FOUND )
     set( WITH_KF5Crash OFF )
 endif()
@@ -575,10 +603,25 @@ add_custom_target( uninstall
 
 ### CMAKE SUMMARY REPORT
 #
-feature_summary(WHAT ALL)
-
 get_directory_property( SKIPPED_MODULES
     DIRECTORY src/modules
     DEFINITION LIST_SKIPPED_MODULES
 )
 calamares_explain_skipped_modules( ${SKIPPED_MODULES} )
+
+feature_summary(
+    WHAT DISABLED_FEATURES
+    DESCRIPTION "The following features have been disabled:"
+    QUIET_ON_EMPTY
+)
+feature_summary(
+    WHAT OPTIONAL_PACKAGES_NOT_FOUND
+    DESCRIPTION "The following OPTIONAL packages were not found:"
+    QUIET_ON_EMPTY
+)
+feature_summary(
+    WHAT REQUIRED_PACKAGES_NOT_FOUND
+    FATAL_ON_MISSING_REQUIRED_PACKAGES
+    DESCRIPTION "The following REQUIRED packages were not found:"
+    QUIET_ON_EMPTY
+)

CMakeModules/CalamaresAddPlugin.cmake

@@ -21,8 +21,8 @@
 # Convenience function for creating a C++ (qtplugin) module for Calamares.
 # This function provides cmake-time feedback about the plugin, adds
 # targets for compilation and boilerplate information, and creates
-# a module.desc with standard values if none is provided (which only
-# happens for very unusual plugins).
+# a module.desc with standard values (if the module.desc file exists,
+# that one is used instead, which happens only for unusual plugins).
 #
 # Usage:
 #
@@ -34,16 +34,35 @@
 #   UI ui-file...
 #   LINK_LIBRARIES lib...
 #   LINK_PRIVATE_LIBRARIES lib...
-#   COMPILE_DEFINITIONS def...
-#   RESOURCES resource-file
+#   [COMPILE_DEFINITIONS def...]
+#   [RESOURCES resource-file]
+#   [REQUIRES module-name...]
 #   [NO_INSTALL]
 #   [SHARED_LIB]
 #   [EMERGENCY]
 # )
 #
-# The COMPILE_DEFINITIONS are set on the resulting module with a suitable
-# flag (i.e. `-D`) so only state the name (optionally, also the value)
-# without a `-D` prefixed to it.
+# Function parameters:
+#  - COMPILE_DEFINITIONS
+#       Definitions are set on the resulting module with a suitable
+#       flag (i.e. `-D`) so only state the name (optionally, also the value)
+#       without a `-D` prefixed to it.
+#  - RESOURCES
+#       One (single!) filename for the RCC file for the plugin.
+#  - REQUIRES
+#       One or more names of modules which are added to the *requiredModules*
+#       key in the descriptor. See *Module Requirements* in the module
+#       documentation.
+#  - NO_INSTALL
+#       If this is set, the module is not installed by default; use this to
+#       build testing modules or unit-testing modules.
+#  - SHARED_LIB
+#       In unusual circumstances, this function is used to add a library
+#       rather than a normal Calamares module / plugin.
+#  - EMERGENCY
+#       If this is set, the module is marked as an *emergency* module in the
+#       descriptor. See *Emergency Modules* in the module documentation.
+#
 
 include( CMakeParseArguments )
 include( CalamaresAddLibrary  )
@@ -54,7 +73,7 @@ function( calamares_add_plugin )
     set( NAME ${ARGV0} )
     set( options NO_INSTALL SHARED_LIB EMERGENCY )
     set( oneValueArgs NAME TYPE EXPORT_MACRO RESOURCES )
-    set( multiValueArgs SOURCES UI LINK_LIBRARIES LINK_PRIVATE_LIBRARIES COMPILE_DEFINITIONS )
+    set( multiValueArgs SOURCES UI LINK_LIBRARIES LINK_PRIVATE_LIBRARIES COMPILE_DEFINITIONS REQUIRES )
     cmake_parse_arguments( PLUGIN "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
     set( PLUGIN_NAME ${NAME} )
     set( PLUGIN_DESTINATION ${CMAKE_INSTALL_LIBDIR}/calamares/modules/${PLUGIN_NAME} )
@@ -142,6 +161,12 @@ function( calamares_add_plugin )
         set( _type ${PLUGIN_TYPE} )
         file( WRITE  ${_file} "# AUTO-GENERATED metadata file\n# Syntax is YAML 1.2\n---\n" )
         file( APPEND ${_file} "type: \"${_type}\"\nname: \"${PLUGIN_NAME}\"\ninterface: \"qtplugin\"\nload: \"lib${target}.so\"\n" )
+        if ( PLUGIN_REQUIRES )
+            file( APPEND ${_file} "requiredModules:\n" )
+            foreach( _r ${PLUGIN_REQUIRES} )
+                file( APPEND ${_file} " - ${_r}\n" )
+            endforeach()
+        endif()
         if ( PLUGIN_EMERGENCY )
             file( APPEND ${_file} "emergency: true\n" )
         endif()

LICENSES/GPLv3+-QJsonModel

@@ -1,18 +0,0 @@
-/***********************************************
-    Copyright (C) 2014  Schutz Sacha
-    This file is part of QJsonModel (https://github.com/dridk/QJsonmodel).
-
-    QJsonModel 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.
-
-    QJsonModel 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 QJsonModel.  If not, see <http://www.gnu.org/licenses/>.
-
-**********************************************/

LICENSES/LGPLv2-KDAB

@@ -0,0 +1,488 @@
+
+ The KD Tools Library is Copyright (C) 2001-2010 Klaralvdalens Datakonsult AB.
+
+ You may use, distribute and copy the KD Tools Library under the terms of
+ GNU Library General Public License version 2, which is displayed below.
+
+-------------------------------------------------------------------------
+                  GNU LIBRARY GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+ Copyright (C) 1991 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the library GPL.  It is
+ numbered 2 because it goes with version 2 of the ordinary GPL.]
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Library General Public License, applies to some
+specially designated Free Software Foundation software, and to any
+other libraries whose authors decide to use it.  You can use it for
+your libraries, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if
+you distribute copies of the library, or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link a program with the library, you must provide
+complete object files to the recipients so that they can relink them
+with the library, after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  Our method of protecting your rights has two steps: (1) copyright
+the library, and (2) offer you this license which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  Also, for each distributor's protection, we want to make certain
+that everyone understands that there is no warranty for this free
+library.  If the library is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original
+version, so that any problems introduced by others will not reflect on
+the original authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that companies distributing free
+software will individually obtain patent licenses, thus in effect
+transforming the program into proprietary software.  To prevent this,
+we have made it clear that any patent must be licensed for everyone's
+free use or not licensed at all.
+
+  Most GNU software, including some libraries, is covered by the ordinary
+GNU General Public License, which was designed for utility programs.  This
+license, the GNU Library General Public License, applies to certain
+designated libraries.  This license is quite different from the ordinary
+one; be sure to read it in full, and don't assume that anything in it is
+the same as in the ordinary license.
+
+  The reason we have a separate public license for some libraries is that
+they blur the distinction we usually make between modifying or adding to a
+program and simply using it.  Linking a program with a library, without
+changing the library, is in some sense simply using the library, and is
+analogous to running a utility program or application program.  However, in
+a textual and legal sense, the linked executable is a combined work, a
+derivative of the original library, and the ordinary General Public License
+treats it as such.
+
+  Because of this blurred distinction, using the ordinary General
+Public License for libraries did not effectively promote software
+sharing, because most developers did not use the libraries.  We
+concluded that weaker conditions might promote sharing better.
+
+  However, unrestricted linking of non-free programs would deprive the
+users of those programs of all benefit from the free status of the
+libraries themselves.  This Library General Public License is intended to
+permit developers of non-free programs to use free libraries, while
+preserving your freedom as a user of such programs to change the free
+libraries that are incorporated in them.  (We have not seen how to achieve
+this as regards changes in header files, but we have achieved it as regards
+changes in the actual functions of the Library.)  The hope is that this
+will lead to faster development of free libraries.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, while the latter only
+works together with the library.
+
+  Note that it is possible for a library to be covered by the ordinary
+General Public License rather than by this special one.
+
+                  GNU LIBRARY GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library which
+contains a notice placed by the copyright holder or other authorized
+party saying it may be distributed under the terms of this Library
+General Public License (also called "this License").  Each licensee is
+addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+  
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also compile or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    c) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    d) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the source code distributed need not include anything that is normally
+distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Library General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+                            NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    This library 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
+    Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!

README.md

@@ -13,28 +13,23 @@
 ### Dependencies
 
 Main:
-* Compiler with C++11 support: GCC >= 4.9.0 or Clang >= 3.5.1
-* CMake >= 3.2
-* Qt >= 5.7
+* Compiler with C++14 support: GCC >= 5 or Clang >= 3.5.1
+* CMake >= 3.3
+* Qt >= 5.9
 * yaml-cpp >= 0.5.1
 * Python >= 3.3 (required for some modules)
-* Boost.Python >= 1.55.0 (recommended, or PythonQt; one is required for some modules)
-* PythonQt (recommended, or Boost.Python; one is required for some modules)
-* extra-cmake-modules >= 5.18 (recommended; required for some modules)
+* Boost.Python >= 1.55.0 (required for some modules)
+* KDE extra-cmake-modules >= 5.18 (recommended; required for some modules;
+  required for some tests)
+* KDE Frameworks KCoreAddons (>= 5.58 recommended)
+* PythonQt (optional, deprecated)
 
 Modules:
-* welcome:
-  * NetworkManager
-  * UPower (optional, runtime)
-* partition:
-  * extra-cmake-modules
-  * KF5: KCoreAddons, KConfig, KI18n, KService, KWidgetsAddons
-  * KPMcore >= 3.3
-* bootloader:
-  * systemd-boot or GRUB
-* unpackfs:
-  * squashfs-tools
-  * rsync
+* Individual modules may have their own requirements;
+  these are listed in CMake output. Particular requirements (not complete):
+* *fsresizer* KPMCore >= 3.3
+* *partition* KPMCore >= 3.3
+* *users* LibPWQuality (optional)
 
 ### Building
 

calamares.desktop

@@ -3,7 +3,7 @@ Type=Application
 Version=1.0
 Name=Install System
 GenericName=System Installer
-Keywords=calamares;system;installer
+Keywords=calamares;system;installer;
 TryExec=calamares
 Exec=pkexec /usr/bin/calamares
 Comment=Calamares — System Installer
@@ -114,6 +114,10 @@ Name[mk]=Инсталирај го системот
 Icon[mk]=calamares
 GenericName[mk]=Системен Инсталер
 Comment[mk]=Calamares - Системен Инсталер
+Name[ml]=സിസ്റ്റം ഇൻസ്റ്റാൾ ചെയ്യുക
+Icon[ml]=കലാമാരേസ്
+GenericName[ml]=സിസ്റ്റം ഇൻസ്റ്റാളർ
+Comment[ml]=കലാമാരേസ് - സിസ്റ്റം ഇൻസ്റ്റാളർ
 Name[nb]=Installer System
 Icon[nb]=calamares
 GenericName[nb]=Systeminstallatør

calamares.desktop.in

@@ -3,7 +3,7 @@ Type=Application
 Version=1.0
 Name=Install System
 GenericName=System Installer
-Keywords=calamares;system;installer
+Keywords=calamares;system;installer;
 TryExec=calamares
 Exec=pkexec /usr/bin/calamares
 Comment=Calamares — System Installer

ci/RELEASE.sh

@@ -1,5 +1,7 @@
 #! /bin/sh
 #
+### USAGE
+#
 # Release script for Calamares
 #
 # This attempts to perform the different steps of the RELEASE.md
@@ -11,15 +13,21 @@
 #
 # None of the "update stuff" is done by this script; in preparation
 # for the release, you should have already done:
-#   - updating the version
-#   - pulling translations
-#   - updating the language list
-#   - switching to the right branch
+#   * updating the version
+#   * pulling translations
+#   * updating the language list
+#   * switching to the right branch
+#
+# You can influence the script a little with these options:
+#   * `-B` do not build (before tagging)
+#   * `-P` do not package (tag, sign, tarball)
+#
+# The build / package settings can be influenced via environment variables:
+#   * BUILD_DEFAULT set to `false` to avoid first build with gcc
+#   * BUILD_CLANG   set to `false` to avoid second build with clang
+#   * BUILD_ONLY    set to `true` to break after building
 #
-# You can influence the script a little with environment variables:
-#   - BUILD_DEFAULT set to false to avoid first build with gcc
-#   - BUILD_CLANG   set to false to avoid second build with clang
-#   - BUILD_ONLY    set to true to break after building
+### END USAGE
 
 test -d .git || { echo "Not at top-level." ; exit 1 ; }
 test -d src/modules || { echo "No src/modules." ; exit 1 ; }
@@ -30,6 +38,23 @@ test -z "$BUILD_DEFAULT" && BUILD_DEFAULT=true
 test -z "$BUILD_CLANG" && BUILD_CLANG=true
 test -z "$BUILD_ONLY" && BUILD_ONLY=false
 
+while getopts "hBP" opt ; do
+    case "$opt" in
+    h|\?)
+        sed -e '1,/USAGE/d' -e '/END.USAGE/,$d' < "$0"
+        return 0
+        ;;
+    B)
+        BUILD_DEFAULT=false
+        BUILD_CLANG=false
+        ;;
+    P)
+        BUILD_ONLY=true
+        ;;
+    esac
+done
+
+
 ### Setup
 #
 #
@@ -54,7 +79,7 @@ if test "x$BUILD_CLANG" = "xtrue" ; then
         rm -rf "$BUILDDIR"
         mkdir "$BUILDDIR" || { echo "Could not create build directory." ; exit 1 ; }
         ( cd "$BUILDDIR" && CC=clang CXX=clang++ cmake .. && make -j4 ) || { echo "Could not perform test-build in $BUILDDIR." ; exit 1 ; }
-        ( cd "$BUILDDIR" && make test ) || { echo "Tests failed in $BUILDDIR." ; exit 1 ; }
+        ( cd "$BUILDDIR" && make test ) || { echo "Tests failed in $BUILDDIR (clang)." ; exit 1 ; }
     fi
 fi
 
@@ -63,11 +88,21 @@ if test "x$BUILD_ONLY" = "xtrue" ; then
     exit 1
 fi
 
+if test -f "$BUILDDIR/CMakeCache.txt" ; then
+    # Some build has created it, so that's good
+    :
+else
+    # Presumably -B was given; just do the cmake part
+    rm -rf "$BUILDDIR"
+    mkdir "$BUILDDIR" || { echo "Could not create build directory." ; exit 1 ; }
+    ( cd "$BUILDDIR" && cmake .. ) || { echo "Could not run cmake in $BUILDDIR." ; exit 1 ; }
+fi
+
 ### Get version number for this release
 #
 #
 V=$( cd "$BUILDDIR" && make show-version | grep ^CALAMARES_VERSION | sed s/^[A-Z_]*=// )
-test -n "$V" || { echo "Could not obtain version." ; exit 1 ; }
+test -n "$V" || { echo "Could not obtain version in $BUILDDIR." ; exit 1 ; }
 
 ### Create signed tag
 #
@@ -93,7 +128,7 @@ TMPDIR=$(mktemp -d --suffix="-calamares-$D")
 test -d "$TMPDIR" || { echo "Could not create tarball-build directory." ; exit 1 ; }
 tar xzf "$TAR_FILE" -C "$TMPDIR" || { echo "Could not unpack tarball." ; exit 1 ; }
 test -d "$TMPDIR/$TAR_V" || { echo "Tarball did not contain source directory." ; exit 1 ; }
-( cd "$TMPDIR/$TAR_V" && cmake . && make -j4 && make test ) || { echo "Tarball build failed." ; exit 1 ; }
+( cd "$TMPDIR/$TAR_V" && cmake . && make -j4 && make test ) || { echo "Tarball build failed in $TMPDIR." ; exit 1 ; }
 
 ### Cleanup
 #

ci/calamaresstyle

@@ -37,7 +37,7 @@ style_some()
 if test "x$any_dirs" = "xyes" ; then
 	for d in "$@"
 	do
-		if test -d "$@"  ; then
+		if test -d "$d"  ; then
 			style_some $( find "$d" -maxdepth 1 -type f -name '*.cpp' -o -name '*.h' )
 		else
 			style_some "$d"

ci/txstats.py

@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 #
 # Uses the Transifex API to get a list of enabled languages,
 # and outputs CMake settings for inclusion into CMakeLists.txt.
@@ -56,6 +56,11 @@ def get_tx_stats(token):
         return 1
 
     suppressed_languages = ( "es_ES", )  # In Transifex, but not used
+    # Some languages go into the "incomplete" list by definition,
+    # regardless of their completion status: this can have various reasons.
+    incomplete_languages = (
+        "eo",   # Not supported by QLocale
+        )
 
     all_langs = []
 
@@ -66,6 +71,8 @@ def get_tx_stats(token):
         if lang_name in suppressed_languages:
             continue
         stats = languages[lang_name]["translated"]["percentage"]
+        if lang_name in incomplete_languages:
+            stats = 0.0
         all_langs.append((stats, lang_name))
 
     output_langs(all_langs, "complete", lambda s : s == 1.0)

data/images/help-donate.svg

@@ -0,0 +1,18 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
+  <defs
+     id="defs3051">
+    <style
+       type="text/css"
+       id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#4d4d4d;
+      }
+      </style>
+  </defs>
+  <path
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+      d="m 5,9 0,1 -1,0 0,12 1,0 0,1 22,0 0,-1 1,0 0,-12 -1,0 0,-1 z m 1,1 20,0 a 1,1 0 0 0 1,1 l 0,10 a 1,1 0 0 0 -1,1 L 6,22 A 1,1 0 0 0 5,21 L 5,11 a 1,1 0 0 0 1,-1 m 10,2 a 4,4 0 0 0 -4,4 4,4 0 0 0 4,4 4,4 0 0 0 4,-4 4,4 0 0 0 -4,-4 m 0,1 a 3,3 0 0 1 3,3 3,3 0 0 1 -3,3 3,3 0 0 1 -3,-3 3,3 0 0 1 3,-3"
+     id="path76" 
+     class="ColorScheme-Text"
+     />
+</svg>

io.calamares.calamares.appdata.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component type="desktop">
+  <id>io.calamares.calamares.desktop</id>
+  <metadata_license>CC0-1.0</metadata_license>
+  <project_license>GPL-3.0+</project_license>
+  <name>Calamares</name>
+  <name xml:lang="da">Calamares</name>
+  <name xml:lang="en-GB">Calamares</name>
+  <name xml:lang="nl">Calamares</name>
+  <summary>Calamares Linux Installer</summary>
+  <summary xml:lang="en-GB">Calamares Linux Installer</summary>
+  <summary xml:lang="nl">Linux Installatieprogramma Calamares</summary>
+  <description>
+    <p>Calamares is an installer program for Linux distributions.</p>
+    <p xml:lang="nl">Calamares is een installatieprogramma voor Linux distributies.</p>
+  </description>
+  <url type="homepage">https://calamares.io</url>
+  <url type="bugtracker">https://https://github.com/calamares/calamares/issues/</url>
+  <url type="help">https://github.com/calamares/calamares/wiki</url>
+  <screenshots>
+    <screenshot type="default">
+      <caption>Calamares Welcome</caption>
+      <image>https://calamares.io/images/cal_640.png</image>
+    </screenshot>
+  </screenshots>
+  <provides>
+    <binary>calamares</binary>
+  </provides>
+</component>

lang/python.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-06-18 15:54+0200\n"
+"POT-Creation-Date: 2019-09-15 21:54+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -26,23 +26,22 @@ msgstr "Configure GRUB."
 msgid "Mounting partitions."
 msgstr "Mounting partitions."
 
-#: src/modules/mount/main.py:150 src/modules/initcpiocfg/main.py:187
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:187
 #: src/modules/initcpiocfg/main.py:191
 #: src/modules/luksopenswaphookcfg/main.py:95
 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171
 #: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94
 #: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78
-#: src/modules/openrcdmcryptcfg/main.py:82
-#: src/modules/luksbootkeyfile/main.py:51 src/modules/fstab/main.py:312
-#: src/modules/fstab/main.py:316 src/modules/localecfg/main.py:144
+#: src/modules/openrcdmcryptcfg/main.py:82 src/modules/fstab/main.py:322
+#: src/modules/fstab/main.py:328 src/modules/localecfg/main.py:144
 #: src/modules/networkcfg/main.py:48
 msgid "Configuration Error"
 msgstr "Configuration Error"
 
-#: src/modules/mount/main.py:151 src/modules/initcpiocfg/main.py:188
+#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:188
 #: src/modules/luksopenswaphookcfg/main.py:96 src/modules/rawfs/main.py:172
 #: src/modules/initramfscfg/main.py:95 src/modules/openrcdmcryptcfg/main.py:79
-#: src/modules/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313
+#: src/modules/fstab/main.py:323
 msgid "No partitions are defined for <pre>{!s}</pre> to use."
 msgstr "No partitions are defined for <pre>{!s}</pre> to use."
 
@@ -94,15 +93,15 @@ msgstr "Unmount file systems."
 msgid "Filling up filesystems."
 msgstr "Filling up filesystems."
 
-#: src/modules/unpackfs/main.py:159
+#: src/modules/unpackfs/main.py:160
 msgid "rsync failed with error code {}."
 msgstr "rsync failed with error code {}."
 
-#: src/modules/unpackfs/main.py:220 src/modules/unpackfs/main.py:238
+#: src/modules/unpackfs/main.py:221 src/modules/unpackfs/main.py:239
 msgid "Failed to unpack image \"{}\""
 msgstr "Failed to unpack image \"{}\""
 
-#: src/modules/unpackfs/main.py:221
+#: src/modules/unpackfs/main.py:222
 msgid ""
 "Failed to find unsquashfs, make sure you have the squashfs-tools package "
 "installed"
@@ -110,84 +109,84 @@ msgstr ""
 "Failed to find unsquashfs, make sure you have the squashfs-tools package "
 "installed"
 
-#: src/modules/unpackfs/main.py:320
+#: src/modules/unpackfs/main.py:321
 msgid "No mount point for root partition"
 msgstr "No mount point for root partition"
 
-#: src/modules/unpackfs/main.py:321
+#: src/modules/unpackfs/main.py:322
 msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 
-#: src/modules/unpackfs/main.py:326
+#: src/modules/unpackfs/main.py:327
 msgid "Bad mount point for root partition"
 msgstr "Bad mount point for root partition"
 
-#: src/modules/unpackfs/main.py:327
+#: src/modules/unpackfs/main.py:328
 msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr "rootMountPoint is \"{}\", which does not exist, doing nothing"
 
-#: src/modules/unpackfs/main.py:340 src/modules/unpackfs/main.py:347
-#: src/modules/unpackfs/main.py:352
+#: src/modules/unpackfs/main.py:341 src/modules/unpackfs/main.py:348
+#: src/modules/unpackfs/main.py:353
 msgid "Bad unsquash configuration"
 msgstr "Bad unsquash configuration"
 
-#: src/modules/unpackfs/main.py:341
+#: src/modules/unpackfs/main.py:342
 msgid "The filesystem for \"{}\" ({}) is not supported"
 msgstr "The filesystem for \"{}\" ({}) is not supported"
 
-#: src/modules/unpackfs/main.py:348
+#: src/modules/unpackfs/main.py:349
 msgid "The source filesystem \"{}\" does not exist"
 msgstr "The source filesystem \"{}\" does not exist"
 
-#: src/modules/unpackfs/main.py:353
+#: src/modules/unpackfs/main.py:354
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr "The destination \"{}\" in the target system is not a directory"
 
-#: src/modules/displaymanager/main.py:381
+#: src/modules/displaymanager/main.py:401
 msgid "Cannot write KDM configuration file"
 msgstr "Cannot write KDM configuration file"
 
-#: src/modules/displaymanager/main.py:382
+#: src/modules/displaymanager/main.py:402
 msgid "KDM config file {!s} does not exist"
 msgstr "KDM config file {!s} does not exist"
 
-#: src/modules/displaymanager/main.py:443
+#: src/modules/displaymanager/main.py:463
 msgid "Cannot write LXDM configuration file"
 msgstr "Cannot write LXDM configuration file"
 
-#: src/modules/displaymanager/main.py:444
+#: src/modules/displaymanager/main.py:464
 msgid "LXDM config file {!s} does not exist"
 msgstr "LXDM config file {!s} does not exist"
 
-#: src/modules/displaymanager/main.py:527
+#: src/modules/displaymanager/main.py:547
 msgid "Cannot write LightDM configuration file"
 msgstr "Cannot write LightDM configuration file"
 
-#: src/modules/displaymanager/main.py:528
+#: src/modules/displaymanager/main.py:548
 msgid "LightDM config file {!s} does not exist"
 msgstr "LightDM config file {!s} does not exist"
 
-#: src/modules/displaymanager/main.py:602
+#: src/modules/displaymanager/main.py:622
 msgid "Cannot configure LightDM"
 msgstr "Cannot configure LightDM"
 
-#: src/modules/displaymanager/main.py:603
+#: src/modules/displaymanager/main.py:623
 msgid "No LightDM greeter installed."
 msgstr "No LightDM greeter installed."
 
-#: src/modules/displaymanager/main.py:634
+#: src/modules/displaymanager/main.py:654
 msgid "Cannot write SLIM configuration file"
 msgstr "Cannot write SLIM configuration file"
 
-#: src/modules/displaymanager/main.py:635
+#: src/modules/displaymanager/main.py:655
 msgid "SLIM config file {!s} does not exist"
 msgstr "SLIM config file {!s} does not exist"
 
-#: src/modules/displaymanager/main.py:750
+#: src/modules/displaymanager/main.py:770
 msgid "No display managers selected for the displaymanager module."
 msgstr "No display managers selected for the displaymanager module."
 
-#: src/modules/displaymanager/main.py:751
+#: src/modules/displaymanager/main.py:771
 msgid ""
 "The displaymanagers list is empty or undefined in bothglobalstorage and "
 "displaymanager.conf."
@@ -195,7 +194,7 @@ msgstr ""
 "The displaymanagers list is empty or undefined in bothglobalstorage and "
 "displaymanager.conf."
 
-#: src/modules/displaymanager/main.py:831
+#: src/modules/displaymanager/main.py:851
 msgid "Display manager configuration was incomplete"
 msgstr "Display manager configuration was incomplete"
 
@@ -206,27 +205,11 @@ msgstr "Configuring mkinitcpio."
 #: src/modules/initcpiocfg/main.py:192
 #: src/modules/luksopenswaphookcfg/main.py:100
 #: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99
-#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:317
+#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:329
 #: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49
 msgid "No root mount point is given for <pre>{!s}</pre> to use."
 msgstr "No root mount point is given for <pre>{!s}</pre> to use."
 
-#: src/modules/initcpio/main.py:33
-msgid "Creating initramfs with mkinitcpio."
-msgstr "Creating initramfs with mkinitcpio."
-
-#: src/modules/initcpio/main.py:47
-msgid "Process Failed"
-msgstr "Process Failed"
-
-#: src/modules/initcpio/main.py:48
-msgid ""
-"Process <pre>mkinitcpio</pre> failed with error code {!s}. The command was "
-"<pre>{!s}</pre>."
-msgstr ""
-"Process <pre>mkinitcpio</pre> failed with error code {!s}. The command was "
-"<pre>{!s}</pre>."
-
 #: src/modules/luksopenswaphookcfg/main.py:35
 msgid "Configuring encrypted swap."
 msgstr "Configuring encrypted swap."
@@ -324,18 +307,6 @@ msgstr "Install bootloader."
 msgid "Remove live user from target system"
 msgstr "Remove live user from target system"
 
-#: src/modules/initramfs/main.py:35
-msgid "Creating initramfs."
-msgstr "Creating initramfs."
-
-#: src/modules/initramfs/main.py:49
-msgid "Failed to run update-initramfs on the target"
-msgstr "Failed to run update-initramfs on the target"
-
-#: src/modules/initramfs/main.py:50 src/modules/dracut/main.py:59
-msgid "The exit code was {}"
-msgstr "The exit code was {}"
-
 #: src/modules/hwclock/main.py:35
 msgid "Setting hardware clock."
 msgstr "Setting hardware clock."
@@ -348,6 +319,10 @@ msgstr "Creating initramfs with dracut."
 msgid "Failed to run dracut on the target"
 msgstr "Failed to run dracut on the target"
 
+#: src/modules/dracut/main.py:59
+msgid "The exit code was {}"
+msgstr "The exit code was {}"
+
 #: src/modules/initramfscfg/main.py:41
 msgid "Configuring initramfs."
 msgstr "Configuring initramfs."
@@ -356,18 +331,6 @@ msgstr "Configuring initramfs."
 msgid "Configuring OpenRC dmcrypt service."
 msgstr "Configuring OpenRC dmcrypt service."
 
-#: src/modules/luksbootkeyfile/main.py:35
-msgid "Configuring LUKS key file."
-msgstr "Configuring LUKS key file."
-
-#: src/modules/luksbootkeyfile/main.py:74
-msgid "Encrypted rootfs setup error"
-msgstr "Encrypted rootfs setup error"
-
-#: src/modules/luksbootkeyfile/main.py:75
-msgid "Rootfs partition {!s} is LUKS but no passphrase found."
-msgstr "Rootfs partition {!s} is LUKS but no passphrase found."
-
 #: src/modules/fstab/main.py:38
 msgid "Writing fstab."
 msgstr "Writing fstab."

lang/python/ar/LC_MESSAGES/python.po

@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-06-18 15:54+0200\n"
+"POT-Creation-Date: 2019-09-15 21:54+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: aboodilankaboot, 2019\n"
 "Language-Team: Arabic (https://www.transifex.com/calamares/teams/20061/ar/)\n"
@@ -30,23 +30,22 @@ msgstr ""
 msgid "Mounting partitions."
 msgstr "جاري تركيب الأقسام"
 
-#: src/modules/mount/main.py:150 src/modules/initcpiocfg/main.py:187
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:187
 #: src/modules/initcpiocfg/main.py:191
 #: src/modules/luksopenswaphookcfg/main.py:95
 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171
 #: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94
 #: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78
-#: src/modules/openrcdmcryptcfg/main.py:82
-#: src/modules/luksbootkeyfile/main.py:51 src/modules/fstab/main.py:312
-#: src/modules/fstab/main.py:316 src/modules/localecfg/main.py:144
+#: src/modules/openrcdmcryptcfg/main.py:82 src/modules/fstab/main.py:322
+#: src/modules/fstab/main.py:328 src/modules/localecfg/main.py:144
 #: src/modules/networkcfg/main.py:48
 msgid "Configuration Error"
 msgstr "خطأ في الضبط"
 
-#: src/modules/mount/main.py:151 src/modules/initcpiocfg/main.py:188
+#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:188
 #: src/modules/luksopenswaphookcfg/main.py:96 src/modules/rawfs/main.py:172
 #: src/modules/initramfscfg/main.py:95 src/modules/openrcdmcryptcfg/main.py:79
-#: src/modules/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313
+#: src/modules/fstab/main.py:323
 msgid "No partitions are defined for <pre>{!s}</pre> to use."
 msgstr ""
 
@@ -95,104 +94,104 @@ msgstr "الغاء تحميل ملف النظام"
 msgid "Filling up filesystems."
 msgstr "جاري ملئ أنظمة الملفات"
 
-#: src/modules/unpackfs/main.py:159
+#: src/modules/unpackfs/main.py:160
 msgid "rsync failed with error code {}."
 msgstr "فشل rsync مع رمز الخطأ {}."
 
-#: src/modules/unpackfs/main.py:220 src/modules/unpackfs/main.py:238
+#: src/modules/unpackfs/main.py:221 src/modules/unpackfs/main.py:239
 msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/unpackfs/main.py:221
+#: src/modules/unpackfs/main.py:222
 msgid ""
 "Failed to find unsquashfs, make sure you have the squashfs-tools package "
 "installed"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:320
+#: src/modules/unpackfs/main.py:321
 msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:321
+#: src/modules/unpackfs/main.py:322
 msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:326
+#: src/modules/unpackfs/main.py:327
 msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:327
+#: src/modules/unpackfs/main.py:328
 msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:340 src/modules/unpackfs/main.py:347
-#: src/modules/unpackfs/main.py:352
+#: src/modules/unpackfs/main.py:341 src/modules/unpackfs/main.py:348
+#: src/modules/unpackfs/main.py:353
 msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:341
+#: src/modules/unpackfs/main.py:342
 msgid "The filesystem for \"{}\" ({}) is not supported"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:348
+#: src/modules/unpackfs/main.py:349
 msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:353
+#: src/modules/unpackfs/main.py:354
 msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:381
+#: src/modules/displaymanager/main.py:401
 msgid "Cannot write KDM configuration file"
 msgstr "فشلت كتابة ملف ضبط KDM."
 
-#: src/modules/displaymanager/main.py:382
+#: src/modules/displaymanager/main.py:402
 msgid "KDM config file {!s} does not exist"
 msgstr "ملف ضبط KDM {!s} غير موجود"
 
-#: src/modules/displaymanager/main.py:443
+#: src/modules/displaymanager/main.py:463
 msgid "Cannot write LXDM configuration file"
 msgstr "فشلت كتابة ملف ضبط LXDM."
 
-#: src/modules/displaymanager/main.py:444
+#: src/modules/displaymanager/main.py:464
 msgid "LXDM config file {!s} does not exist"
 msgstr "ملف ضبط LXDM {!s} غير موجود"
 
-#: src/modules/displaymanager/main.py:527
+#: src/modules/displaymanager/main.py:547
 msgid "Cannot write LightDM configuration file"
 msgstr "فشلت كتابة ملف ضبط LightDM."
 
-#: src/modules/displaymanager/main.py:528
+#: src/modules/displaymanager/main.py:548
 msgid "LightDM config file {!s} does not exist"
 msgstr "ملف ضبط LightDM {!s} غير موجود"
 
-#: src/modules/displaymanager/main.py:602
+#: src/modules/displaymanager/main.py:622
 msgid "Cannot configure LightDM"
 msgstr "فشل ضبط LightDM"
 
-#: src/modules/displaymanager/main.py:603
+#: src/modules/displaymanager/main.py:623
 msgid "No LightDM greeter installed."
 msgstr "لم يتم تصيب LightDM"
 
-#: src/modules/displaymanager/main.py:634
+#: src/modules/displaymanager/main.py:654
 msgid "Cannot write SLIM configuration file"
 msgstr "فشلت كتابة ملف ضبط SLIM."
 
-#: src/modules/displaymanager/main.py:635
+#: src/modules/displaymanager/main.py:655
 msgid "SLIM config file {!s} does not exist"
 msgstr "ملف ضبط SLIM {!s} غير موجود"
 
-#: src/modules/displaymanager/main.py:750
+#: src/modules/displaymanager/main.py:770
 msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:751
+#: src/modules/displaymanager/main.py:771
 msgid ""
 "The displaymanagers list is empty or undefined in bothglobalstorage and "
 "displaymanager.conf."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:831
+#: src/modules/displaymanager/main.py:851
 msgid "Display manager configuration was incomplete"
 msgstr "إعداد مدير العرض لم يكتمل"
 
@@ -203,25 +202,11 @@ msgstr ""
 #: src/modules/initcpiocfg/main.py:192
 #: src/modules/luksopenswaphookcfg/main.py:100
 #: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99
-#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:317
+#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:329
 #: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49
 msgid "No root mount point is given for <pre>{!s}</pre> to use."
 msgstr ""
 
-#: src/modules/initcpio/main.py:33
-msgid "Creating initramfs with mkinitcpio."
-msgstr ""
-
-#: src/modules/initcpio/main.py:47
-msgid "Process Failed"
-msgstr "العملية فشلت"
-
-#: src/modules/initcpio/main.py:48
-msgid ""
-"Process <pre>mkinitcpio</pre> failed with error code {!s}. The command was "
-"<pre>{!s}</pre>."
-msgstr ""
-
 #: src/modules/luksopenswaphookcfg/main.py:35
 msgid "Configuring encrypted swap."
 msgstr ""
@@ -320,18 +305,6 @@ msgstr "تثبيت محمل الإقلاع"
 msgid "Remove live user from target system"
 msgstr "إزالة المستخدم المباشر من النظام الهدف"
 
-#: src/modules/initramfs/main.py:35
-msgid "Creating initramfs."
-msgstr ""
-
-#: src/modules/initramfs/main.py:49
-msgid "Failed to run update-initramfs on the target"
-msgstr ""
-
-#: src/modules/initramfs/main.py:50 src/modules/dracut/main.py:59
-msgid "The exit code was {}"
-msgstr "كود الخروج كان {}"
-
 #: src/modules/hwclock/main.py:35
 msgid "Setting hardware clock."
 msgstr "جاري إعداد ساعة الهاردوير"
@@ -344,6 +317,10 @@ msgstr ""
 msgid "Failed to run dracut on the target"
 msgstr ""
 
+#: src/modules/dracut/main.py:59
+msgid "The exit code was {}"
+msgstr "كود الخروج كان {}"
+
 #: src/modules/initramfscfg/main.py:41
 msgid "Configuring initramfs."
 msgstr ""
@@ -352,18 +329,6 @@ msgstr ""
 msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/luksbootkeyfile/main.py:35
-msgid "Configuring LUKS key file."
-msgstr ""
-
-#: src/modules/luksbootkeyfile/main.py:74
-msgid "Encrypted rootfs setup error"
-msgstr ""
-
-#: src/modules/luksbootkeyfile/main.py:75
-msgid "Rootfs partition {!s} is LUKS but no passphrase found."
-msgstr ""
-
 #: src/modules/fstab/main.py:38
 msgid "Writing fstab."
 msgstr ""

lang/python/ast/LC_MESSAGES/python.po

@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-06-18 15:54+0200\n"
+"POT-Creation-Date: 2019-09-15 21:54+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: enolp <enolp@softastur.org>, 2019\n"
 "Language-Team: Asturian (https://www.transifex.com/calamares/teams/20061/ast/)\n"
@@ -29,23 +29,22 @@ msgstr ""
 msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/mount/main.py:150 src/modules/initcpiocfg/main.py:187
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:187
 #: src/modules/initcpiocfg/main.py:191
 #: src/modules/luksopenswaphookcfg/main.py:95