Merge branch 'master' into kcrash

2017-09-27 09:52:01 -04:00 · 2017-09-27 09:52:01 -04:00 · 33f78b375d
commit 33f78b375d
parent d3d7944828 d2cce926de
642 changed files with 53365 additions and 19658 deletions
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@ -0,0 +1,29 @@
+#### Submission type
+
+  - [ ] Bug report
+  - [ ] Feature Request
+
+
+#### Info regarding which version of Calamares is used, which Distribution
+
+> …
+
+#### Provide information on how the disks are set up, in detail, with full logs of commands issued 
+
+> …
+
+#### What do you expect to have happen when Calamares installs?
+
+> …
+
+#### Describe the issue you encountered
+
+> …
+
+#### Steps to reproduce the problem
+
+> …
+
+#### Include the installation.log:
+
+> …
--- a/.gitignore
+++ b/.gitignore
@ -35,8 +35,14 @@ Makefile*
 qtcreator-build
 CMakeLists.txt.user

+# KDevelop
+*.kdev4
+
 # PyCharm
 .idea

+# Visual Studio Code
+.vscode
+
 # Backup files
 *~
--- a/.travis.yml
+++ b/.travis.yml
@ -0,0 +1,22 @@
+language:
+  - cpp
+  - python
+
+python:
+  - 3.5
+
+sudo: required
+
+services:
+  - docker
+
+notifications:
+  irc:
+    - "chat.freenode.net#calamares"
+
+install:
+  - docker build -t calamares .
+
+script:
+  - docker run -v $PWD:/src --tmpfs /build:rw,size=65536k calamares bash -lc "cd /build && cmake -DWEBVIEW_FORCE_WEBKIT=1 -DKDE_INSTALL_USE_QT_SYS_PATHS=ON /src && make -j2 && make install DESTDIR=/build/INSTALL_ROOT"
+
--- a/.tx/config
+++ b/.tx/config
@ -7,3 +7,20 @@ source_file = lang/calamares_en.ts
 source_lang = en
 type = QT

+[calamares.dummypythonqt]
+file_filter = src/modules/dummypythonqt/lang/<lang>/LC_MESSAGES/dummypythonqt.po
+source_file = src/modules/dummypythonqt/lang/dummypythonqt.pot
+source_lang = en
+
+[calamares.fdo]
+file_filter = lang/desktop_<lang>.desktop
+source_file = calamares.desktop
+source_lang = en
+type = DESKTOP
+
+[calamares.python]
+file_filter = lang/python/<lang>/LC_MESSAGES/python.po
+source_file = lang/python.pot
+source_lang = en
+type = PO
+
--- a/1
+++ b/1
@ -1 +1,2 @@
 Teo Mrnjavac <teo@kde.org>
+Adriaan de Groot <groot@kde.org>
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1,21 +1,77 @@
-project( calamares CXX )
+# === This file is part of Calamares - <https://github.com/calamares> ===
+#
+#   Calamares is free software: you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation, either version 3 of the License, or
+#   (at your option) any later version.
+#
+#   Calamares is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
+#
+#   SPDX-License-Identifier: GPL-3.0+
+#   License-Filename: LICENSE
+#
+###
+#
+# Generally, this CMakeLists.txt will find all the dependencies for Calamares
+# and complain appropriately. See below (later in this file) for CMake-level
+# options. There are some "secret" options as well:
+#
+#   SKIP_MODULES    : a space or semicolon-separated list of directory names
+#                     under src/modules that should not be built.
+#
+# Example usage:
+#
+#   cmake . -DSKIP_MODULES="partition luksbootkeycfg"

-# The partition manager uses ECM but ECMConfig.cmake
-# will complain if we require CMake less than 2.8.13,
-# so never change this.
-cmake_minimum_required( VERSION 2.8.12 )
+project( calamares C CXX )

-set( CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules" )
+cmake_minimum_required( VERSION 3.2 )
+
+set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMakeModules" )
+
+set( CMAKE_CXX_STANDARD 14 )
+set( CMAKE_CXX_STANDARD_REQUIRED ON )
+set( CMAKE_C_STANDARD 99 )
+set( CMAKE_C_STANDARD_REQUIRED ON )

 if( CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
    message( STATUS "Found Clang ${CMAKE_CXX_COMPILER_VERSION}, setting up Clang-specific compiler flags." )
-    set( CMAKE_C_FLAGS                  "${CMAKE_C_FLAGS} -Wall -std=c99" )
+    set( CMAKE_C_FLAGS                  "${CMAKE_C_FLAGS} -Wall" )
    set( CMAKE_C_FLAGS_DEBUG            "-g" )
    set( CMAKE_C_FLAGS_MINSIZEREL       "-Os -DNDEBUG" )
    set( CMAKE_C_FLAGS_RELEASE          "-O4 -DNDEBUG" )
    set( CMAKE_C_FLAGS_RELWITHDEBINFO   "-O2 -g" )

-    set( CMAKE_CXX_FLAGS                "${CMAKE_CXX_FLAGS} -Weverything -std=c++14" )
+    # Clang warnings: doing *everything* is counter-productive, since it warns
+    # about things which we can't fix (e.g. C++98 incompatibilities, but
+    # Calaares is C++14).
+    foreach( CLANG_WARNINGS
+        -Weverything
+        -Wno-c++98-compat
+        -Wno-c++98-compat-pedantic
+        -Wno-padded
+        -Wno-undefined-reinterpret-cast
+        -Wno-global-constructors
+        -Wno-exit-time-destructors
+        -Wno-missing-prototypes
+        -Wno-documentation-unknown-command
+    )
+        string( APPEND CMAKE_CXX_FLAGS " ${CLANG_WARNINGS}" )
+    endforeach()
+
+    # Third-party code where we don't care so much about compiler warnings
+    # (because it's uncomfortable to patch) get different flags; use
+    #       mark_thirdparty_code( <file> [<file>...] )
+    # to switch off warnings for those sources.
+    set( SUPPRESS_3RDPARTY_WARNINGS "-Wno-everything" )
+    set( SUPPRESS_BOOST_WARNINGS " -Wno-zero-as-null-pointer-constant -Wno-disabled-macro-expansion" )
+
    set( CMAKE_CXX_FLAGS_DEBUG          "-g" )
    set( CMAKE_CXX_FLAGS_MINSIZEREL     "-Os -DNDEBUG" )
    set( CMAKE_CXX_FLAGS_RELEASE        "-O4 -DNDEBUG" )
@ -25,11 +81,21 @@ if( CMAKE_CXX_COMPILER_ID MATCHES "Clang" )

    set( CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined" )
 else()
-    set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99" )
-    set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -Wl,--no-undefined" )
-    set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -Wl,--fatal-warnings -Wnon-virtual-dtor -Woverloaded-virtual -Werror=return-type" )
+    set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,--no-undefined" )
+    set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,--fatal-warnings -Wnon-virtual-dtor -Woverloaded-virtual -Werror=return-type" )
+
+    set( SUPPRESS_3RDPARTY_WARNINGS "" )
+    set( SUPPRESS_BOOST_WARNINGS "" )
 endif()

+macro(mark_thirdparty_code)
+    set_source_files_properties( ${ARGV}
+        PROPERTIES
+            COMPILE_FLAGS "${SUPPRESS_3RDPARTY_WARNINGS}"
+            COMPILE_DEFINITIONS "THIRDPARTY"
+    )
+endmacro()
+
 if( CMAKE_COMPILER_IS_GNUCXX )
    if( CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.9 OR
        CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 4.9 )
@ -38,67 +104,65 @@ if( CMAKE_COMPILER_IS_GNUCXX )
    endif()
 endif()

-cmake_policy( SET CMP0023 OLD )
-cmake_policy( SET CMP0028 NEW ) # double colons in KF5::Foo and Qt5::Foo are necessarily IMPORTED or ALIAS targets, don't search further
+include( FeatureSummary )

-# Keep cmake 3.0 quiet
-if( POLICY CMP0043 )
-    cmake_policy( SET CMP0043 OLD )
-endif()
-
-include( MacroOptionalFindPackage )
-include( MacroLogFeature )
-
-set( QT_VERSION 5.4.0 )
+set( QT_VERSION 5.6.0 )

 find_package( Qt5 ${QT_VERSION} CONFIG REQUIRED Core Gui Widgets LinguistTools Svg Quick QuickWidgets )
-find_package( YamlCpp 0.5.1 REQUIRED )
+find_package( YAMLCPP 0.5.1 REQUIRED )
 find_package( PolkitQt5-1 REQUIRED )
-
-option( WITH_KF5Crash "Enable crash reporting with KCrash." ON )
-
-macro_optional_find_package( KF5Crash 5.18 )
-macro_log_feature(
-    KF5Crash_FOUND
-    "KCrash"
-    "Helper library for submitting crash reports with DrKonqi by KDE."
-    "http://api.kde.org/frameworks-api/frameworks5-apidocs/kcrash/html/namespaceKCrash.html"
-    FALSE "5.18"
-    "KCrash is used if a crash happens when running in a Plasma session."
-)
-
-if ( KF5Crash_FOUND )
-    find_package( KF5CoreAddons 5.18 REQUIRED )
+find_package(ECM 5.18 NO_MODULE)
+if( ECM_FOUND )
+    set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_MODULE_PATH})
 endif()

-option( WITH_PYTHON "Enable Python modules support." ON )
+option( INSTALL_CONFIG "Install configuration files" ON )
+option( WITH_PYTHON "Enable Python modules API (requires Boost.Python)." ON )
+option( WITH_PYTHONQT "Enable next generation Python modules API (experimental, requires PythonQt)." OFF )
+option( WITH_KF5Crash "Enable crash reporting with KCrash." ON )
+option( BUILD_TESTING "Build the testing tree." ON )

-macro_optional_find_package( PythonLibs 3.3 )
-macro_log_feature(
-    PYTHONLIBS_FOUND
-    "Python"
-    "C interface libraries for the Python 3 interpreter."
-    "http://python.org"
-    FALSE "3.3"
-    "Python 3 is used for some Calamares job modules."
+find_package( KF5 5.18 COMPONENTS CoreAddons Crash OPTIONAL )
+if( KF5Crash_DIR )  # Why not a _FOUND mechanism?
+    find_package( KF5 5.18 COMPONENTS CoreAddons REQUIRED )
+else()
+    set( WITH_KF5Crash OFF )
+endif()
+
+if( BUILD_TESTING )
+    enable_testing()
+endif ()
+
+find_package( PythonLibs 3.3 )
+set_package_properties(
+    PythonLibs PROPERTIES
+    DESCRIPTION "C interface libraries for the Python 3 interpreter."
+    URL "http://python.org"
+    PURPOSE "Python 3 is used for Python job modules."
 )

 if ( PYTHONLIBS_FOUND )
    include( BoostPython3 )
    find_boost_python3( 1.54.0 ${PYTHONLIBS_VERSION_STRING} CALAMARES_BOOST_PYTHON3_FOUND )
-    macro_log_feature(
-        CALAMARES_BOOST_PYTHON3_FOUND
-        "Boost.Python"
-        "A C++ library which enables seamless interoperability between C++ and Python 3."
-        "http://www.boost.org"
-        FALSE "1.54.0"
-        "Boost.Python is used for interfacing with Calamares job modules written in Python 3."
+    set_package_properties(
+        Boost PROPERTIES
+        PURPOSE "Boost.Python is used for Python job modules."
+    )
+
+    find_package( PythonQt )
+    set_package_properties( PythonQt PROPERTIES
+        DESCRIPTION "A Python embedding solution for Qt applications."
+        URL "http://pythonqt.sourceforge.net"
+        PURPOSE "PythonQt is used for Python view modules."
    )
 endif()

-if ( PYTHONLIBS_NOTFOUND OR NOT CALAMARES_BOOST_PYTHON3_FOUND )
+if( PYTHONLIBS_NOTFOUND OR NOT CALAMARES_BOOST_PYTHON3_FOUND )
    set( WITH_PYTHON OFF )
 endif()
+if( PYTHONLIBS_NOTFOUND OR NOT PYTHONQT_FOUND )
+    set( WITH_PYTHONQT OFF )
+endif()

 ###
 ### Calamares application info
@ -107,11 +171,12 @@ set( CALAMARES_ORGANIZATION_NAME "Calamares" )
 set( CALAMARES_ORGANIZATION_DOMAIN "github.com/calamares" )
 set( CALAMARES_APPLICATION_NAME  "Calamares" )
 set( CALAMARES_DESCRIPTION_SUMMARY "The distribution-independent installer framework" )
-set( CALAMARES_TRANSLATION_LANGUAGES ar ast bg ca cs_CZ da de el en en_GB es_MX es eu fr hu id is it_IT ja lt nl pl pt_BR pt_PT ro ru sv th tr_TR zh_CN zh_TW )
+set( CALAMARES_TRANSLATION_LANGUAGES ar ast bg ca cs_CZ da de el en en_GB es_MX es eu fr he hr hu id is it_IT ja lt nl pl pt_BR pt_PT ro ru sk sv th tr_TR zh_CN zh_TW )

-set( CALAMARES_VERSION_MAJOR 2 )
+### Bump version here
+set( CALAMARES_VERSION_MAJOR 3 )
 set( CALAMARES_VERSION_MINOR 1 )
-set( CALAMARES_VERSION_PATCH 0 )
+set( CALAMARES_VERSION_PATCH 5 )
 set( CALAMARES_VERSION_RC 0 )

 set( CALAMARES_VERSION ${CALAMARES_VERSION_MAJOR}.${CALAMARES_VERSION_MINOR}.${CALAMARES_VERSION_PATCH} )
@ -160,21 +225,74 @@ configure_file(
 )

 # Early configure these files as we need them later on
-configure_file( CalamaresUse.cmake.in "${PROJECT_BINARY_DIR}/CalamaresUse.cmake" @ONLY )
-file( COPY CalamaresAddLibrary.cmake DESTINATION "${PROJECT_BINARY_DIR}" )
-file( COPY CalamaresAddModuleSubdirectory.cmake DESTINATION "${PROJECT_BINARY_DIR}" )
-file( COPY CalamaresAddPlugin.cmake DESTINATION "${PROJECT_BINARY_DIR}" )
-file( COPY CalamaresAddBrandingSubdirectory.cmake DESTINATION "${PROJECT_BINARY_DIR}" )
-
+set( CALAMARES_CMAKE_DIR "${CMAKE_SOURCE_DIR}/CMakeModules" )
 set( CALAMARES_LIBRARIES calamares )

+set( THIRDPARTY_DIR "${CMAKE_SOURCE_DIR}/thirdparty" )
+
+### Example Distro
+#
+# For testing purposes Calamares includes a very, very, limited sample
+# distro called "Generic". The root filesystem of "Generic" lives in
+# data/example-root and can be squashed up as part of the build, so
+# that a pure-upstream run of ./calamares -d from the build directory
+# (with all the default settings and configurations) can actually
+# do an complete example run.
+#
+# Some binaries from the build host (e.g. /bin and /lib) are also
+# squashed into the example filesystem.
+#
+# To build the example distro (for use by the default, example,
+# unsquashfs module), build the target 'example-distro', eg.:
+#
+#   make example-distro
+#
+find_program( mksquashfs_PROGRAM mksquashfs )
+if( mksquashfs_PROGRAM )
+    set( mksquashfs_FOUND ON )
+    set( src_fs ${CMAKE_SOURCE_DIR}/data/example-root/ )
+    set( dst_fs ${CMAKE_BINARY_DIR}/example.sqfs )
+    if( EXISTS ${src_fs} )
+        # based on the build host. If /lib64 exists, assume it is needed.
+        # Collect directories needed for a minimal binary distro,
+        # Note that the last path component is added to the root, so
+        # if you add /usr/sbin here, it will be put into /sbin_1.
+        # Add such paths to /etc/profile under ${src_fs}.
+        set( candidate_fs /sbin /bin /lib /lib64 )
+        set( host_fs "" )
+        foreach( c_fs ${candidate_fs} )
+            if( EXISTS ${c_fs} )
+                list( APPEND host_fs ${c_fs} )
+            endif()
+        endforeach()
+        add_custom_command(
+            OUTPUT ${dst_fs}
+            COMMAND ${mksquashfs_PROGRAM} ${src_fs} ${dst_fs} -all-root
+            COMMAND ${mksquashfs_PROGRAM} ${host_fs} ${dst_fs} -all-root
+        )
+        add_custom_target(example-distro DEPENDS ${dst_fs})
+    endif()
+else()
+    set( mksquashfs_FOUND OFF )
+endif()
+# Doesn't list mksquashfs as an optional dep, though, because it
+# hasn't been sent through the find_package() scheme.
+set_package_properties( mksquashfs PROPERTIES
+    DESCRIPTION "Create squashed filesystems"
+    URL "http://tldp.org/HOWTO/SquashFS-HOWTO/creatingandusing.html"
+    PURPOSE "Create example distro"
+    TYPE OPTIONAL
+)
+
+# add_subdirectory( thirdparty )
 add_subdirectory( src )

-macro_display_feature_log()
+add_feature_info(Python ${WITH_PYTHON} "Python job modules")
+add_feature_info(PythonQt ${WITH_PYTHONQT} "Python view modules")
+add_feature_info(Config ${INSTALL_CONFIG} "Install Calamares configuration")
+add_feature_info(KCrash ${WITH_KF5Crash} "Crash dumps via KCrash")

-if ( NOT WITH_PYTHON )
-    message( "-- WARNING: Building Calamares without Python support. Python modules will not work.\n" )
-endif()
+feature_summary(WHAT ALL)

 # Add all targets to the build-tree export set
 set( CMAKE_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake/Calamares" CACHE PATH  "Installation directory for CMake files" )
@ -200,11 +318,10 @@ install(
    FILES
        "${PROJECT_BINARY_DIR}/CalamaresConfig.cmake"
        "${PROJECT_BINARY_DIR}/CalamaresConfigVersion.cmake"
-        "${PROJECT_BINARY_DIR}/CalamaresUse.cmake"
-        "${PROJECT_BINARY_DIR}/CalamaresAddPlugin.cmake"
-        "${PROJECT_BINARY_DIR}/CalamaresAddModuleSubdirectory.cmake"
-        "${PROJECT_BINARY_DIR}/CalamaresAddLibrary.cmake"
-        "${PROJECT_BINARY_DIR}/CalamaresAddBrandingSubdirectory.cmake"
+        "CMakeModules/CalamaresAddPlugin.cmake"
+        "CMakeModules/CalamaresAddModuleSubdirectory.cmake"
+        "CMakeModules/CalamaresAddLibrary.cmake"
+        "CMakeModules/CalamaresAddBrandingSubdirectory.cmake"
    DESTINATION
        "${CMAKE_INSTALL_CMAKEDIR}"
 )
@ -217,12 +334,14 @@ install(
        "${CMAKE_INSTALL_CMAKEDIR}"
 )

-install(
-    FILES
-        settings.conf
-    DESTINATION
-        share/calamares
-)
+if( INSTALL_CONFIG )
+    install(
+        FILES
+            settings.conf
+        DESTINATION
+            share/calamares
+    )
+endif()

 install(
  FILES
@ -238,6 +357,13 @@ install(
      ${CMAKE_INSTALL_DATADIR}/applications
 )

+install(
+    FILES
+        man/calamares.8
+    DESTINATION
+        ${CMAKE_INSTALL_MANDIR}/man8/
+)
+
 # uninstall target
 configure_file(
    "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
--- a/CMakeModules/BoostPython3.cmake
+++ b/CMakeModules/BoostPython3.cmake
@ -20,38 +20,50 @@
 # "python-$dotsuffix", where suffix is based on the `python_version` argument.
 # One can supply a custom component name by setting the
 # `CALAMARES_BOOST_PYTHON3_COMPONENT` variable at CMake time.
-
 set( CALAMARES_BOOST_PYTHON3_COMPONENT python3 CACHE STRING
    "Name of the Boost.Python component. If Boost.Python is installed as
    libboost_python-foo.so then this variable should be set to 'python-foo'."
 )

-macro( find_boost_python3 boost_version python_version found_var )
-    set( ${found_var} OFF )
+include(FindPackageHandleStandardArgs)

-    # turns "3.4.123abc" into "34"
-    string( REGEX REPLACE "([0-9]+)\\.([0-9]+)\\..*" "\\1\\2" _fbp_python_short_version ${python_version} )
-
-    foreach( _fbp_name ${CALAMARES_BOOST_PYTHON3_COMPONENT} python-py${_fbp_python_short_version} )
+macro( _find_boost_python3_int boost_version componentname found_var )
+    foreach( _fbp_name ${CALAMARES_BOOST_PYTHON3_COMPONENT} ${componentname} )
        find_package( Boost ${boost_version} QUIET COMPONENTS ${_fbp_name} )
        string( TOUPPER ${_fbp_name} _fbp_uc_name )
        if( Boost_${_fbp_uc_name}_FOUND )
-            set( ${found_var} ON )
+            set( ${found_var} ${_fbp_uc_name} )
            break()
        endif()
    endforeach()
+endmacro()

-    if (NOT ${found_var})
+macro( find_boost_python3 boost_version python_version found_var )
+    set( ${found_var} OFF )
+    set( _fbp_found OFF )
+
+    # turns "3.4.123abc" into "34"
+    string( REGEX REPLACE "([0-9]+)\\.([0-9]+)\\..*" "\\1\\2" _fbp_python_short_version ${python_version} )
+    _find_boost_python3_int( ${boost_version} python-py${_fbp_python_short_version} _fbp_found )
+
+    if (NOT _fbp_found)
        # The following loop changes the searched name for Gentoo based distributions
        # turns "3.4.123abc" into "3.4"
        string( REGEX REPLACE "([0-9]+)\\.([0-9]+)\\..*" "\\1.\\2" _fbp_python_short_version ${python_version} )
-        foreach( _fbp_name ${CALAMARES_BOOST_PYTHON3_COMPONENT} python-${_fbp_python_short_version} )
-            find_package( Boost ${boost_version} QUIET COMPONENTS ${_fbp_name} )
-            string( TOUPPER ${_fbp_name} _fbp_uc_name )
-            if( Boost_${_fbp_uc_name}_FOUND )
-                set( ${found_var} ON )
-                break()
-            endif()
-        endforeach()
+        _find_boost_python3_int( ${boost_version} python-${_fbp_python_short_version} _fbp_found )
    endif()
+
+    set( ${found_var} ${_fbp_found} )
+
+    # This is superfluous, but allows proper reporting in the features list
+    if ( _fbp_found )
+        find_package( Boost ${boost_version} COMPONENTS ${_fbp_found} )
+    else()
+        find_package( Boost ${boost_version} COMPONENTS Python )
+    endif()
+    set_package_properties(
+        Boost PROPERTIES
+        DESCRIPTION "A C++ library which enables seamless interoperability between C++ and Python 3."
+        URL "http://www.boost.org"
+    )
 endmacro()
--- a/CMakeModules/CMakeColors.cmake
+++ b/CMakeModules/CMakeColors.cmake
@ -1,8 +1,16 @@
 if(NOT WIN32)
-  # [ -t 2 ] tests whether stderr is interactive.
-  # The negation '!' is because for POSIX shells, 0 is true and 1 is false.
-  execute_process(COMMAND test ! -t 2 RESULT_VARIABLE IS_STDERR_INTERACTIVE)
-  if(IS_STDERR_INTERACTIVE)
+  set(_use_color ON)
+  if("0" STREQUAL "$ENV{CLICOLOR}")
+    set(_use_color OFF)
+  endif()
+  if("0" STREQUAL "$ENV{CLICOLOR_FORCE}")
+    set(_use_color OFF)
+  endif()
+  if(NOT CMAKE_COLOR_MAKEFILE)
+    set(_use_color OFF)
+  endif()
+
+  if(_use_color)
    string(ASCII 27 Esc)
    set(ColorReset  "${Esc}[m")
    set(ColorBold   "${Esc}[1m")
@ -20,5 +28,5 @@ if(NOT WIN32)
    set(BoldMagenta "${Esc}[1;35m")
    set(BoldCyan    "${Esc}[1;36m")
    set(BoldWhite   "${Esc}[1;37m")
-  endif(IS_STDERR_INTERACTIVE)
+  endif()
 endif()
--- a/CMakeModules/CalamaresAddBrandingSubdirectory.cmake
+++ b/CMakeModules/CalamaresAddBrandingSubdirectory.cmake
--- a/CMakeModules/CalamaresAddLibrary.cmake
+++ b/CMakeModules/CalamaresAddLibrary.cmake
@ -45,9 +45,6 @@ function(calamares_add_library)
        add_library(${target} SHARED ${LIBRARY_SOURCES})
    endif()

-    # HACK: add qt modules - every lib should define its own set of modules
-    qt5_use_modules(${target} Core Gui Widgets ${LIBRARY_QT5_MODULES})
-
    # definitions - can this be moved into set_target_properties below?
    add_definitions(${QT_DEFINITIONS})
    set_target_properties(${target} PROPERTIES AUTOMOC TRUE)
@ -67,9 +64,15 @@ function(calamares_add_library)
    endif()

    # add link targets
-    target_link_libraries(${target} ${CALAMARES_LIBRARIES})
+    target_link_libraries(${target} 
+        LINK_PUBLIC ${CALAMARES_LIBRARIES}
+        Qt5::Core
+        Qt5::Gui
+        Qt5::Widgets
+        ${LIBRARY_QT5_MODULES}
+    )
    if(LIBRARY_LINK_LIBRARIES)
-        target_link_libraries(${target} ${LIBRARY_LINK_LIBRARIES})
+        target_link_libraries(${target} LINK_PUBLIC ${LIBRARY_LINK_LIBRARIES})
    endif()
    if(LIBRARY_LINK_PRIVATE_LIBRARIES)
        target_link_libraries(${target} LINK_PRIVATE ${LIBRARY_LINK_PRIVATE_LIBRARIES})
--- a/CMakeModules/CalamaresAddModuleSubdirectory.cmake
+++ b/CMakeModules/CalamaresAddModuleSubdirectory.cmake
@ -1,4 +1,5 @@
 include( CMakeColors )
+include( CalamaresAddTranslations )

 set( MODULE_DATA_DESTINATION share/calamares/modules )

@ -21,7 +22,7 @@ function( calamares_add_module_subdirectory )
                configure_file( ${SUBDIRECTORY}/${MODULE_FILE} ${SUBDIRECTORY}/${MODULE_FILE} COPYONLY )

                get_filename_component( FLEXT ${MODULE_FILE} EXT )
-                if( "${FLEXT}" STREQUAL ".conf" )
+                if( "${FLEXT}" STREQUAL ".conf" AND INSTALL_CONFIG)
                    install( FILES ${CMAKE_CURRENT_BINARY_DIR}/${SUBDIRECTORY}/${MODULE_FILE}
                             DESTINATION ${MODULE_DATA_DESTINATION} )
                    list( APPEND MODULE_CONFIG_FILES ${MODULE_FILE} )
@ -38,10 +39,24 @@ function( calamares_add_module_subdirectory )
 #            message( "   ${Green}FILES:${ColorReset} ${MODULE_FILES}" )
            message( "   ${Green}MODULE_DESTINATION:${ColorReset} ${MODULE_DESTINATION}" )
            if( MODULE_CONFIG_FILES )
-                message( "   ${Green}CONFIGURATION_FILES:${ColorReset} ${MODULE_CONFIG_FILES} => ${MODULE_DATA_DESTINATION}" )
+                if (INSTALL_CONFIG)
+                    message( "   ${Green}CONFIGURATION_FILES:${ColorReset} ${MODULE_CONFIG_FILES} => ${MODULE_DATA_DESTINATION}" )
+                else()
+                    message( "   ${Green}CONFIGURATION_FILES:${ColorReset} ${MODULE_CONFIG_FILES} => [Skipping installation]" )
+                endif()
            endif()
            message( "" )
        endif()
+        # We copy over the lang directory, if any
+        if( IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}/lang" )
+            install_calamares_gettext_translations(
+                ${SUBDIRECTORY}
+                SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}/lang"
+                FILENAME ${SUBDIRECTORY}.mo
+                RENAME calamares-${SUBDIRECTORY}.mo
+            )
+        endif()
+
    else()
        message( "-- ${BoldYellow}Warning:${ColorReset} tried to add module subdirectory ${BoldRed}${SUBDIRECTORY}${ColorReset} which has no CMakeLists.txt or module.desc." )
        message( "" )
--- a/CMakeModules/CalamaresAddPlugin.cmake
+++ b/CMakeModules/CalamaresAddPlugin.cmake
@ -1,12 +1,35 @@
+# 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).
+#
+# Usage:
+#
+# calamares_add_plugin(
+#   module-name
+#   TYPE <view|job>
+#   EXPORT_MACRO macro-name
+#   SOURCES source-file...
+#   UI ui-file...
+#   LINK_LIBRARIES lib...
+#   LINK_PRIVATE_LIBRARIES lib...
+#   COMPILE_DEFINITIONS def...
+#   RESOURCES resource-file
+#   [NO_INSTALL]
+#   [SHARED_LIB]
+# )
+
 include( CMakeParseArguments )
-include( ${CALAMARES_CMAKE_DIR}/CalamaresAddLibrary.cmake )
+include( CalamaresAddLibrary  )
+include( CMakeColors )

 function( calamares_add_plugin )
    # parse arguments ( name needs to be saved before passing ARGN into the macro )
    set( NAME ${ARGV0} )
    set( options NO_INSTALL SHARED_LIB )
    set( oneValueArgs NAME TYPE EXPORT_MACRO RESOURCES )
-    set( multiValueArgs SOURCES UI LINK_LIBRARIES COMPILE_DEFINITIONS )
+    set( multiValueArgs SOURCES UI LINK_LIBRARIES LINK_PRIVATE_LIBRARIES COMPILE_DEFINITIONS )
    cmake_parse_arguments( PLUGIN "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
    set( PLUGIN_NAME ${NAME} )
    set( PLUGIN_DESTINATION ${CMAKE_INSTALL_LIBDIR}/calamares/modules/${PLUGIN_NAME} )
@ -17,18 +40,22 @@ function( calamares_add_plugin )
    set( CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" )
    set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" )

-    include( CMakeColors )
    message( "-- ${BoldYellow}Found ${CALAMARES_APPLICATION_NAME} module: ${BoldRed}${PLUGIN_NAME}${ColorReset}" )
    if( NOT CMAKE_BUILD_TYPE STREQUAL "Release" )
        message( "   ${Green}TYPE:${ColorReset} ${PLUGIN_TYPE}" )
        message( "   ${Green}LINK_LIBRARIES:${ColorReset} ${PLUGIN_LINK_LIBRARIES}" )
+        message( "   ${Green}LINK_PRIVATE_LIBRARIES:${ColorReset} ${PLUGIN_LINK_PRIVATE_LIBRARIES}" )
 #        message( "   ${Green}SOURCES:${ColorReset} ${PLUGIN_SOURCES}" )
 #        message( "   ${Green}UI:${ColorReset} ${PLUGIN_UI}" )
 #        message( "   ${Green}EXPORT_MACRO:${ColorReset} ${PLUGIN_EXPORT_MACRO}" )
 #        message( "   ${Green}NO_INSTALL:${ColorReset} ${PLUGIN_NO_INSTALL}" )
        message( "   ${Green}PLUGIN_DESTINATION:${ColorReset} ${PLUGIN_DESTINATION}" )
        if( PLUGIN_CONFIG_FILES )
-            message( "   ${Green}CONFIGURATION_FILES:${ColorReset} ${PLUGIN_CONFIG_FILES} => ${PLUGIN_DATA_DESTINATION}" )
+            if ( INSTALL_CONFIG )
+                message( "   ${Green}CONFIGURATION_FILES:${ColorReset} ${PLUGIN_CONFIG_FILES} => ${PLUGIN_DATA_DESTINATION}" )
+            else()
+                message( "   ${Green}CONFIGURATION_FILES:${ColorReset} ${PLUGIN_CONFIG_FILES} => [Skipping installation]" )
+            endif()
        endif()
        if( PLUGIN_RESOURCES )
            message( "   ${Green}RESOURCES:${ColorReset} ${PLUGIN_RESOURCES}" )
@ -60,6 +87,10 @@ function( calamares_add_plugin )
        list( APPEND calamares_add_library_args "LINK_LIBRARIES" "${PLUGIN_LINK_LIBRARIES}" )
    endif()

+    if( PLUGIN_LINK_PRIVATE_LIBRARIES )
+        list( APPEND calamares_add_library_args "LINK_PRIVATE_LIBRARIES" "${PLUGIN_LINK_PRIVATE_LIBRARIES}" )
+    endif()
+
    if( PLUGIN_COMPILE_DEFINITIONS )
        list( APPEND calamares_add_library_args "COMPILE_DEFINITIONS" ${PLUGIN_COMPILE_DEFINITIONS} )
    endif()
@ -74,13 +105,23 @@ function( calamares_add_plugin )

    calamares_add_library( ${calamares_add_library_args} )

-    configure_file( ${PLUGIN_DESC_FILE} ${PLUGIN_DESC_FILE} COPYONLY )
+    if ( EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${PLUGIN_DESC_FILE} )
+        configure_file( ${PLUGIN_DESC_FILE} ${PLUGIN_DESC_FILE} COPYONLY )
+    else()
+        set( _file ${CMAKE_CURRENT_BINARY_DIR}/${PLUGIN_DESC_FILE} )
+        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" )
+    endif()
+
    install( FILES ${CMAKE_CURRENT_BINARY_DIR}/${PLUGIN_DESC_FILE}
             DESTINATION ${PLUGIN_DESTINATION} )

-    foreach( PLUGIN_CONFIG_FILE ${PLUGIN_CONFIG_FILES} )
-        configure_file( ${PLUGIN_CONFIG_FILE} ${PLUGIN_CONFIG_FILE} COPYONLY )
-        install( FILES ${CMAKE_CURRENT_BINARY_DIR}/${PLUGIN_CONFIG_FILE}
-                 DESTINATION ${PLUGIN_DATA_DESTINATION} )
-    endforeach()
+    if ( INSTALL_CONFIG )
+        foreach( PLUGIN_CONFIG_FILE ${PLUGIN_CONFIG_FILES} )
+            configure_file( ${PLUGIN_CONFIG_FILE} ${PLUGIN_CONFIG_FILE} COPYONLY )
+            install( FILES ${CMAKE_CURRENT_BINARY_DIR}/${PLUGIN_CONFIG_FILE}
+                     DESTINATION ${PLUGIN_DATA_DESTINATION} )
+        endforeach()
+    endif()
 endfunction()
--- a/CMakeModules/CalamaresAddTranslations.cmake
+++ b/CMakeModules/CalamaresAddTranslations.cmake
@ -0,0 +1,121 @@
+include( CMakeParseArguments )
+
+# Internal macro for adding the C++ / Qt translations to the
+# build and install tree. Should be called only once, from
+# src/calamares/CMakeLists.txt.
+macro(add_calamares_translations language)
+    list( APPEND CALAMARES_LANGUAGES ${ARGV} )
+
+    set( calamares_i18n_qrc_content "<!DOCTYPE RCC><RCC version=\"1.0\">\n" )
+
+    # calamares and qt language files
+    set( calamares_i18n_qrc_content "${calamares_i18n_qrc_content}<qresource prefix=\"/lang\">\n" )
+    foreach( lang ${CALAMARES_LANGUAGES} )
+        set( calamares_i18n_qrc_content "${calamares_i18n_qrc_content}<file>calamares_${lang}.qm</file>\n" )
+        list( APPEND TS_FILES "${CMAKE_SOURCE_DIR}/lang/calamares_${lang}.ts" )
+    endforeach()
+
+    set( calamares_i18n_qrc_content "${calamares_i18n_qrc_content}</qresource>\n" )
+    set( calamares_i18n_qrc_content "${calamares_i18n_qrc_content}</RCC>\n" )
+
+    file( WRITE ${CMAKE_BINARY_DIR}/lang/calamares_i18n.qrc "${calamares_i18n_qrc_content}" )
+
+    qt5_add_translation(QM_FILES ${TS_FILES})
+
+    ## HACK HACK HACK - around rcc limitations to allow out of source-tree building
+    set( trans_file calamares_i18n )
+    set( trans_srcfile ${CMAKE_BINARY_DIR}/lang/${trans_file}.qrc )
+    set( trans_infile ${CMAKE_CURRENT_BINARY_DIR}/${trans_file}.qrc )
+    set( trans_outfile ${CMAKE_CURRENT_BINARY_DIR}/qrc_${trans_file}.cxx )
+
+    # Copy the QRC file to the output directory
+    add_custom_command(
+        OUTPUT ${trans_infile}
+        COMMAND ${CMAKE_COMMAND} -E copy ${trans_srcfile} ${trans_infile}
+        MAIN_DEPENDENCY ${trans_srcfile}
+    )
+
+    # Run the resource compiler (rcc_options should already be set)
+    add_custom_command(
+        OUTPUT ${trans_outfile}
+        COMMAND "${Qt5Core_RCC_EXECUTABLE}"
+        ARGS ${rcc_options} -name ${trans_file} -o ${trans_outfile} ${trans_infile}
+        MAIN_DEPENDENCY ${trans_infile}
+        DEPENDS ${QM_FILES}
+    )
+endmacro()
+
+# Internal macro for Python translations
+#
+# Translations of the Python modules that don't have their own
+# lang/ subdirectories -- these are collected in top-level
+# lang/python/<lang>/LC_MESSAGES/python.mo
+macro(add_calamares_python_translations language)
+    set( CALAMARES_LANGUAGES "" )
+    list( APPEND CALAMARES_LANGUAGES ${ARGV} )
+
+    install_calamares_gettext_translations( python
+        SOURCE_DIR ${CMAKE_SOURCE_DIR}/lang/python
+        FILENAME python.mo
+        RENAME calamares-python.mo
+    )
+endmacro()
+
+# Installs a directory containing language-code-labeled subdirectories with
+# gettext data into the appropriate system directory. Allows renaming the
+# .mo files during install to avoid namespace clashes.
+#
+# install_calamares_gettext_translations(
+#   NAME <name of module, for human use>
+#   SOURCE_DIR path/to/lang
+#   FILENAME <name of file.mo>
+#   [RENAME <new-name of.mo>]
+# )
+#
+# For all of the (global) translation languages enabled for Calamares,
+# try installing $SOURCE_DIR/$lang/LC_MESSAGES/<filename>.mo into the
+# system gettext data directory (e.g. share/locale/), possibly renaming
+# filename.mo to renamed.mo in the process.
+function( install_calamares_gettext_translations )
+    # parse arguments ( name needs to be saved before passing ARGN into the macro )
+    set( NAME ${ARGV0} )
+    set( oneValueArgs NAME SOURCE_DIR FILENAME RENAME )
+    cmake_parse_arguments( TRANSLATION "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
+
+    if( NOT TRANSLATION_NAME )
+        set( TRANSLATION_NAME ${NAME} )
+    endif()
+    if( NOT TRANSLATION_FILENAME )
+        set( TRANSLATION_FILENAME "${TRANSLATION_NAME}.mo" )
+    endif()
+    if( NOT TRANSLATION_RENAME )
+        set( TRANSLATION_RENAME "${TRANSLATION_FILENAME}" )
+    endif()
+
+    message(STATUS "Installing gettext translations for ${TRANSLATION_NAME}")
+    message(STATUS "  Installing ${TRANSLATION_FILENAME} from ${TRANSLATION_SOURCE_DIR}")
+
+    set( TRANSLATION_NAME "${NAME}" )
+    set( INSTALLED_TRANSLATIONS "" )
+    foreach( lang ${CALAMARES_TRANSLATION_LANGUAGES} )  # Global
+        set( lang_mo "${TRANSLATION_SOURCE_DIR}/${lang}/LC_MESSAGES/${TRANSLATION_FILENAME}" )
+        if( lang STREQUAL "en" )
+            message( STATUS "  Skipping ${TRANSLATION_NAME} translations for en_US" )
+        else( EXISTS ${lang_mo} )
+            list( APPEND INSTALLED_LANGUAGES "${lang}" )
+            install(
+                FILES ${lang_mo}
+                DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/${lang}/LC_MESSAGES/
+                RENAME ${TRANSLATION_RENAME}
+            )
+            # TODO: make translations available in build dir too, for
+            #       translation when running calamares -d from builddir.
+            set(_build_lc ${CMAKE_BINARY_DIR}/lang/${lang}/LC_MESSAGES/)
+            file(COPY ${lang_mo} DESTINATION ${_build_lc})
+            if (NOT TRANSLATION_FILENAME STREQUAL TRANSLATION_RENAME)
+                file(RENAME ${_build_lc}${TRANSLATION_FILENAME} ${_build_lc}${TRANSLATION_RENAME})
+            endif()
+
+        endif()
+    endforeach()
+endfunction()
--- a/CMakeModules/FindCrypt.cmake
+++ b/CMakeModules/FindCrypt.cmake
@ -0,0 +1,34 @@
+# - Find libcrypt
+# Find the libcrypt includes and the libcrypt libraries
+# This module defines
+# LIBCRYPT_INCLUDE_DIR, root crypt include dir. Include crypt with crypt.h
+# LIBCRYPT_LIBRARY, the path to libcrypt
+# LIBCRYPT_FOUND, whether libcrypt was found
+
+if( CMAKE_SYSTEM MATCHES "FreeBSD" )
+    # FreeBSD has crypt(3) declared in unistd.h, which lives in
+    # libc; the libcrypt found here is not used.
+    find_path( CRYPT_INCLUDE_DIR NAMES unistd.h )
+    add_definitions( -DNO_CRYPT_H )
+else()
+    find_path( CRYPT_INCLUDE_DIR
+        NAMES crypt.h
+        HINTS
+            ${CMAKE_INSTALL_INCLUDEDIR}
+        NO_CACHE
+    )
+endif()
+
+find_library( CRYPT_LIBRARIES
+    NAMES crypt
+    HINTS
+        ${CMAKE_INSTALL_LIBDIR}
+)
+
+include( FindPackageHandleStandardArgs )
+find_package_handle_standard_args(
+    Crypt
+    REQUIRED_VARS CRYPT_LIBRARIES CRYPT_INCLUDE_DIR
+)
+
+mark_as_advanced( CRYPT_INCLUDE_DIR CRYPT_LIBRARIES )
--- a/src/modules/welcome/CMakeModules/FindLIBPARTED.cmake
+++ b/src/modules/welcome/CMakeModules/FindLIBPARTED.cmake
--- a/CMakeModules/FindPythonQt.cmake
+++ b/CMakeModules/FindPythonQt.cmake
@ -0,0 +1,77 @@
+# Find PythonQt
+#
+# Sets PYTHONQT_FOUND, PYTHONQT_INCLUDE_DIR, PYTHONQT_LIBRARY, PYTHONQT_LIBRARIES
+#
+
+# Python is required
+find_package(PythonLibs)
+if(NOT PYTHONLIBS_FOUND)
+  message(FATAL_ERROR "error: Python is required to build PythonQt")
+endif()
+
+if(NOT EXISTS "${PYTHONQT_INSTALL_DIR}")
+  find_path(PYTHONQT_INSTALL_DIR include/PythonQt/PythonQt.h DOC "Directory where PythonQt was installed.")
+endif()
+# XXX Since PythonQt 3.0 is not yet cmakeified, depending
+#     on how PythonQt is built, headers will not always be
+#     installed in "include/PythonQt". That is why "src"
+#     is added as an option. See [1] for more details.
+#     [1] https://github.com/commontk/CTK/pull/538#issuecomment-86106367
+find_path(PYTHONQT_INCLUDE_DIR PythonQt.h
+  PATHS "${PYTHONQT_INSTALL_DIR}/include/PythonQt"
+        "${PYTHONQT_INSTALL_DIR}/src"
+  DOC "Path to the PythonQt include directory")
+
+# Minimum v3.1 is needed
+find_library(PYTHONQT_LIBRARY_RELEASE PythonQt PATHS "${PYTHONQT_INSTALL_DIR}/lib" DOC "The PythonQt library.")
+find_library(PYTHONQT_LIBRARY_DEBUG NAMES PythonQt${CTK_CMAKE_DEBUG_POSTFIX} PythonQt${CMAKE_DEBUG_POSTFIX} PythonQt PATHS "${PYTHONQT_INSTALL_DIR}/lib" DOC "The PythonQt library.")
+find_library(PYTHONQT_QTALL_LIBRARY_RELEASE PythonQt_QtAll PATHS "${PYTHONQT_INSTALL_DIR}/lib" DOC "Full Qt bindings for the PythonQt library.")
+find_library(PYTHONQT_QTALL_LIBRARY_DEBUG NAMES PythonQt_QtAll${CTK_CMAKE_DEBUG_POSTFIX} PythonQt_QtAll${CMAKE_DEBUG_POSTFIX} PythonQt_QtAll PATHS "${PYTHONQT_INSTALL_DIR}/lib" DOC "Full Qt bindings for the PythonQt library.")
+
+# Also check for v3.2+
+find_library(PYTHONQT_LIBRARY_RELEASE PythonQt-Qt5-Python3 PATHS "${PYTHONQT_INSTALL_DIR}/lib" DOC "The PythonQt library.")
+find_library(PYTHONQT_LIBRARY_DEBUG NAMES PythonQt-Qt5-Python3${CTK_CMAKE_DEBUG_POSTFIX} PythonQt-Qt5-Python3${CMAKE_DEBUG_POSTFIX} PythonQt-Qt5-Python3 PATHS "${PYTHONQT_INSTALL_DIR}/lib" DOC "The PythonQt library.")
+find_library(PYTHONQT_QTALL_LIBRARY_RELEASE PythonQt_QtAll-Qt5-Python3 PATHS "${PYTHONQT_INSTALL_DIR}/lib" DOC "Full Qt bindings for the PythonQt library.")
+find_library(PYTHONQT_QTALL_LIBRARY_DEBUG NAMES PythonQt_QtAll-Qt5-Python3${CTK_CMAKE_DEBUG_POSTFIX} PythonQt_QtAll-Qt5-Python3${CMAKE_DEBUG_POSTFIX} PythonQt_QtAll-Qt5-Python3 PATHS "${PYTHONQT_INSTALL_DIR}/lib" DOC "Full Qt bindings for the PythonQt library.")
+
+set(PYTHONQT_LIBRARY)
+if(PYTHONQT_LIBRARY_RELEASE)
+  list(APPEND PYTHONQT_LIBRARY optimized ${PYTHONQT_LIBRARY_RELEASE})
+endif()
+if(PYTHONQT_LIBRARY_DEBUG)
+  list(APPEND PYTHONQT_LIBRARY debug ${PYTHONQT_LIBRARY_DEBUG})
+endif()
+
+set(PYTHONQT_QTALL_LIBRARY)
+if(PYTHONQT_QTALL_LIBRARY_RELEASE)
+  list(APPEND PYTHONQT_QTALL_LIBRARY optimized ${PYTHONQT_QTALL_LIBRARY_RELEASE})
+endif()
+if(PYTHONQT_QTALL_LIBRARY_DEBUG)
+  list(APPEND PYTHONQT_QTALL_LIBRARY debug ${PYTHONQT_QTALL_LIBRARY_DEBUG})
+endif()
+
+mark_as_advanced(PYTHONQT_INSTALL_DIR)
+mark_as_advanced(PYTHONQT_INCLUDE_DIR)
+mark_as_advanced(PYTHONQT_LIBRARY_RELEASE)
+mark_as_advanced(PYTHONQT_LIBRARY_DEBUG)
+mark_as_advanced(PYTHONQT_QTALL_LIBRARY_RELEASE)
+mark_as_advanced(PYTHONQT_QTALL_LIBRARY_DEBUG)
+
+# On linux, also find libutil
+if(UNIX AND NOT APPLE)
+  find_library(PYTHONQT_LIBUTIL util)
+  mark_as_advanced(PYTHONQT_LIBUTIL)
+endif()
+
+# All upper case _FOUND variable is maintained for backwards compatibility.
+set(PYTHONQT_FOUND 0)
+set(PythonQt_FOUND 0)
+
+if(PYTHONQT_INCLUDE_DIR AND PYTHONQT_LIBRARY AND PYTHONQT_QTALL_LIBRARY)
+  # Currently CMake'ified PythonQt only supports building against a python Release build.
+  # This applies independently of CTK build type (Release, Debug, ...)
+  add_definitions(-DPYTHONQT_USE_RELEASE_PYTHON_FALLBACK)
+  set(PYTHONQT_FOUND 1)
+  set(PythonQt_FOUND ${PYTHONQT_FOUND})
+  set(PYTHONQT_LIBRARIES ${PYTHONQT_LIBRARY} ${PYTHONQT_LIBUTIL} ${PYTHONQT_QTALL_LIBRARY})
+endif()
--- a/CMakeModules/FindYAMLCPP.cmake
+++ b/CMakeModules/FindYAMLCPP.cmake
--- a/CMakeModules/IncludeKPMCore.cmake
+++ b/CMakeModules/IncludeKPMCore.cmake
@ -0,0 +1,17 @@
+# Shared CMake core for finding KPMCore
+#
+# This is wrapped into a CMake include file because there's a bunch of
+# pre-requisites that need searching for before looking for KPMCore.
+# If you just do find_package( KPMCore ) without finding the things
+# it links against first, you get CMake errors.
+#
+#
+find_package(ECM 5.10.0 REQUIRED NO_MODULE)
+set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_MODULE_PATH})
+
+include(KDEInstallDirs)
+include(GenerateExportHeader)
+find_package( KF5 REQUIRED CoreAddons )
+find_package( KF5 REQUIRED Config I18n IconThemes KIO Service )
+
+find_package( KPMcore 3.0.3 REQUIRED )
--- a/CMakeModules/MacroLogFeature.cmake
+++ b/CMakeModules/MacroLogFeature.cmake
@ -1,157 +0,0 @@
-# This file defines the Feature Logging macros.
-#
-# MACRO_LOG_FEATURE(VAR FEATURE DESCRIPTION URL [REQUIRED [MIN_VERSION [COMMENTS]]])
-#   Logs the information so that it can be displayed at the end
-#   of the configure run
-#   VAR : TRUE or FALSE, indicating whether the feature is supported
-#   FEATURE: name of the feature, e.g. "libjpeg"
-#   DESCRIPTION: description what this feature provides
-#   URL: home page
-#   REQUIRED: TRUE or FALSE, indicating whether the featue is required
-#   MIN_VERSION: minimum version number. empty string if unneeded
-#   COMMENTS: More info you may want to provide.  empty string if unnecessary
-#
-# MACRO_DISPLAY_FEATURE_LOG()
-#   Call this to display the collected results.
-#   Exits CMake with a FATAL error message if a required feature is missing
-#
-# Example:
-#
-# INCLUDE(MacroLogFeature)
-#
-# FIND_PACKAGE(JPEG)
-# MACRO_LOG_FEATURE(JPEG_FOUND "libjpeg" "Support JPEG images" "http://www.ijg.org" TRUE "3.2a" "")
-# ...
-# MACRO_DISPLAY_FEATURE_LOG()
-
-# Copyright (c) 2006, Alexander Neundorf, <neundorf@kde.org>
-# Copyright (c) 2006, Allen Winter, <winter@kde.org>
-# Copyright (c) 2009, Sebastian Trueg, <trueg@kde.org>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-IF (NOT _macroLogFeatureAlreadyIncluded)
-   SET(_file ${CMAKE_BINARY_DIR}/MissingRequirements.txt)
-   IF (EXISTS ${_file})
-      FILE(REMOVE ${_file})
-   ENDIF (EXISTS ${_file})
-
-   SET(_file ${CMAKE_BINARY_DIR}/EnabledFeatures.txt)
-   IF (EXISTS ${_file})
-      FILE(REMOVE ${_file})
-   ENDIF (EXISTS ${_file})
-
-   SET(_file ${CMAKE_BINARY_DIR}/DisabledFeatures.txt)
-   IF (EXISTS ${_file})
-      FILE(REMOVE ${_file})
-  ENDIF (EXISTS ${_file})
-
-  SET(_macroLogFeatureAlreadyIncluded TRUE)
-
-  INCLUDE(FeatureSummary)
-
-ENDIF (NOT _macroLogFeatureAlreadyIncluded)
-
-
-MACRO(MACRO_LOG_FEATURE _var _package _description _url ) # _required _minvers _comments)
-
-   STRING(TOUPPER "${ARGV4}" _required)
-   SET(_minvers "${ARGV5}")
-   SET(_comments "${ARGV6}")
-
-   IF (${_var})
-     SET(_LOGFILENAME ${CMAKE_BINARY_DIR}/EnabledFeatures.txt)
-   ELSE (${_var})
-     IF ("${_required}" STREQUAL "TRUE")
-       SET(_LOGFILENAME ${CMAKE_BINARY_DIR}/MissingRequirements.txt)
-     ELSE ("${_required}" STREQUAL "TRUE")
-       SET(_LOGFILENAME ${CMAKE_BINARY_DIR}/DisabledFeatures.txt)
-     ENDIF ("${_required}" STREQUAL "TRUE")
-   ENDIF (${_var})
-
-   SET(_logtext "   * ${_package}")
-
-   IF (NOT ${_var})
-      IF (${_minvers} MATCHES ".*")
-        SET(_logtext "${_logtext} (${_minvers} or higher)")
-      ENDIF (${_minvers} MATCHES ".*")
-      SET(_logtext "${_logtext}  <${_url}>\n     ")
-   ELSE (NOT ${_var})
-     SET(_logtext "${_logtext} - ")
-   ENDIF (NOT ${_var})
-
-   SET(_logtext "${_logtext}${_description}")
-
-   IF (NOT ${_var})
-      IF (${_comments} MATCHES ".*")
-        SET(_logtext "${_logtext}\n     ${_comments}")
-      ENDIF (${_comments} MATCHES ".*")
-#      SET(_logtext "${_logtext}\n") #double-space missing features?
-   ENDIF (NOT ${_var})
-
-   FILE(APPEND "${_LOGFILENAME}" "${_logtext}\n")
-
-   IF(COMMAND SET_PACKAGE_INFO)  # in FeatureSummary.cmake since CMake 2.8.3
-     SET_PACKAGE_INFO("${_package}" "\"${_description}\"" "${_url}" "\"${_comments}\"")
-   ENDIF(COMMAND SET_PACKAGE_INFO)
-
-ENDMACRO(MACRO_LOG_FEATURE)
-
-
-MACRO(MACRO_DISPLAY_FEATURE_LOG)
-   IF(COMMAND FEATURE_SUMMARY) # in FeatureSummary.cmake since CMake 2.8.3
-      FEATURE_SUMMARY(FILENAME ${CMAKE_CURRENT_BINARY_DIR}/FindPackageLog.txt
-                      WHAT ALL)
-   ENDIF(COMMAND FEATURE_SUMMARY)
-
-   SET(_missingFile ${CMAKE_BINARY_DIR}/MissingRequirements.txt)
-   SET(_enabledFile ${CMAKE_BINARY_DIR}/EnabledFeatures.txt)
-   SET(_disabledFile ${CMAKE_BINARY_DIR}/DisabledFeatures.txt)
-
-   IF (EXISTS ${_missingFile} OR EXISTS ${_enabledFile} OR EXISTS ${_disabledFile})
-     SET(_printSummary TRUE)
-   ENDIF (EXISTS ${_missingFile} OR EXISTS ${_enabledFile} OR EXISTS ${_disabledFile})
-
-   IF(_printSummary)
-     SET(_missingDeps 0)
-     IF (EXISTS ${_enabledFile})
-       FILE(READ ${_enabledFile} _enabled)
-       FILE(REMOVE ${_enabledFile})
-       SET(_summary "${_summary}\n-----------------------------------------------------------------------------\n-- The following external packages were located on your system.\n-- This installation will have the extra features provided by these packages.\n-----------------------------------------------------------------------------\n${_enabled}")
-     ENDIF (EXISTS ${_enabledFile})
-
-
-     IF (EXISTS ${_disabledFile})
-       SET(_missingDeps 1)
-       FILE(READ ${_disabledFile} _disabled)
-       FILE(REMOVE ${_disabledFile})
-       SET(_summary "${_summary}\n-----------------------------------------------------------------------------\n-- The following OPTIONAL packages could NOT be located on your system.\n-- Consider installing them to enable more features from this software.\n-----------------------------------------------------------------------------\n${_disabled}")
-     ENDIF (EXISTS ${_disabledFile})
-
-
-     IF (EXISTS ${_missingFile})
-       SET(_missingDeps 1)
-       FILE(READ ${_missingFile} _requirements)
-       SET(_summary "${_summary}\n-----------------------------------------------------------------------------\n-- The following REQUIRED packages could NOT be located on your system.\n-- You must install these packages before continuing.\n-----------------------------------------------------------------------------\n${_requirements}")
-       FILE(REMOVE ${_missingFile})
-       SET(_haveMissingReq 1)
-     ENDIF (EXISTS ${_missingFile})
-
-
-     IF (NOT ${_missingDeps})
-       SET(_summary "${_summary}\n-----------------------------------------------------------------------------\n-- Congratulations! All external packages have been found.")
-     ENDIF (NOT ${_missingDeps})
-
-
-     MESSAGE(${_summary})
-     MESSAGE("-----------------------------------------------------------------------------\n")
-
-
-     IF(_haveMissingReq)
-       MESSAGE(FATAL_ERROR "Exiting: Missing Requirements")
-     ENDIF(_haveMissingReq)
-
-   ENDIF(_printSummary)
-
-ENDMACRO(MACRO_DISPLAY_FEATURE_LOG)
--- a/CMakeModules/MacroOptionalFindPackage.cmake
+++ b/CMakeModules/MacroOptionalFindPackage.cmake
@ -1,48 +0,0 @@
-# - MACRO_OPTIONAL_FIND_PACKAGE() combines FIND_PACKAGE() with an OPTION()
-# MACRO_OPTIONAL_FIND_PACKAGE( <name> [QUIT] )
-# This macro is a combination of OPTION() and FIND_PACKAGE(), it
-# works like FIND_PACKAGE(), but additionally it automatically creates
-# an option name WITH_<name>, which can be disabled via the cmake GUI.
-# or via -DWITH_<name>=OFF
-# The standard <name>_FOUND variables can be used in the same way
-# as when using the normal FIND_PACKAGE()
-
-# Copyright (c) 2006-2010 Alexander Neundorf, <neundorf@kde.org>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-# This is just a helper macro to set a bunch of variables empty.
-# We don't know whether the package uses UPPERCASENAME or CamelCaseName, so we try both:
-macro(_MOFP_SET_EMPTY_IF_DEFINED _name _var)
-   if(DEFINED ${_name}_${_var})
-      set(${_name}_${_var} "")
-   endif(DEFINED ${_name}_${_var})
-
-   string(TOUPPER ${_name} _nameUpper)
-   if(DEFINED ${_nameUpper}_${_var})
-      set(${_nameUpper}_${_var}  "")
-   endif(DEFINED ${_nameUpper}_${_var})
-endmacro(_MOFP_SET_EMPTY_IF_DEFINED _package _var)
-
-
-macro (MACRO_OPTIONAL_FIND_PACKAGE _name )
-   option(WITH_${_name} "Search for ${_name} package" ON)
-   if (WITH_${_name})
-      find_package(${_name} ${ARGN})
-   else (WITH_${_name})
-      string(TOUPPER ${_name} _nameUpper)
-      set(${_name}_FOUND FALSE)
-      set(${_nameUpper}_FOUND FALSE)
-
-      _mofp_set_empty_if_defined(${_name} INCLUDE_DIRS)
-      _mofp_set_empty_if_defined(${_name} INCLUDE_DIR)
-      _mofp_set_empty_if_defined(${_name} INCLUDES)
-      _mofp_set_empty_if_defined(${_name} LIBRARY)
-      _mofp_set_empty_if_defined(${_name} LIBRARIES)
-      _mofp_set_empty_if_defined(${_name} LIBS)
-      _mofp_set_empty_if_defined(${_name} FLAGS)
-      _mofp_set_empty_if_defined(${_name} DEFINITIONS)
-   endif (WITH_${_name})
-endmacro (MACRO_OPTIONAL_FIND_PACKAGE)
-
--- a/CalamaresUse.cmake.in
+++ b/CalamaresUse.cmake.in
@ -1,12 +0,0 @@
-#FIXME: this duplicates top level cmakelists: how can we reduce code duplication?
-
-find_package( Qt5 5.3.0 CONFIG REQUIRED Core Gui Widgets LinguistTools )
-
-if(NOT CALAMARES_CMAKE_DIR)
-    set(CALAMARES_CMAKE_DIR ${CMAKE_CURRENT_LIST_DIR})
-endif()
-
-include( "${CALAMARES_CMAKE_DIR}/CalamaresAddLibrary.cmake" )
-include( "${CALAMARES_CMAKE_DIR}/CalamaresAddModuleSubdirectory.cmake" )
-include( "${CALAMARES_CMAKE_DIR}/CalamaresAddPlugin.cmake" )
-include( "${CALAMARES_CMAKE_DIR}/CalamaresAddBrandingSubdirectory.cmake" )
--- a/2
+++ b/2
@ -0,0 +1,2 @@
+FROM kdeneon/all
+RUN sudo apt-get update && sudo 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 libkpmcore-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/LICENSES/GPLv3+-ImageRegistry
+++ b/LICENSES/GPLv3+-ImageRegistry
@ -0,0 +1,16 @@
+/*
+ *   Copyright 2012, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+
+    This program 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.
+
+    This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
--- a/LICENSES/GPLv3+-QJsonModel
+++ b/LICENSES/GPLv3+-QJsonModel
@ -0,0 +1,18 @@
+/***********************************************
+    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/>.
+
+**********************************************/
--- a/LICENSES/LGPLv2.1-Presentation
+++ b/LICENSES/LGPLv2.1-Presentation
@ -0,0 +1,83 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the QML Presentation System.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QML Presentation System.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
--- a/LICENSES/LGPLv2.1-Presentation-Exception
+++ b/LICENSES/LGPLv2.1-Presentation-Exception
@ -0,0 +1,22 @@
+Digia Qt LGPL Exception version 1.1
+
+As an additional permission to the GNU Lesser General Public License version
+2.1, the object code form of a "work that uses the Library" may incorporate
+material from a header file that is part of the Library.  You may distribute
+such object code under terms of your choice, provided that:
+    (i)   the header files of the Library have not been modified; and 
+    (ii)  the incorporated material is limited to numerical parameters, data
+          structure layouts, accessors, macros, inline functions and
+          templates; and
+    (iii) you comply with the terms of Section 6 of the GNU Lesser General
+          Public License version 2.1.
+
+Moreover, you may apply this exception to a modified version of the Library,
+provided that such modification does not involve copying material from the
+Library into the modified Library's header files unless such material is
+limited to (i) numerical parameters; (ii) data structure layouts;
+(iii) accessors; and (iv) small macros, templates and inline functions of
+five lines or less in length.
+
+Furthermore, you are not required to apply this additional permission to a
+modified version of the Library.
--- a/LICENSES/MIT-QtWaitingSpinner
+++ b/LICENSES/MIT-QtWaitingSpinner
@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Original Work Copyright (c) 2012-2015 Alexander Turkin
+Modified 2014 by William Hallatt
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
--- a/README.md
+++ b/README.md
@ -3,18 +3,19 @@

 [![GitHub release](https://img.shields.io/github/release/calamares/calamares.svg)](https://github.com/calamares/calamares/releases)
 [![Build Status](https://calamares.io/ci/buildStatus/icon?job=calamares-post_commit)](https://calamares.io/ci/job/calamares-post_commit/)
+[![Travis Build Status](https://travis-ci.org/calamares/calamares.svg?branch=master)](https://travis-ci.org/calamares/calamares)
 [![Coverity Scan Build Status](https://scan.coverity.com/projects/5389/badge.svg)](https://scan.coverity.com/projects/5389)
 [![GitHub license](https://img.shields.io/github/license/calamares/calamares.svg)](https://github.com/calamares/calamares/blob/master/LICENSE)

-| [Report a Bug](https://calamares.io/bugs/) | [Contribute](https://github.com/calamares/calamares/blob/master/HACKING.md) | [Translate](https://www.transifex.com/projects/p/calamares/) | Freenode (IRC): #calamares |
-|:-----------------------------------------:|:----------------------:|:-----------------------:|:--------------------------:|
+| [Report a Bug](https://github.com/calamares/calamares/issues/new) | [Contribute](https://github.com/calamares/calamares/blob/master/ci/HACKING.md) | [Translate](https://www.transifex.com/projects/p/calamares/) | Freenode (IRC): #calamares | [Wiki](https://github.com/calamares/calamares/wiki) |
+|:-----------------------------------------:|:----------------------:|:-----------------------:|:--------------------------:|:--------------------------:|

 ### Dependencies

 Main:
 * Compiler with C++11 support: GCC >= 4.9.0 or Clang >= 3.5.1
-* CMake >= 2.8.12
-* Qt >= 5.3
+* CMake >= 3.2
+* Qt >= 5.6
 * yaml-cpp >= 0.5.1
 * Python >= 3.3
 * Boost.Python >= 1.55.0
@ -22,52 +23,18 @@ Main:

 Modules:
 * welcome:
- * NetworkManager
- * UPower
+  * NetworkManager
+  * UPower
 * partition:
- * extra-cmake-modules
- * KF5: KCoreAddons, KConfig, KI18n, KIconThemes, KIO, KService
- * KPMcore >= 2.1
- * sgdisk
+  * extra-cmake-modules
+  * KF5: KCoreAddons, KConfig, KI18n, KIconThemes, KIO, KService
+  * KPMcore >= 3.0.3
 * bootloader:
- * systemd-boot or GRUB
- * sgdisk
+  * systemd-boot or GRUB
 * unpackfs:
- * squashfs-tools
- * rsync
-
-
-### Deployment
-[__Setting up branding__](https://github.com/calamares/calamares/blob/master/src/branding/README.md)
-
-[__Working with modules__](https://github.com/calamares/calamares/blob/master/src/modules/README.md)
-
+  * squashfs-tools
+  * rsync

 ### Building
-Clone Calamares from GitHub and `cd` into the calamares directory, then:
-```
-$ git submodule init
-$ git submodule update
-$ mkdir build
-$ cd build
-$ cmake -DCMAKE_BUILD_TYPE=Debug ..
-$ make
-```

-#### Supported variables for CMake
- * `WITH_PYTHON` - if this is set to false, the Python module interface will not be built. Default is true.
- * `SKIP_MODULES` - takes a space-separated list of module names that should not be built even if present in `src/modules` (e.g. `cmake -DSKIP_MODULES="partition mount umount welcome" ..`). Default is empty.
-
-### Design Notes
-Calamares is currently split as follows:
- 1. __libcalamares__ - The back-end library.
-   * Only depends on QtCore, yaml-cpp, Python and Boost.Python.
-   * Provides a job queue and generic jobs.
-   * Comes with 3 job interfaces: C++, Python and process (the latter is very limited).
- 2. __libcalamaresui__ - The front-end library.
-   * Same dependencies as libcalamares, plus QtWidgets and other Qt modules.
-   * Comes with a module loading system, for different kinds of plugins.
-   * Supports branding components.
-   * Presents a bunch of pages in a scripted order, enqueues jobs in the back-end library.
- 3. __calamares__ - The main executable.
-   * A thin wrapper around libcalamaresui; starts up and plugs together all the parts.
+See [wiki](https://github.com/calamares/calamares/wiki) for up to date building and deployment instructions.
--- a/calamares.desktop
+++ b/calamares.desktop
@ -3,10 +3,113 @@ Type=Application
 Version=1.0
 Name=Calamares
 GenericName=System Installer
+Keywords=calamares;system;installer
 TryExec=calamares
 Exec=pkexec /usr/bin/calamares
 Comment=Calamares — System Installer
 Icon=calamares
 Terminal=false
-StartupNotify=false
+StartupNotify=true
 Categories=Qt;System;
+
+
+Name[ca]=Calamares
+Icon[ca]=calamares
+GenericName[ca]=Instal·lador de sistema
+Comment[ca]=Calamares — Instal·lador de sistema
+Name[da]=Calamares
+Icon[da]=calamares
+GenericName[da]=Systeminstallationsprogram
+Comment[da]=Calamares — Systeminstallationsprogram
+Name[de]=Calamares
+Icon[de]=calamares
+GenericName[de]=Installation des Betriebssystems
+Comment[de]=Calamares - Installation des Betriebssystems
+Name[en_GB]=Calamares
+Icon[en_GB]=calamares
+GenericName[en_GB]=System Installer
+Comment[en_GB]=Calamares — System Installer
+Name[es]=Calamares
+Icon[es]=calamares
+GenericName[es]=Instalador del Sistema
+Comment[es]=Calamares — Instalador del Sistema
+Name[fr]=Calamares
+Icon[fr]=calamares
+GenericName[fr]=Installateur système
+Comment[fr]=Calamares - Installateur système
+Name[he]=קלמארס
+Icon[he]=קלמארס
+GenericName[he]=אשף התקנה
+Comment[he]=קלמארס - אשף התקנה
+Name[hr]=Calamares
+Icon[hr]=calamares
+GenericName[hr]=Instalacija sustava
+Comment[hr]=Calamares — Instalacija sustava
+Name[hu]=Calamares
+Icon[hu]=calamares
+GenericName[hu]=Rendszer Telepítő
+Comment[hu]=Calamares — Rendszer Telepítő
+Name[id]=Calamares
+Icon[id]=calamares
+GenericName[id]=Pemasang
+Comment[id]=Calamares — Pemasang Sistem
+Name[is]=Calamares
+Icon[is]=calamares
+GenericName[is]=Kerfis uppsetning
+Comment[is]=Calamares — Kerfis uppsetning
+Name[ja]=Calamares
+Icon[ja]=calamares
+GenericName[ja]=システムインストーラー
+Comment[ja]=Calamares — システムインストーラー
+Name[lt]=Calamares
+Icon[lt]=calamares
+GenericName[lt]=Sistemos diegimas į kompiuterį
+Comment[lt]=Calamares — sistemos diegyklė
+Name[nl]=Calamares
+Icon[nl]=calamares
+GenericName[nl]=Installatieprogramma
+Comment[nl]=Calamares — Installatieprogramma
+Name[pl]=Calamares
+Icon[pl]=calamares
+GenericName[pl]=Instalator systemu
+Comment[pl]=Calamares — Instalator systemu
+Name[pt_BR]=Calamares
+Icon[pt_BR]=calamares
+GenericName[pt_BR]=Instalador de Sistema
+Comment[pt_BR]=Calamares — Instalador de Sistema
+Name[cs_CZ]=Calamares
+Icon[cs_CZ]=calamares
+GenericName[cs_CZ]=Instalační program systému
+Comment[cs_CZ]=Calamares - instalační program systému
+Name[ru]=Calamares
+Icon[ru]=calamares
+GenericName[ru]=Установщик системы
+Comment[ru]=Calamares - Установщик системы
+Name[sk]=Calamares
+Icon[sk]=calamares
+GenericName[sk]=Inštalátor systému
+Comment[sk]=Calamares — Inštalátor systému
+Name[sv]=Calamares
+Icon[sv]=calamares
+GenericName[sv]=Systeminstallerare
+Comment[sv]=Calamares — Systeminstallerare
+Name[zh_CN]=Calamares
+Icon[zh_CN]=calamares
+GenericName[zh_CN]=系统安装程序
+Comment[zh_CN]=Calamares — 系统安装程序
+Name[zh_TW]=Calamares
+Icon[zh_TW]=calamares
+GenericName[zh_TW]=系統安裝程式
+Comment[zh_TW]=Calamares ── 系統安裝程式
+Name[ast]=Calamares
+Icon[ast]=calamares
+GenericName[ast]=Instalador del sistema
+Comment[ast]=Calamares — Instalador del sistema
+Name[pt_PT]=Calamares
+Icon[pt_PT]=calamares
+GenericName[pt_PT]=Instalador de Sistema
+Comment[pt_PT]=Calamares - Instalador de Sistema
+Name[tr_TR]=Calamares
+Icon[tr_TR]=calamares
+GenericName[tr_TR]=Sistem Yükleyici
+Comment[tr_TR]=Calamares — Sistem Yükleyici
--- a/ci/HACKING.md
+++ b/ci/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/ci/RELEASE.md
+++ b/ci/RELEASE.md
@ -0,0 +1,65 @@
+The Calamares release process
+=============================
+
+#### (0) A week in advance
+* Run [Coverity scan][coverity], fix what's relevant. The Coverity scan runs
+  automatically once a week on master.
+* Build with clang -Weverything, fix what's relevant.
+  ```
+    rm -rf build ; mkdir build ; cd build
+    CC=clang CXX=clang++ cmake .. && make
+  ```
+* Make sure all tests pass.
+  ```
+    make
+    make test
+  ```
+  Note that *all* means all-that-make-sense. The partition-manager tests need
+  an additional environment variable to be set for some tests, which will
+  destroy an attached disk. This is not always desirable.
+* Notify [translators][transifex]. In the dashboard there is an *Announcements*
+  link that you can use to send a translation announcement.
+
+[coverity]: https://scan.coverity.com/projects/calamares-calamares?tab=overview
+[transifex]: https://www.transifex.com/calamares/calamares/dashboard/
+
+#### (1) Preparation
+
+* Bump version in `CMakeLists.txt`, *CALAMARES_VERSION* variables, and set
+  RC to a non-zero value (e.g. doing -rc1, -rc2, ...). Push that.
+* Check `README.md` and everything in `hacking`, make sure it's all still
+  relevant. Run `hacking/calamaresstyle` to check the C++ code style.
+  Python code is checked as part of the Travis CI builds.
+* Check defaults in `settings.conf` and other configuration files.
+* Pull latest translations from Transifex. This is done nightly on Jenkins,
+  so a manual pull is rarely necessary.
+* Update the list of enabled translation languages in `CMakeLists.txt`.
+  Check the [translation site][transifex] for the list of languages with
+  fairly complete translations.
+
+#### (2) Tarball
+* Create tarball: `git-archive-all -v calamares-1.1-rc1.tar.gz` or without
+  the helper script,
+  ```
+    V=calamares-3.1.5
+    git archive -o $V.tar.gz --prefix $V/ master
+  ```
+  Double check that the tarball matches the version number.
+* Test tarball.
+
+#### (3) Tag
+* Set RC to zero in `CMakeLists.txt` if this is the actual release.
+* `git tag -s v1.1.0` Make sure the signing key is known in GitHub, so that the
+  tag is shown as a verified tag. Do not sign -rc tags.
+* Generate MD5 and SHA256 checksums.
+* Upload tarball.
+* Announce on mailing list, notify packagers.
+* Write release article.
+
+#### (4) Release day
+* Publish tarball.
+* Update download page.
+* Publish release article on `calamares.io`.
+* Publicize on social networks.
+* Close associated milestone on GitHub if this is the actual release.
+* Publish blog post.
--- a/hacking/astylerc
+++ b/hacking/astylerc
--- a/ci/buildall.sh
+++ b/ci/buildall.sh
@ -15,5 +15,5 @@ rm -Rf "$WORKSPACE/build"
 mkdir "$WORKSPACE/build"
 cd "$WORKSPACE/build"

-CMAKE_PREFIX_PATH="$WORKSPACE/prefix/usr" cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=/usr ..
-nice -n 18 make -j2
+CMAKE_PREFIX_PATH="$WORKSPACE/prefix/usr" cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=/usr -DWEBVIEW_FORCE_WEBKIT=1 ..
+nice -n 18 make -j2
--- a/ci/calamares-coverity.sh
+++ b/ci/calamares-coverity.sh
@ -20,18 +20,18 @@ make DESTDIR="$WORKSPACE/prefix" install

 cd "$WORKSPACE"

-wget https://scan.coverity.com/download/linux-64 --no-check-certificate \
+wget https://scan.coverity.com/download/cxx/linux64 --no-check-certificate \
     --post-data "token=ll90T04noQ4cORJx_zczKA&project=calamares%2Fcalamares" \
-     -O coverity_tool.tgz
+     -O coverity_tool.tar.gz
 mkdir "$WORKSPACE/coveritytool"
-tar xvf coverity_tool.tgz -C "$WORKSPACE/coveritytool" --strip-components 1
+tar xvf coverity_tool.tar.gz -C "$WORKSPACE/coveritytool" --strip-components 2
 export PATH="$WORKSPACE/coveritytool/bin:$PATH"

 rm -Rf "$WORKSPACE/build"
 mkdir "$WORKSPACE/build"
 cd "$WORKSPACE/build"

-CMAKE_PREFIX_PATH="$WORKSPACE/prefix/usr" cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=/usr ..
+CMAKE_PREFIX_PATH="$WORKSPACE/prefix/usr" cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=/usr -DWEBVIEW_FORCE_WEBKIT=1 ..
 nice -n 18 cov-build --dir cov-int make -j2

 tar caf calamares-ci.tar.xz cov-int
--- a/hacking/calamaresstyle
+++ b/hacking/calamaresstyle
--- a/ci/coverity-model.c
+++ b/ci/coverity-model.c
@ -0,0 +1,6 @@
+/* Model file for Coverity checker.
+  See https://scan.coverity.com/tune
+
+  Calamares doesn't seem to geenerate any false positives,
+  so the model-file is empty.
+*/
--- a/ci/kpmcore-coverity.sh
+++ b/ci/kpmcore-coverity.sh
@ -4,11 +4,11 @@
 sudo cp ~/jenkins-master/kpluginfactory.h /usr/include/KF5/KCoreAddons

 cd "$WORKSPACE"
-wget https://scan.coverity.com/download/linux-64 --no-check-certificate \
+wget https://scan.coverity.com/download/cxx/linux64 --no-check-certificate \
     --post-data "token=cyOjQZx5EOFLdhfo7ZDa4Q&project=KDE+Partition+Manager+Core+Library+-+KPMcore" \
-     -O coverity_tool.tgz
+     -O coverity_tool.tar.gz
 mkdir "$WORKSPACE/coveritytool"
-tar xvf coverity_tool.tgz -C "$WORKSPACE/coveritytool" --strip-components 1
+tar xvf coverity_tool.tar.gz -C "$WORKSPACE/coveritytool" --strip-components 2
 export PATH="$WORKSPACE/coveritytool/bin:$PATH"

 rm -Rf "$WORKSPACE/build"
--- a/ci/txpull.sh
+++ b/ci/txpull.sh
@ -1,15 +1,87 @@
-#!/bin/bash
+#!/bin/sh
+#
+# Fetch the Transifex translations for Calamares and incorporate them
+# into the source tree, adding commits of the different files.

-# Make sure we can make Transifex and git operations from the Calamares Docker+Jenkins environment.
-cp ~/jenkins-master/.transifexrc ~
-cp ~/jenkins-master/.gitconfig ~
-cp -R ~/jenkins-master/.ssh ~
+### INITIAL SETUP
+#
+# This stuff needs to be done once; in a real CI environment where it
+# runs regularly in a container, the setup needs to be done when
+# creating the container.
+#
+#
+# cp ~/jenkins-master/.transifexrc ~  # Transifex user settings
+# cp ~/jenkins-master/.gitconfig ~    # Git config, user settings
+# cp -R ~/jenkins-master/.ssh ~       # SSH, presumably for github
+#
+# cd "$WORKSPACE"
+# git config --global http.sslVerify false

-cd "$WORKSPACE"
-git config --global http.sslVerify false
+test -f "CMakeLists.txt" || { echo "! Not at Calamares top-level" ; exit 1 ; }
+test -f ".tx/config" || { echo "! Not at Calamares top-level" ; exit 1 ; }
+test -f "calamares.desktop" || { echo "! Not at Calamares top-level" ; exit 1 ; }

+### FETCH TRANSLATIONS
+#
+# Use Transifex client to get translations; this depends on the
+# .tx/config file to locate files, and overwrites them in the
+# filesystem with new (merged) translations.
 export QT_SELECT=5
 tx pull --force --source --all
+
+### COMMIT TRANSLATIONS
+#
+# Produce multiple commits (for the various parts of the i18n
+# infrastructure used by Calamares) of the updated translations.
+# Try to be a little smart about not committing trivial changes.
+
+# Who is credited with these CI commits
+AUTHOR="--author='Calamares CI <groot@kde.org>'"
+# Message to put after the module name
+BOILERPLATE="Automatic merge of Transifex translations"
+
 git add --verbose lang/calamares*.ts
-git commit --author='Calamares CI <teo@kde.org>' --message='Automatic merge of Transifex translations' | true
-git push --set-upstream origin master
+git commit "$AUTHOR" --message="[core] $BOILERPLATE" | true
+
+rm -f lang/desktop*.desktop
+awk '
+	BEGIN {skip=0;}
+	/^# Translations/ {skip=1;}
+	{if (!skip || (length($0)>1 && $0 != "# Translations")) {
+		skip=0; print $0;
+	}}' < calamares.desktop > calamares.desktop.new
+mv calamares.desktop.new calamares.desktop
+git add --verbose calamares.desktop
+git commit "$AUTHOR" --message="[desktop] $BOILERPLATE" | true
+
+# Transifex updates the PO-Created timestamp also when nothing interesting
+# has happened, so drop the files which have just 1 line changed (the
+# PO-Created line). This applies only to modules which use po-files.
+git diff --numstat src/modules | awk '($1==1 && $2==1){print $3}' | xargs git checkout --
+
+# Go through the Python modules; those with a lang/ subdir have their
+# own complete gettext-based setup.
+for MODULE_DIR in $(find src/modules -maxdepth 1 -mindepth 1 -type d) ; do
+  FILES=$(find "$MODULE_DIR" -name "*.py" -a -type f)
+  if test -n "$FILES" ; then
+    MODULE_NAME=$(basename ${MODULE_DIR})
+    if [ -d ${MODULE_DIR}/lang ]; then
+      # Convert PO files to MO files
+      for POFILE in $(find ${MODULE_DIR} -name "*.po") ; do
+        sed -i'' '/^"Content-Type/s/CHARSET/UTF-8/' $POFILE
+        msgfmt -o ${POFILE%.po}.mo $POFILE
+      done
+      git add --verbose ${MODULE_DIR}/lang/*
+      git commit "$AUTHOR" --message="[${MODULE_NAME}] $BOILERPLATE" | true
+    fi
+  fi
+done
+
+for POFILE in $(find lang -name "python.po") ; do
+  sed -i'' '/^"Content-Type/s/CHARSET/UTF-8/' $POFILE
+  msgfmt -o ${POFILE%.po}.mo $POFILE
+done
+git add --verbose lang/python*
+git commit "$AUTHOR" --message="[python] $BOILERPLATE" | true
+
+# git push --set-upstream origin master
--- a/ci/txpush.sh
+++ b/ci/txpush.sh
@ -1,13 +1,77 @@
-#!/bin/bash
+#!/bin/sh
+#
+# Fetch the Transifex translations for Calamares and incorporate them
+# into the source tree, adding commits of the different files.

-# Make sure we can make Transifex and git operations from the Calamares Docker+Jenkins environment.
-cp ~/jenkins-master/.transifexrc ~
-cp ~/jenkins-master/.gitconfig ~
-cp -R ~/jenkins-master/.ssh ~
+### INITIAL SETUP
+#
+# This stuff needs to be done once; in a real CI environment where it
+# runs regularly in a container, the setup needs to be done when
+# creating the container.
+#
+#
+# cp ~/jenkins-master/.transifexrc ~  # Transifex user settings
+# cp ~/jenkins-master/.gitconfig ~    # Git config, user settings
+# cp -R ~/jenkins-master/.ssh ~       # SSH, presumably for github
+#
+# cd "$WORKSPACE"
+# git config --global http.sslVerify false

-cd "$WORKSPACE"
-git config --global http.sslVerify false
+test -f "CMakeLists.txt" || { echo "! Not at Calamares top-level" ; exit 1 ; }
+test -f ".tx/config" || { echo "! Not at Calamares top-level" ; exit 1 ; }
+test -f "calamares.desktop" || { echo "! Not at Calamares top-level" ; exit 1 ; }
+
+if test "x$1" = "x--no-tx" ; then
+  tx() {
+    echo "Skipped tx $*"
+  }
+fi
+
+### CREATE TRANSLATIONS
+#
+# Use local tools (depending on type of source) to create translation
+# sources, then push to Transifex

 export QT_SELECT=5
 lupdate src/ -ts -no-obsolete lang/calamares_en.ts
-tx push --force --source --no-interactive
+
+tx push --source --no-interactive -r calamares.calamares-master
+tx push --source --no-interactive -r calamares.fdo
+
+### PYTHON MODULES
+#
+# The Python tooling depends on the underlying distro to provide
+# gettext, and handles two cases:
+#
+# - python modules with their own lang/ subdir, for larger translations
+# - python modules without lang/, which use one shared catalog
+#
+
+PYGETTEXT="xgettext --keyword=_n:1,2 -L python"
+
+SHARED_PYTHON=""
+for MODULE_DIR in $(find src/modules -maxdepth 1 -mindepth 1 -type d) ; do
+  FILES=$(find "$MODULE_DIR" -name "*.py" -a -type f)
+  if test -n "$FILES" ; then
+    MODULE_NAME=$(basename ${MODULE_DIR})
+    if [ -d ${MODULE_DIR}/lang ]; then
+      ${PYGETTEXT} -p ${MODULE_DIR}/lang -d ${MODULE_NAME} -o ${MODULE_NAME}.pot ${MODULE_DIR}/*.py
+      POTFILE="${MODULE_DIR}/lang/${MODULE_NAME}.pot"
+      if [ -f "$POTFILE" ]; then
+        sed -i'' '/^"Content-Type/s/CHARSET/UTF-8/' "$POTFILE"
+        tx set -r calamares.${MODULE_NAME} --source -l en "$POTFILE"
+        tx push --source --no-interactive -r calamares.${MODULE_NAME}
+      fi
+    else
+      SHARED_PYTHON="$SHARED_PYTHON $FILES"
+    fi
+  fi
+done
+
+if test -n "$SHARED_PYTHON" ; then
+  ${PYGETTEXT} -p lang -d python -o python.pot $SHARED_PYTHON
+  POTFILE="lang/python.pot"
+  sed -i'' '/^"Content-Type/s/CHARSET/UTF-8/' "$POTFILE"
+  tx set -r calamares.python --source -l en "$POTFILE"
+  tx push --source --no-interactive -r calamares.python
+fi
--- a/data/example-root/README.md
+++ b/data/example-root/README.md
@ -0,0 +1,11 @@
+# Example Filesystem
+
+This is a filesystem that will be used as / in an example distro,
+*if* you build the `example-distro` target and use the default
+unpackfs configuration. It should hold files and configuration
+bits that need to be on the target system for example purposes.
+
+It should *not* have a bin/, lib/, sbin/ or lib64/ directory,
+since those are copied into the example-distro filesystem
+from the build host.
+
--- a/data/example-root/etc/bash.bashrc
+++ b/data/example-root/etc/bash.bashrc
@ -0,0 +1,2 @@
+# Global .profile -- add /sbin_1
+PATH=$PATH:/sbin_1:/xbin
--- a/data/example-root/etc/group
+++ b/data/example-root/etc/group
@ -0,0 +1 @@
+root:x:0:
--- a/data/example-root/etc/issue
+++ b/data/example-root/etc/issue
@ -0,0 +1 @@
+This is an example /etc/issue file.
--- a/data/example-root/etc/locale.gen
+++ b/data/example-root/etc/locale.gen
@ -0,0 +1,486 @@
+# This file lists locales that you wish to have built. You can find a list
+# of valid supported locales at /usr/share/i18n/SUPPORTED, and you can add
+# user defined locales to /usr/local/share/i18n/SUPPORTED. If you change
+# this file, you need to rerun locale-gen.
+
+
+# aa_DJ ISO-8859-1
+# aa_DJ.UTF-8 UTF-8
+# aa_ER UTF-8
+# aa_ER@saaho UTF-8
+# aa_ET UTF-8
+# af_ZA ISO-8859-1
+# af_ZA.UTF-8 UTF-8
+# ak_GH UTF-8
+# am_ET UTF-8
+# an_ES ISO-8859-15
+# an_ES.UTF-8 UTF-8
+# anp_IN UTF-8
+# ar_AE ISO-8859-6
+# ar_AE.UTF-8 UTF-8
+# ar_BH ISO-8859-6
+# ar_BH.UTF-8 UTF-8
+# ar_DZ ISO-8859-6
+# ar_DZ.UTF-8 UTF-8
+# ar_EG ISO-8859-6
+# ar_EG.UTF-8 UTF-8
+# ar_IN UTF-8
+# ar_IQ ISO-8859-6
+# ar_IQ.UTF-8 UTF-8
+# ar_JO ISO-8859-6
+# ar_JO.UTF-8 UTF-8
+# ar_KW ISO-8859-6
+# ar_KW.UTF-8 UTF-8
+# ar_LB ISO-8859-6
+# ar_LB.UTF-8 UTF-8
+# ar_LY ISO-8859-6
+# ar_LY.UTF-8 UTF-8
+# ar_MA ISO-8859-6
+# ar_MA.UTF-8 UTF-8
+# ar_OM ISO-8859-6
+# ar_OM.UTF-8 UTF-8
+# ar_QA ISO-8859-6
+# ar_QA.UTF-8 UTF-8
+# ar_SA ISO-8859-6
+# ar_SA.UTF-8 UTF-8
+# ar_SD ISO-8859-6
+# ar_SD.UTF-8 UTF-8
+# ar_SS UTF-8
+# ar_SY ISO-8859-6
+# ar_SY.UTF-8 UTF-8
+# ar_TN ISO-8859-6
+# ar_TN.UTF-8 UTF-8
+# ar_YE ISO-8859-6
+# ar_YE.UTF-8 UTF-8
+# as_IN UTF-8
+# ast_ES ISO-8859-15
+# ast_ES.UTF-8 UTF-8
+# ayc_PE UTF-8
+# az_AZ UTF-8
+# be_BY CP1251
+# be_BY.UTF-8 UTF-8
+# be_BY@latin UTF-8
+# bem_ZM UTF-8
+# ber_DZ UTF-8
+# ber_MA UTF-8
+# bg_BG CP1251
+# bg_BG.UTF-8 UTF-8
+# bhb_IN.UTF-8 UTF-8
+# bho_IN UTF-8
+# bn_BD UTF-8
+# bn_IN UTF-8
+# bo_CN UTF-8
+# bo_IN UTF-8
+# br_FR ISO-8859-1
+# br_FR.UTF-8 UTF-8
+# br_FR@euro ISO-8859-15
+# brx_IN UTF-8
+# bs_BA ISO-8859-2
+# bs_BA.UTF-8 UTF-8
+# byn_ER UTF-8
+# ca_AD ISO-8859-15
+# ca_AD.UTF-8 UTF-8
+# ca_ES ISO-8859-1
+# ca_ES.UTF-8 UTF-8
+# ca_ES.UTF-8@valencia UTF-8
+# ca_ES@euro ISO-8859-15
+# ca_ES@valencia ISO-8859-15
+# ca_FR ISO-8859-15
+# ca_FR.UTF-8 UTF-8
+# ca_IT ISO-8859-15
+# ca_IT.UTF-8 UTF-8
+# ce_RU UTF-8
+# ckb_IQ UTF-8
+# cmn_TW UTF-8
+# crh_UA UTF-8
+# cs_CZ ISO-8859-2
+# cs_CZ.UTF-8 UTF-8
+# csb_PL UTF-8
+# cv_RU UTF-8
+# cy_GB ISO-8859-14
+# cy_GB.UTF-8 UTF-8
+# da_DK ISO-8859-1
+# da_DK.UTF-8 UTF-8
+# de_AT ISO-8859-1
+# de_AT.UTF-8 UTF-8
+# de_AT@euro ISO-8859-15
+# de_BE ISO-8859-1
+# de_BE.UTF-8 UTF-8
+# de_BE@euro ISO-8859-15
+# de_CH ISO-8859-1
+# de_CH.UTF-8 UTF-8
+# de_DE ISO-8859-1
+# de_DE.UTF-8 UTF-8
+# de_DE@euro ISO-8859-15
+# de_LI.UTF-8 UTF-8
+# de_LU ISO-8859-1
+# de_LU.UTF-8 UTF-8
+# de_LU@euro ISO-8859-15
+# doi_IN UTF-8
+# dv_MV UTF-8
+# dz_BT UTF-8
+# el_CY ISO-8859-7
+# el_CY.UTF-8 UTF-8
+# el_GR ISO-8859-7
+# el_GR.UTF-8 UTF-8
+# en_AG UTF-8
+# en_AU ISO-8859-1
+# en_AU.UTF-8 UTF-8
+# en_BW ISO-8859-1
+# en_BW.UTF-8 UTF-8
+# en_CA ISO-8859-1
+en_CA.UTF-8 UTF-8
+# en_DK ISO-8859-1
+# en_DK.ISO-8859-15 ISO-8859-15
+# en_DK.UTF-8 UTF-8
+# en_GB ISO-8859-1
+# en_GB.ISO-8859-15 ISO-8859-15
+# en_GB.UTF-8 UTF-8
+# en_HK ISO-8859-1
+# en_HK.UTF-8 UTF-8
+# en_IE ISO-8859-1
+# en_IE.UTF-8 UTF-8
+# en_IE@euro ISO-8859-15
+# en_IN UTF-8
+# en_NG UTF-8
+# en_NZ ISO-8859-1
+# en_NZ.UTF-8 UTF-8
+# en_PH ISO-8859-1
+# en_PH.UTF-8 UTF-8
+# en_SG ISO-8859-1
+# en_SG.UTF-8 UTF-8
+# en_US ISO-8859-1
+# en_US.ISO-8859-15 ISO-8859-15
+en_US.UTF-8 UTF-8
+# en_ZA ISO-8859-1
+# en_ZA.UTF-8 UTF-8
+# en_ZM UTF-8
+# en_ZW ISO-8859-1
+# en_ZW.UTF-8 UTF-8
+# eo ISO-8859-3
+# eo.UTF-8 UTF-8
+# eo_US.UTF-8 UTF-8
+# es_AR ISO-8859-1
+# es_AR.UTF-8 UTF-8
+# es_BO ISO-8859-1
+# es_BO.UTF-8 UTF-8
+# es_CL ISO-8859-1
+# es_CL.UTF-8 UTF-8
+# es_CO ISO-8859-1
+# es_CO.UTF-8 UTF-8
+# es_CR ISO-8859-1
+# es_CR.UTF-8 UTF-8
+# es_CU UTF-8
+# es_DO ISO-8859-1
+# es_DO.UTF-8 UTF-8
+# es_EC ISO-8859-1
+# es_EC.UTF-8 UTF-8
+# es_ES ISO-8859-1
+# es_ES.UTF-8 UTF-8
+# es_ES@euro ISO-8859-15
+# es_GT ISO-8859-1
+# es_GT.UTF-8 UTF-8
+# es_HN ISO-8859-1
+# es_HN.UTF-8 UTF-8
+# es_MX ISO-8859-1
+# es_MX.UTF-8 UTF-8
+# es_NI ISO-8859-1
+# es_NI.UTF-8 UTF-8
+# es_PA ISO-8859-1
+# es_PA.UTF-8 UTF-8
+# es_PE ISO-8859-1
+# es_PE.UTF-8 UTF-8
+# es_PR ISO-8859-1
+# es_PR.UTF-8 UTF-8
+# es_PY ISO-8859-1
+# es_PY.UTF-8 UTF-8
+# es_SV ISO-8859-1
+# es_SV.UTF-8 UTF-8
+# es_US ISO-8859-1
+# es_US.UTF-8 UTF-8
+# es_UY ISO-8859-1
+# es_UY.UTF-8 UTF-8
+# es_VE ISO-8859-1
+# es_VE.UTF-8 UTF-8
+# et_EE ISO-8859-1
+# et_EE.ISO-8859-15 ISO-8859-15
+# et_EE.UTF-8 UTF-8
+# eu_ES ISO-8859-1
+# eu_ES.UTF-8 UTF-8
+# eu_ES@euro ISO-8859-15
+# eu_FR ISO-8859-1
+# eu_FR.UTF-8 UTF-8
+# eu_FR@euro ISO-8859-15
+# fa_IR UTF-8
+# ff_SN UTF-8
+# fi_FI ISO-8859-1
+# fi_FI.UTF-8 UTF-8
+# fi_FI@euro ISO-8859-15
+# fil_PH UTF-8
+# fo_FO ISO-8859-1
+# fo_FO.UTF-8 UTF-8
+# fr_BE ISO-8859-1
+# fr_BE.UTF-8 UTF-8
+# fr_BE@euro ISO-8859-15
+# fr_CA ISO-8859-1
+# fr_CA.UTF-8 UTF-8
+# fr_CH ISO-8859-1
+# fr_CH.UTF-8 UTF-8
+# fr_FR ISO-8859-1
+# fr_FR.UTF-8 UTF-8
+# fr_FR@euro ISO-8859-15
+# fr_LU ISO-8859-1
+# fr_LU.UTF-8 UTF-8
+# fr_LU@euro ISO-8859-15
+# fur_IT UTF-8
+# fy_DE UTF-8
+# fy_NL UTF-8
+# ga_IE ISO-8859-1
+# ga_IE.UTF-8 UTF-8
+# ga_IE@euro ISO-8859-15
+# gd_GB ISO-8859-15
+# gd_GB.UTF-8 UTF-8
+# gez_ER UTF-8
+# gez_ER@abegede UTF-8
+# gez_ET UTF-8
+# gez_ET@abegede UTF-8
+# gl_ES ISO-8859-1
+# gl_ES.UTF-8 UTF-8
+# gl_ES@euro ISO-8859-15
+# gu_IN UTF-8
+# gv_GB ISO-8859-1
+# gv_GB.UTF-8 UTF-8
+# ha_NG UTF-8
+# hak_TW UTF-8
+# he_IL ISO-8859-8
+# he_IL.UTF-8 UTF-8
+# hi_IN UTF-8
+# hne_IN UTF-8
+# hr_HR ISO-8859-2
+# hr_HR.UTF-8 UTF-8
+# hsb_DE ISO-8859-2
+# hsb_DE.UTF-8 UTF-8
+# ht_HT UTF-8
+# hu_HU ISO-8859-2
+# hu_HU.UTF-8 UTF-8
+# hy_AM UTF-8
+# hy_AM.ARMSCII-8 ARMSCII-8
+# ia_FR UTF-8
+# id_ID ISO-8859-1
+# id_ID.UTF-8 UTF-8
+# ig_NG UTF-8
+# ik_CA UTF-8
+# is_IS ISO-8859-1
+# is_IS.UTF-8 UTF-8
+# it_CH ISO-8859-1
+# it_CH.UTF-8 UTF-8
+# it_IT ISO-8859-1
+# it_IT.UTF-8 UTF-8
+# it_IT@euro ISO-8859-15
+# iu_CA UTF-8
+# iw_IL ISO-8859-8
+# iw_IL.UTF-8 UTF-8
+# ja_JP.EUC-JP EUC-JP
+# ja_JP.UTF-8 UTF-8
+# ka_GE GEORGIAN-PS
+# ka_GE.UTF-8 UTF-8
+# kk_KZ PT154
+# kk_KZ RK1048
+# kk_KZ.UTF-8 UTF-8
+# kl_GL ISO-8859-1
+# kl_GL.UTF-8 UTF-8
+# km_KH UTF-8
+# kn_IN UTF-8
+# ko_KR.EUC-KR EUC-KR
+# ko_KR.UTF-8 UTF-8
+# kok_IN UTF-8
+# ks_IN UTF-8
+# ks_IN@devanagari UTF-8
+# ku_TR ISO-8859-9
+# ku_TR.UTF-8 UTF-8
+# kw_GB ISO-8859-1
+# kw_GB.UTF-8 UTF-8
+# ky_KG UTF-8
+# lb_LU UTF-8
+# lg_UG ISO-8859-10
+# lg_UG.UTF-8 UTF-8
+# li_BE UTF-8
+# li_NL UTF-8
+# lij_IT UTF-8
+# ln_CD UTF-8
+# lo_LA UTF-8
+# lt_LT ISO-8859-13
+# lt_LT.UTF-8 UTF-8
+# lv_LV ISO-8859-13
+# lv_LV.UTF-8 UTF-8
+# lzh_TW UTF-8
+# mag_IN UTF-8
+# mai_IN UTF-8
+# mg_MG ISO-8859-15
+# mg_MG.UTF-8 UTF-8
+# mhr_RU UTF-8
+# mi_NZ ISO-8859-13
+# mi_NZ.UTF-8 UTF-8
+# mk_MK ISO-8859-5
+# mk_MK.UTF-8 UTF-8
+# ml_IN UTF-8
+# mn_MN UTF-8
+# mni_IN UTF-8
+# mr_IN UTF-8
+# ms_MY ISO-8859-1
+# ms_MY.UTF-8 UTF-8
+# mt_MT ISO-8859-3
+# mt_MT.UTF-8 UTF-8
+# my_MM UTF-8
+# nan_TW UTF-8
+# nan_TW@latin UTF-8
+# nb_NO ISO-8859-1
+# nb_NO.UTF-8 UTF-8
+# nds_DE UTF-8
+# nds_NL UTF-8
+# ne_NP UTF-8
+# nhn_MX UTF-8
+# niu_NU UTF-8
+# niu_NZ UTF-8
+# nl_AW UTF-8
+# nl_BE ISO-8859-1
+# nl_BE.UTF-8 UTF-8
+# nl_BE@euro ISO-8859-15
+# nl_NL ISO-8859-1
+# nl_NL.UTF-8 UTF-8
+# nl_NL@euro ISO-8859-15
+# nn_NO ISO-8859-1
+# nn_NO.UTF-8 UTF-8
+# nr_ZA UTF-8
+# nso_ZA UTF-8
+# oc_FR ISO-8859-1
+# oc_FR.UTF-8 UTF-8
+# om_ET UTF-8
+# om_KE ISO-8859-1
+# om_KE.UTF-8 UTF-8
+# or_IN UTF-8
+# os_RU UTF-8
+# pa_IN UTF-8
+# pa_PK UTF-8
+# pap_AN UTF-8
+# pap_AW UTF-8
+# pap_CW UTF-8
+# pl_PL ISO-8859-2
+# pl_PL.UTF-8 UTF-8
+# ps_AF UTF-8
+# pt_BR ISO-8859-1
+# pt_BR.UTF-8 UTF-8
+# pt_PT ISO-8859-1
+# pt_PT.UTF-8 UTF-8
+# pt_PT@euro ISO-8859-15
+# quz_PE UTF-8
+# raj_IN UTF-8
+# ro_RO ISO-8859-2
+# ro_RO.UTF-8 UTF-8
+# ru_RU ISO-8859-5
+# ru_RU.CP1251 CP1251
+# ru_RU.KOI8-R KOI8-R
+# ru_RU.UTF-8 UTF-8
+# ru_UA KOI8-U
+# ru_UA.UTF-8 UTF-8
+# rw_RW UTF-8
+# sa_IN UTF-8
+# sat_IN UTF-8
+# sc_IT UTF-8
+# sd_IN UTF-8
+# sd_IN@devanagari UTF-8
+# sd_PK UTF-8
+# se_NO UTF-8
+# shs_CA UTF-8
+# si_LK UTF-8
+# sid_ET UTF-8
+# sk_SK ISO-8859-2
+# sk_SK.UTF-8 UTF-8
+# sl_SI ISO-8859-2
+# sl_SI.UTF-8 UTF-8
+# so_DJ ISO-8859-1
+# so_DJ.UTF-8 UTF-8
+# so_ET UTF-8
+# so_KE ISO-8859-1
+# so_KE.UTF-8 UTF-8
+# so_SO ISO-8859-1
+# so_SO.UTF-8 UTF-8
+# sq_AL ISO-8859-1
+# sq_AL.UTF-8 UTF-8
+# sq_MK UTF-8
+# sr_ME UTF-8
+# sr_RS UTF-8
+# sr_RS@latin UTF-8
+# ss_ZA UTF-8
+# st_ZA ISO-8859-1
+# st_ZA.UTF-8 UTF-8
+# sv_FI ISO-8859-1
+# sv_FI.UTF-8 UTF-8
+# sv_FI@euro ISO-8859-15
+# sv_SE ISO-8859-1
+# sv_SE.ISO-8859-15 ISO-8859-15
+# sv_SE.UTF-8 UTF-8
+# sw_KE UTF-8
+# sw_TZ UTF-8
+# szl_PL UTF-8
+# ta_IN UTF-8
+# ta_LK UTF-8
+# tcy_IN.UTF-8 UTF-8
+# te_IN UTF-8
+# tg_TJ KOI8-T
+# tg_TJ.UTF-8 UTF-8
+# th_TH TIS-620
+# th_TH.UTF-8 UTF-8
+# the_NP UTF-8
+# ti_ER UTF-8
+# ti_ET UTF-8
+# tig_ER UTF-8
+# tk_TM UTF-8
+# tl_PH ISO-8859-1
+# tl_PH.UTF-8 UTF-8
+# tn_ZA UTF-8
+# tr_CY ISO-8859-9
+# tr_CY.UTF-8 UTF-8
+# tr_TR ISO-8859-9
+# tr_TR.UTF-8 UTF-8
+# ts_ZA UTF-8
+# tt_RU UTF-8
+# tt_RU@iqtelif UTF-8
+# ug_CN UTF-8
+# ug_CN@latin UTF-8
+# uk_UA KOI8-U
+# uk_UA.UTF-8 UTF-8
+# unm_US UTF-8
+# ur_IN UTF-8
+# ur_PK UTF-8
+# uz_UZ ISO-8859-1
+# uz_UZ.UTF-8 UTF-8
+# uz_UZ@cyrillic UTF-8
+# ve_ZA UTF-8
+# vi_VN UTF-8
+# wa_BE ISO-8859-1
+# wa_BE.UTF-8 UTF-8
+# wa_BE@euro ISO-8859-15
+# wae_CH UTF-8
+# wal_ET UTF-8
+# wo_SN UTF-8
+# xh_ZA ISO-8859-1
+# xh_ZA.UTF-8 UTF-8
+# yi_US CP1255
+# yi_US.UTF-8 UTF-8
+# yo_NG UTF-8
+# yue_HK UTF-8
+# zh_CN GB2312
+# zh_CN.GB18030 GB18030
+# zh_CN.GBK GBK
+# zh_CN.UTF-8 UTF-8
+# zh_HK BIG5-HKSCS
+# zh_HK.UTF-8 UTF-8
+# zh_SG GB2312
+# zh_SG.GBK GBK
+# zh_SG.UTF-8 UTF-8
+# zh_TW BIG5
+# zh_TW.EUC-TW EUC-TW
+# zh_TW.UTF-8 UTF-8
+# zu_ZA ISO-8859-1
+# zu_ZA.UTF-8 UTF-8
--- a/data/example-root/etc/profile
+++ b/data/example-root/etc/profile
@ -0,0 +1,2 @@
+# Global .profile -- add /sbin_1
+PATH=$PATH:/sbin_1:/xbin
--- a/data/example-root/etc/sudoers.d/10-installer
+++ b/data/example-root/etc/sudoers.d/10-installer
--- a/data/example-root/usr/share/zoneinfo/.dummy
+++ b/data/example-root/usr/share/zoneinfo/.dummy
--- a/data/example-root/usr/share/zoneinfo/America/New_York
+++ b/data/example-root/usr/share/zoneinfo/America/New_York
--- a/data/example-root/usr/share/zoneinfo/UTC
+++ b/data/example-root/usr/share/zoneinfo/UTC
--- a/data/example-root/usr/share/zoneinfo/Zulu
+++ b/data/example-root/usr/share/zoneinfo/Zulu
--- a/data/example-root/var/lib/dbus/.dummy
+++ b/data/example-root/var/lib/dbus/.dummy
--- a/data/example-root/var/lib/initramfs-tools
+++ b/data/example-root/var/lib/initramfs-tools
--- a/data/example-root/xbin/linux-version
+++ b/data/example-root/xbin/linux-version
@ -0,0 +1 @@
+#! /bin/true
--- a/data/example-root/xbin/useradd
+++ b/data/example-root/xbin/useradd
@ -0,0 +1 @@
+#! /bin/true
--- a/hacking/GlobalStorage.md
+++ b/hacking/GlobalStorage.md
@ -1,36 +0,0 @@
-# GlobalStorage keys
-
-The GlobalStorage structure contains information which is shared among jobs.
-Jobs are free to define their own keys, but some keys have been standardized.
-Here they are:
-
-## bootLoader
-
-A dictionary with the following keys:
-
- `installPath`: device where the boot loader should be installed ("/dev/sda", "/dev/sdb1"...)
-
-## branding
-
-A dictionary with the following keys (loaded from branding.desc):
-
- `productName`: distribution unversioned product name (long version)
- `shortProductName`: distribution unversioned product name (short version)
- `version`: distribution version number (long version)
- `shortVersion`: distribution version number (short version)
- `versionedName`: distribution product name and version (long version)
- `shortVersionedName`: distribution product name and version (short version)
-
-## partitions
-
-A list of dictionaries, one per partition. The dictionary contains the following keys:
-
- `device`: path to the partition device
- `fs`: the name of the file system
- `mountPoint`: where the device should be mounted
- `uuid`: the UUID of the partition device
-
-## rootMountPoint
-
-A string which contains the path where the root file system has been mounted.
-This key is set by the `mount` job.
--- a/hacking/RELEASE.md
+++ b/hacking/RELEASE.md
@ -1,35 +0,0 @@
-The Calamares release process
-=============================
-
-#### (0) A week in advance
-* Run Coverity scan, fix what's relevant.
-* Build with clang -Weverything, fix what's relevant.
-* Make sure all tests pass.
-* Notify translators.
-
-#### (1) Preparation
-* Check `README.md` and everything in `hacking`, make sure it's all still relevant.
-* Update submodules.
-* Check defaults in `settings.conf` and other configuration files.
-* Pull latest translations from Transifex.
-* Update the list of enabled translation languages in `CMakeLists.txt`.
-* Bump version in `CMakeLists.txt`, commit.
-
-#### (2) Tarball
-* Create tarball: `../git-archive-all/git-archive-all -v calamares-1.1-rc1.tar.gz`
-* Test tarball.
-
-#### (3) Tag
-* `git tag -s v1.1.0`
-* Generate MD5 and SHA1 checksums.
-* Upload tarball.
-* Announce on mailing list, notify packagers.
-* Write release article.
-
-#### (4) Release day
-* Publish tarball.
-* Update download page.
-* Publish release article on `calamares.io`.
-* Publicize on social networks.
-* Update release date on JIRA.
-* Publish blog post.
--- a/lang/calamares_ar.ts
+++ b/lang/calamares_ar.ts
--- a/lang/calamares_ast.ts
+++ b/lang/calamares_ast.ts
--- a/lang/calamares_bg.ts
+++ b/lang/calamares_bg.ts
--- a/lang/calamares_ca.ts
+++ b/lang/calamares_ca.ts
--- a/lang/calamares_cs_CZ.ts
+++ b/lang/calamares_cs_CZ.ts
--- a/lang/calamares_da.ts
+++ b/lang/calamares_da.ts
--- a/lang/calamares_de.ts
+++ b/lang/calamares_de.ts
--- a/lang/calamares_el.ts
+++ b/lang/calamares_el.ts
--- a/lang/calamares_en.ts
+++ b/lang/calamares_en.ts
--- a/lang/calamares_en_GB.ts
+++ b/lang/calamares_en_GB.ts
--- a/lang/calamares_es.ts
+++ b/lang/calamares_es.ts
--- a/lang/calamares_es_ES.ts
+++ b/lang/calamares_es_ES.ts
--- a/lang/calamares_es_MX.ts
+++ b/lang/calamares_es_MX.ts
--- a/lang/calamares_es_PR.ts
+++ b/lang/calamares_es_PR.ts
--- a/lang/calamares_et.ts
+++ b/lang/calamares_et.ts
--- a/lang/calamares_eu.ts
+++ b/lang/calamares_eu.ts
--- a/lang/calamares_fa.ts
+++ b/lang/calamares_fa.ts
--- a/lang/calamares_fi_FI.ts
+++ b/lang/calamares_fi_FI.ts
--- a/lang/calamares_fr.ts
+++ b/lang/calamares_fr.ts
--- a/lang/calamares_fr_CH.ts
+++ b/lang/calamares_fr_CH.ts
--- a/lang/calamares_gl.ts
+++ b/lang/calamares_gl.ts
--- a/lang/calamares_gu.ts
+++ b/lang/calamares_gu.ts
--- a/lang/calamares_he.ts
+++ b/lang/calamares_he.ts
--- a/lang/calamares_hi.ts
+++ b/lang/calamares_hi.ts
--- a/lang/calamares_hr.ts
+++ b/lang/calamares_hr.ts
--- a/lang/calamares_hu.ts
+++ b/lang/calamares_hu.ts
--- a/lang/calamares_id.ts
+++ b/lang/calamares_id.ts
--- a/lang/calamares_is.ts
+++ b/lang/calamares_is.ts
--- a/lang/calamares_it_IT.ts
+++ b/lang/calamares_it_IT.ts
--- a/lang/calamares_ja.ts
+++ b/lang/calamares_ja.ts
--- a/lang/calamares_kk.ts
+++ b/lang/calamares_kk.ts
--- a/lang/calamares_lo.ts
+++ b/lang/calamares_lo.ts
--- a/lang/calamares_lt.ts
+++ b/lang/calamares_lt.ts
--- a/lang/calamares_mr.ts
+++ b/lang/calamares_mr.ts
--- a/lang/calamares_nb.ts
+++ b/lang/calamares_nb.ts
--- a/lang/calamares_nl.ts
+++ b/lang/calamares_nl.ts
--- a/lang/calamares_pl.ts
+++ b/lang/calamares_pl.ts
--- a/lang/calamares_pl_PL.ts
+++ b/lang/calamares_pl_PL.ts
--- a/lang/calamares_pt_BR.ts
+++ b/lang/calamares_pt_BR.ts
--- a/lang/calamares_pt_PT.ts
+++ b/lang/calamares_pt_PT.ts
--- a/lang/calamares_ro.ts
+++ b/lang/calamares_ro.ts
--- a/lang/calamares_ru.ts
+++ b/lang/calamares_ru.ts
--- a/lang/calamares_sk.ts
+++ b/lang/calamares_sk.ts
--- a/lang/calamares_sl.ts
+++ b/lang/calamares_sl.ts
--- a/Show More
+++ b/Show More