Merge branch 'master' into requirements-checking

CMakeLists.txt

@@ -45,7 +45,7 @@ if( POLICY CMP0071 )
     cmake_policy( SET CMP0071 NEW )
 endif()
 if(NOT CMAKE_VERSION VERSION_LESS "3.10.0")
-    list(APPEND CMAKE_AUTOMOC_MACRO_NAMES 
+    list(APPEND CMAKE_AUTOMOC_MACRO_NAMES
         "K_PLUGIN_FACTORY_WITH_JSON"
         "K_EXPORT_PLASMA_DATAENGINE_WITH_JSON"
         "K_EXPORT_PLASMA_RUNNER"
@@ -119,6 +119,7 @@ if( CMAKE_COMPILER_IS_GNUCXX )
 endif()
 
 include( FeatureSummary )
+include( CMakeColors )
 
 set( QT_VERSION 5.6.0 )
 
@@ -130,6 +131,16 @@ if( ECM_FOUND )
     set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_MODULE_PATH})
 endif()
 
+# Find ECM once, and add it to the module search path; Calamares
+# modules that need ECM can do
+#   find_package(ECM ${ECM_VERSION} REQUIRED NO_MODULE),
+# no need to mess with the module path after.
+set( ECM_VERSION 5.10.0 )
+find_package(ECM ${ECM_VERSION} NO_MODULE)
+if( ECM_FOUND )
+    set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_MODULE_PATH})
+endif()
+
 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 )
@@ -169,10 +180,12 @@ if ( PYTHONLIBS_FOUND )
     )
 endif()
 
-if( PYTHONLIBS_NOTFOUND OR NOT CALAMARES_BOOST_PYTHON3_FOUND )
+if( NOT PYTHONLIBS_FOUND OR NOT CALAMARES_BOOST_PYTHON3_FOUND )
+    message(STATUS "Disabling Boost::Python modules")
     set( WITH_PYTHON OFF )
 endif()
-if( PYTHONLIBS_NOTFOUND OR NOT PYTHONQT_FOUND )
+if( NOT PYTHONLIBS_FOUND OR NOT PYTHONQT_FOUND )
+    message(STATUS "Disabling PythonQt modules")
     set( WITH_PYTHONQT OFF )
 endif()
 
@@ -189,7 +202,7 @@ set( CALAMARES_TRANSLATION_LANGUAGES ar ast bg ca cs_CZ da de el en en_GB es_MX
 set( CALAMARES_VERSION_MAJOR 3 )
 set( CALAMARES_VERSION_MINOR 2 )
 set( CALAMARES_VERSION_PATCH 0 )
-set( CALAMARES_VERSION_RC 1 )
+set( CALAMARES_VERSION_RC 3 )
 
 set( CALAMARES_VERSION ${CALAMARES_VERSION_MAJOR}.${CALAMARES_VERSION_MINOR}.${CALAMARES_VERSION_PATCH} )
 set( CALAMARES_VERSION_SHORT "${CALAMARES_VERSION}" )
@@ -303,6 +316,12 @@ add_feature_info(KCrash ${WITH_KF5Crash} "Crash dumps via KCrash")
 
 feature_summary(WHAT ALL)
 
+get_directory_property( SKIPPED_MODULES
+    DIRECTORY src/modules
+    DEFINITION LIST_SKIPPED_MODULES
+)
+calamares_explain_skipped_modules( ${SKIPPED_MODULES} )
+
 # 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" )
 set( CMAKE_INSTALL_FULL_CMAKEDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_CMAKEDIR}" )

CMakeModules/CalamaresAddModuleSubdirectory.cmake

@@ -1,63 +1,103 @@
-include( CMakeColors )
 include( CalamaresAddTranslations )
 
 set( MODULE_DATA_DESTINATION share/calamares/modules )
 
+# Convenience function to indicate that a module has been skipped
+# (optionally also why). Call this in the module's CMakeLists.txt
+macro( calamares_skip_module )
+    set( SKIPPED_MODULES ${SKIPPED_MODULES} ${ARGV} PARENT_SCOPE )
+endmacro()
+
+function( calamares_explain_skipped_modules )
+    if ( ARGN )
+        message( "${ColorReset}-- Skipped modules:" )
+        foreach( SUBDIRECTORY ${ARGN} )
+            message( "${ColorReset}--   Skipped ${BoldRed}${SUBDIRECTORY}${ColorReset}." )
+        endforeach()
+        message( "" )
+    endif()
+endfunction()
+
 function( calamares_add_module_subdirectory )
     set( SUBDIRECTORY ${ARGV0} )
 
+    set( SKIPPED_MODULES )
     set( MODULE_CONFIG_FILES "" )
 
+    set( _mod_dir "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}" )
     # If this subdirectory has a CMakeLists.txt, we add_subdirectory it...
-    if( EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}/CMakeLists.txt" )
+    if( EXISTS "${_mod_dir}/CMakeLists.txt" )
         add_subdirectory( ${SUBDIRECTORY} )
-        file( GLOB MODULE_CONFIG_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY} "${SUBDIRECTORY}/*.conf" )
+        file( GLOB MODULE_CONFIG_FILES RELATIVE ${_mod_dir} "${SUBDIRECTORY}/*.conf" )
+        # Module has indicated it should be skipped, show that in
+        # the calling CMakeLists (which is src/modules/CMakeLists.txt normally).
+        if ( SKIPPED_MODULES )
+            set( SKIPPED_MODULES ${SKIPPED_MODULES} PARENT_SCOPE )
+            set( MODULE_CONFIG_FILES "" )
+        endif()
     # ...otherwise, we look for a module.desc.
-    elseif( EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}/module.desc" )
+    elseif( EXISTS "${_mod_dir}/module.desc" )
         set( MODULES_DIR ${CMAKE_INSTALL_LIBDIR}/calamares/modules )
         set( MODULE_DESTINATION ${MODULES_DIR}/${SUBDIRECTORY} )
 
-        # We glob all the files inside the subdirectory, and we make sure they are
-        # synced with the bindir structure and installed.
-        file( GLOB MODULE_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY} "${SUBDIRECTORY}/*" )
-        foreach( MODULE_FILE ${MODULE_FILES} )
-            if( NOT IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}/${MODULE_FILE} )
-                configure_file( ${SUBDIRECTORY}/${MODULE_FILE} ${SUBDIRECTORY}/${MODULE_FILE} COPYONLY )
+        # Read module.desc, check that the interface type is supported.
+        file(STRINGS "${_mod_dir}/module.desc" MODULE_INTERFACE REGEX "^interface")
+        if ( MODULE_INTERFACE MATCHES "pythonqt" )
+            set( _mod_enabled ${WITH_PYTHONQT} )
+            set( _mod_reason "No PythonQt support" )
+        elseif ( MODULE_INTERFACE MATCHES "python" )
+            set( _mod_enabled ${WITH_PYTHON} )
+            set( _mod_reason "No Python support" )
+        else()
+            set( _mod_enabled ON )
+            set( _mod_reason "" )
+        endif()
+
+        if ( _mod_enabled )
+            # We glob all the files inside the subdirectory, and we make sure they are
+            # synced with the bindir structure and installed.
+            file( GLOB MODULE_FILES RELATIVE ${_mod_dir} "${SUBDIRECTORY}/*" )
+            foreach( MODULE_FILE ${MODULE_FILES} )
+                if( NOT IS_DIRECTORY ${_mod_dir}/${MODULE_FILE} )
+                    configure_file( ${SUBDIRECTORY}/${MODULE_FILE} ${SUBDIRECTORY}/${MODULE_FILE} COPYONLY )
 
-                get_filename_component( FLEXT ${MODULE_FILE} EXT )
-                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} )
-                else()
-                    install( FILES ${CMAKE_CURRENT_BINARY_DIR}/${SUBDIRECTORY}/${MODULE_FILE}
-                             DESTINATION ${MODULE_DESTINATION} )
+                    get_filename_component( FLEXT ${MODULE_FILE} EXT )
+                    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} )
+                    else()
+                        install( FILES ${CMAKE_CURRENT_BINARY_DIR}/${SUBDIRECTORY}/${MODULE_FILE}
+                                 DESTINATION ${MODULE_DESTINATION} )
+                    endif()
                 endif()
-            endif()
-        endforeach()
+            endforeach()
 
-        message( "-- ${BoldYellow}Found ${CALAMARES_APPLICATION_NAME} module: ${BoldRed}${SUBDIRECTORY}${ColorReset}" )
-        if( NOT CMAKE_BUILD_TYPE STREQUAL "Release" )
-            message( "   ${Green}TYPE:${ColorReset} jobmodule" )
-#            message( "   ${Green}FILES:${ColorReset} ${MODULE_FILES}" )
-            message( "   ${Green}MODULE_DESTINATION:${ColorReset} ${MODULE_DESTINATION}" )
-            if( MODULE_CONFIG_FILES )
-                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]" )
+            message( "-- ${BoldYellow}Found ${CALAMARES_APPLICATION_NAME} module: ${BoldRed}${SUBDIRECTORY}${ColorReset}" )
+            if( NOT CMAKE_BUILD_TYPE STREQUAL "Release" )
+                message( "   ${Green}TYPE:${ColorReset} jobmodule" )
+                message( "   ${Green}MODULE_DESTINATION:${ColorReset} ${MODULE_DESTINATION}" )
+                if( MODULE_CONFIG_FILES )
+                    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()
-            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
-            )
+            # 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()
+            # Module disabled due to missing dependencies / unsupported interface
+            set( SKIPPED_MODULES "${SUBDIRECTORY} (${_mod_reason})" PARENT_SCOPE )
         endif()
     else()
         message( "-- ${BoldYellow}Warning:${ColorReset} tried to add module subdirectory ${BoldRed}${SUBDIRECTORY}${ColorReset} which has no CMakeLists.txt or module.desc." )

CMakeModules/FindLibPWQuality.cmake

@@ -0,0 +1,37 @@
+# Locate libpwquality
+#   https://github.com/libpwquality/libpwquality
+#
+# This module defines
+#  LibPWQuality_FOUND
+#  LibPWQuality_LIBRARIES, where to find the library
+#  LibPWQuality_INCLUDE_DIRS, where to find pwquality.h
+#
+include(FindPkgConfig)
+include(FindPackageHandleStandardArgs)
+
+pkg_search_module(pc_pwquality QUIET pwquality)
+
+find_path(LibPWQuality_INCLUDE_DIR
+    NAMES pwquality.h
+    PATHS ${pc_pwquality_INCLUDE_DIRS}
+)
+find_library(LibPWQuality_LIBRARY
+    NAMES pwquality
+    PATHS ${pc_pwquality_LIBRARY_DIRS}
+)
+if(pc_pwquality_FOUND)
+    set(LibPWQuality_LIBRARIES ${LibPWQuality_LIBRARY})
+    set(LibPWQuality_INCLUDE_DIRS ${LibPWQuality_INCLUDE_DIR} ${pc_pwquality_INCLUDE_DIRS})
+endif()
+
+find_package_handle_standard_args(LibPWQuality DEFAULT_MSG
+    LibPWQuality_INCLUDE_DIRS
+    LibPWQuality_LIBRARIES
+)
+mark_as_advanced(LibPWQuality_INCLUDE_DIRS LibPWQuality_LIBRARIES)
+
+set_package_properties(
+    LibPWQuality PROPERTIES
+    DESCRIPTION "Password quality checking library"
+    URL "https://github.com/libpwquality/libpwquality"
+)

CMakeModules/FindPythonQt.cmake

@@ -139,4 +139,16 @@ if(PYTHONQT_INCLUDE_DIR AND PYTHONQT_LIBRARY AND PYTHONQT_QTALL_LIBRARY)
   set(PYTHONQT_FOUND 1)
   set(PythonQt_FOUND ${PYTHONQT_FOUND})
   set(PYTHONQT_LIBRARIES ${PYTHONQT_LIBRARY} ${PYTHONQT_LIBUTIL} ${PYTHONQT_QTALL_LIBRARY})
+elseif(NOT PythonQt_FIND_QUIETLY)
+  set(_missing "")
+  if (NOT PYTHONQT_INCLUDE_DIR)
+    list(APPEND _missing "includes")
+  endif()
+  if (NOT PYTHONQT_LIBRARY)
+    list(APPEND _missing "library")
+  endif()
+  if (NOT PYTHONQT_QTALL_LIBRARY)
+    list(APPEND _missing "qtall")
+  endif()
+  message(STATUS "PythonQt not found, missing components ${_missing}")
 endif()

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 Service WidgetsAddons )
+
+find_package( KPMcore 3.2 REQUIRED )

Dockerfile

@@ -1,2 +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 
+RUN sudo apt-get update && sudo apt-get -y install build-essential cmake extra-cmake-modules gettext libatasmart-dev libboost-python-dev libkf5config-dev libkf5coreaddons-dev libkf5i18n-dev libkf5parts-dev libkf5service-dev libkf5widgetsaddons-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

LICENSES/BSD3-SameGame

@@ -0,0 +1,49 @@
+/****************************************************************************
+**
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/

LICENSES/GPLv2+-libpwquality

@@ -0,0 +1,383 @@
+Unless otherwise *explicitly* stated the following text describes the
+licensed conditions under which the contents of this libpwquality release
+may be distributed:
+
+-------------------------------------------------------------------------
+Redistribution and use in source and binary forms of libpwquality, with
+or without modification, are permitted provided that the following
+conditions are met:
+
+1. Redistributions of source code must retain any existing copyright
+   notice, and this entire permission notice in its entirety,
+   including the disclaimer of warranties.
+
+2. Redistributions in binary form must reproduce all prior and current
+   copyright notices, this list of conditions, and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+3. The name of any author may not be used to endorse or promote
+   products derived from this software without their specific prior
+   written permission.
+
+ALTERNATIVELY, this product may be distributed under the terms of the
+GNU General Public License version 2 or later, in which case the provisions
+of the GNU GPL are required INSTEAD OF the above restrictions.
+
+THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+The full text of the GNU GENERAL PUBLIC LICENSE Version 2 is included
+below.
+
+-------------------------------------------------------------------------
+
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    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 2 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, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year  name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.

README.md

@@ -26,8 +26,9 @@ Modules:
   * NetworkManager
   * UPower (optional, runtime)
 * partition:
-  * KF5: KCoreAddons, KConfig, KI18n, KIconThemes, KIO, KService
-  * KPMcore >= 3.0.2
+  * extra-cmake-modules
+  * KF5: KCoreAddons, KConfig, KI18n, KService, KWidgetsAddons
+  * KPMcore >= 3.3
 * bootloader:
   * systemd-boot or GRUB
 * unpackfs:

calamares.desktop

@@ -17,6 +17,10 @@ Categories=Qt;System;
 
 
 
+
+
+
+
 Name[ca]=Calamares
 Icon[ca]=calamares
 GenericName[ca]=Instal·lador de sistema
@@ -65,6 +69,10 @@ Name[is]=Calamares
 Icon[is]=calamares
 GenericName[is]=Kerfis uppsetning
 Comment[is]=Calamares — Kerfis uppsetning
+Name[cs_CZ]=Calamares
+Icon[cs_CZ]=calamares
+GenericName[cs_CZ]=Instalátor systému
+Comment[cs_CZ]=Calamares – instalátor operačních systémů
 Name[ja]=Calamares
 Icon[ja]=calamares
 GenericName[ja]=システムインストーラー
@@ -93,10 +101,10 @@ 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]=Instalátor systému
-Comment[cs_CZ]=Calamares – instalátor operačních systémů
+Name[ro]=Calamares
+Icon[ro]=calamares
+GenericName[ro]=Instalator de sistem
+Comment[ro]=Calamares — Instalator de sistem
 Name[ru]=Calamares
 Icon[ru]=calamares
 GenericName[ru]=Установщик системы
@@ -109,6 +117,10 @@ Name[sq]=Calamares
 Icon[sq]=calamares
 GenericName[sq]=Instalues Sistemi
 Comment[sq]=Calamares — Instalues Sistemi
+Name[fi_FI]=Calamares
+Icon[fi_FI]=calamares
+GenericName[fi_FI]=Järjestelmän Asennusohjelma
+Comment[fi_FI]=Calamares — Järjestelmän Asentaja
 Name[sv]=Calamares
 Icon[sv]=calamares
 GenericName[sv]=Systeminstallerare

ci/HACKING.md

@@ -13,7 +13,7 @@ Every source file must have a license header, with a list of copyright holders a
 
 Example:
 ```
-/* === This file is part of Calamares - <http://github.com/calamares> ===
+/* === This file is part of Calamares - <https://github.com/calamares> ===
  *
  *   Copyright 2013-2014, Random Person <name@example.com>
  *   Copyright 2010,      Someone Else <someone@example.com>

ci/txpull.sh

@@ -41,7 +41,7 @@ AUTHOR="--author='Calamares CI <groot@kde.org>'"
 BOILERPLATE="Automatic merge of Transifex translations"
 
 git add --verbose lang/calamares*.ts
-git commit "$AUTHOR" --message="[core] $BOILERPLATE" | true
+git commit "$AUTHOR" --message="i18n: $BOILERPLATE" | true
 
 rm -f lang/desktop*.desktop
 awk '
@@ -72,7 +72,7 @@ for MODULE_DIR in $(find src/modules -maxdepth 1 -mindepth 1 -type d) ; do
         msgfmt -o ${POFILE%.po}.mo $POFILE
       done
       git add --verbose ${MODULE_DIR}/lang/*
-      git commit "$AUTHOR" --message="[${MODULE_NAME}] $BOILERPLATE" | true
+      git commit "$AUTHOR" --message="i18n: [${MODULE_NAME}] $BOILERPLATE" | true
     fi
   fi
 done
@@ -82,6 +82,6 @@ for POFILE in $(find lang -name "python.po") ; do
   msgfmt -o ${POFILE%.po}.mo $POFILE
 done
 git add --verbose lang/python*
-git commit "$AUTHOR" --message="[python] $BOILERPLATE" | true
+git commit "$AUTHOR" --message="i18n: [python] $BOILERPLATE" | true
 
 # git push --set-upstream origin master

lang/python.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-11-28 06:46-0500\n"
+"POT-Creation-Date: 2018-02-07 18:58+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,37 +18,37 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: src/modules/packages/main.py:59
+#: src/modules/dummypython/main.py:44
+msgid "Dummy python job."
+msgstr ""
+
+#: src/modules/dummypython/main.py:97
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/machineid/main.py:35
+msgid "Generate machine-id."
+msgstr ""
+
+#: src/modules/packages/main.py:60
 #, python-format
 msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/packages/main.py:61
+#: src/modules/packages/main.py:62 src/modules/packages/main.py:72
+msgid "Install packages."
+msgstr ""
+
+#: src/modules/packages/main.py:65
 #, python-format
 msgid "Installing one package."
 msgid_plural "Installing %(num)d packages."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/modules/packages/main.py:64
+#: src/modules/packages/main.py:68
 #, python-format
 msgid "Removing one package."
 msgid_plural "Removing %(num)d packages."
 msgstr[0] ""
 msgstr[1] ""
-
-#: src/modules/packages/main.py:68
-msgid "Install packages."
-msgstr ""
-
-#: src/modules/dummypython/main.py:44
-msgid "Dummy python job."
-msgstr ""
-
-#: src/modules/dummypython/main.py:97
-msgid "Dummy python step {}"
-msgstr ""
-
-#: src/modules/machineid/main.py:35
-msgid "Generate machine-id."
-msgstr ""

lang/python/ar/LC_MESSAGES/python.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-11-06 06:02-0500\n"
+"POT-Creation-Date: 2018-01-17 19:16+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Arabic (https://www.transifex.com/calamares/teams/20061/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -17,12 +17,28 @@ msgstr ""
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
-#: src/modules/packages/main.py:59
+#: src/modules/dummypython/main.py:44
+msgid "Dummy python job."
+msgstr ""
+
+#: src/modules/dummypython/main.py:97
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/machineid/main.py:35
+msgid "Generate machine-id."
+msgstr ""
+
+#: src/modules/packages/main.py:60
 #, python-format
 msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/packages/main.py:61
+#: src/modules/packages/main.py:62 src/modules/packages/main.py:72
+msgid "Install packages."
+msgstr ""
+
+#: src/modules/packages/main.py:65
 #, python-format
 msgid "Installing one package."
 msgid_plural "Installing %(num)d packages."
@@ -33,7 +49,7 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: src/modules/packages/main.py:64
+#: src/modules/packages/main.py:68
 #, python-format
 msgid "Removing one package."
 msgid_plural "Removing %(num)d packages."
@@ -43,19 +59,3 @@ msgstr[2] ""
 msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
-
-#: src/modules/packages/main.py:68
-msgid "Install packages."
-msgstr ""
-
-#: src/modules/dummypython/main.py:44
-msgid "Dummy python job."
-msgstr ""
-
-#: src/modules/dummypython/main.py:97
-msgid "Dummy python step {}"
-msgstr ""
-
-#: src/modules/machineid/main.py:35
-msgid "Generate machine-id."
-msgstr ""

lang/python/ast/LC_MESSAGES/python.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-11-06 06:02-0500\n"
+"POT-Creation-Date: 2018-01-17 19:16+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: enolp <enolp@softastur.org>, 2017\n"
 "Language-Team: Asturian (https://www.transifex.com/calamares/teams/20061/ast/)\n"
@@ -18,37 +18,37 @@ msgstr ""
 "Language: ast\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/packages/main.py:59
+#: src/modules/dummypython/main.py:44
+msgid "Dummy python job."
+msgstr "Trabayu maniquín de python."
+
+#: src/modules/dummypython/main.py:97
+msgid "Dummy python step {}"
+msgstr "Pasu maniquín de python {}"
+
+#: src/modules/machineid/main.py:35
+msgid "Generate machine-id."
+msgstr "Xenerar machine-id."
+
+#: src/modules/packages/main.py:60
 #, python-format
 msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/packages/main.py:61
+#: src/modules/packages/main.py:62 src/modules/packages/main.py:72
+msgid "Install packages."
+msgstr ""
+
+#: src/modules/packages/main.py:65
 #, python-format
 msgid "Installing one package."
 msgid_plural "Installing %(num)d packages."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/modules/packages/main.py:64
+#: src/modules/packages/main.py:68
 #, python-format
 msgid "Removing one package."
 msgid_plural "Removing %(num)d packages."
 msgstr[0] ""
 msgstr[1] ""
-
-#: src/modules/packages/main.py:68
-msgid "Install packages."
-msgstr ""
-
-#: src/modules/dummypython/main.py:44
-msgid "Dummy python job."
-msgstr "Trabayu maniquín de python."
-
-#: src/modules/dummypython/main.py:97
-msgid "Dummy python step {}"
-msgstr "Pasu maniquín de python {}"
-
-#: src/modules/machineid/main.py:35
-msgid "Generate machine-id."
-msgstr "Xenerar machine-id."

lang/python/bg/LC_MESSAGES/python.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-11-06 06:02-0500\n"
+"POT-Creation-Date: 2018-01-17 19:16+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Bulgarian (https://www.transifex.com/calamares/teams/20061/bg/)\n"
 "MIME-Version: 1.0\n"
@@ -17,37 +17,37 @@ msgstr ""
 "Language: bg\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/packages/main.py:59
+#: src/modules/dummypython/main.py:44
+msgid "Dummy python job."
+msgstr ""
+
+#: src/modules/dummypython/main.py:97
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/machineid/main.py:35
+msgid "Generate machine-id."
+msgstr ""
+
+#: src/modules/packages/main.py:60
 #, python-format
 msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/packages/main.py:61
+#: src/modules/packages/main.py:62 src/modules/packages/main.py:72
+msgid "Install packages."
+msgstr ""
+
+#: src/modules/packages/main.py:65
 #, python-format
 msgid "Installing one package."
 msgid_plural "Installing %(num)d packages."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/modules/packages/main.py:64
+#: src/modules/packages/main.py:68
 #, python-format
 msgid "Removing one package."
 msgid_plural "Removing %(num)d packages."
 msgstr[0] ""
 msgstr[1] ""
-
-#: src/modules/packages/main.py:68
-msgid "Install packages."
-msgstr ""
-
-#: src/modules/dummypython/main.py:44
-msgid "Dummy python job."
-msgstr ""
-
-#: src/modules/dummypython/main.py:97
-msgid "Dummy python step {}"
-msgstr ""
-
-#: src/modules/machineid/main.py:35
-msgid "Generate machine-id."
-msgstr ""

lang/python/ca/LC_MESSAGES/python.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-11-06 06:02-0500\n"
+"POT-Creation-Date: 2018-01-17 19:16+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Davidmp <medipas@gmail.com>, 2017\n"
 "Language-Team: Catalan (https://www.transifex.com/calamares/teams/20061/ca/)\n"
@@ -18,37 +18,37 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/packages/main.py:59
+#: src/modules/dummypython/main.py:44
+msgid "Dummy python job."
+msgstr "Tasca de python fictícia."
+
+#: src/modules/dummypython/main.py:97
+msgid "Dummy python step {}"
+msgstr "Pas de python fitctici {}"
+
+#: src/modules/machineid/main.py:35
+msgid "Generate machine-id."
+msgstr "Generació de l'id. de la màquina."
+
+#: src/modules/packages/main.py:60
 #, python-format
 msgid "Processing packages (%(count)d / %(total)d)"
 msgstr "Processant paquets (%(count)d / %(total)d)"
 
-#: src/modules/packages/main.py:61
+#: src/modules/packages/main.py:62 src/modules/packages/main.py:72
+msgid "Install packages."
+msgstr "Instal·la els paquets."
+
+#: src/modules/packages/main.py:65
 #, python-format
 msgid "Installing one package."
 msgid_plural "Installing %(num)d packages."
 msgstr[0] "Instal·lant un paquet."
 msgstr[1] "Instal·lant %(num)d paquets."
 
-#: src/modules/packages/main.py:64
+#: src/modules/packages/main.py:68
 #, python-format
 msgid "Removing one package."
 msgid_plural "Removing %(num)d packages."
 msgstr[0] "Eliminant un paquet."
 msgstr[1] "Eliminant %(num)d paquets."
-
-#: src/modules/packages/main.py:68
-msgid "Install packages."
-msgstr "Instal·la els paquets."
-
-#: src/modules/dummypython/main.py:44
-msgid "Dummy python job."
-msgstr "Tasca de python fictícia."
-
-#: src/modules/dummypython/main.py:97
-msgid "Dummy python step {}"
-msgstr "Pas de python fitctici {}"
-
-#: src/modules/machineid/main.py:35
-msgid "Generate machine-id."
-msgstr "Generació de l'id. de la màquina."

lang/python/cs_CZ/LC_MESSAGES/python.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-11-06 06:02-0500\n"
+"POT-Creation-Date: 2018-01-17 19:16+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>, 2017\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/calamares/teams/20061/cs_CZ/)\n"
@@ -18,12 +18,28 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: src/modules/packages/main.py:59
+#: src/modules/dummypython/main.py:44
+msgid "Dummy python job."
+msgstr "Testovací úloha python."
+
+#: src/modules/dummypython/main.py:97
+msgid "Dummy python step {}"
+msgstr "Testovací krok {} python."
+
+#: src/modules/machineid/main.py:35
+msgid "Generate machine-id."
+msgstr "Vytvořit identifikátor stroje."
+
+#: src/modules/packages/main.py:60
 #, python-format
 msgid "Processing packages (%(count)d / %(total)d)"
 msgstr "Zpracovávání balíčků (%(count)d / %(total)d)"
 
-#: src/modules/packages/main.py:61
+#: src/modules/packages/main.py:62 src/modules/packages/main.py:72
+msgid "Install packages."
+msgstr "Instalovat balíčky."
+
+#: src/modules/packages/main.py:65
 #, python-format
 msgid "Installing one package."
 msgid_plural "Installing %(num)d packages."
@@ -31,26 +47,10 @@ msgstr[0] "Je instalován jeden balíček."
 msgstr[1] "Jsou instalovány %(num)d balíčky."
 msgstr[2] "Je instalováno %(num)d balíčků."
 
-#: src/modules/packages/main.py:64
+#: src/modules/packages/main.py:68
 #, python-format
 msgid "Removing one package."
 msgid_plural "Removing %(num)d packages."
 msgstr[0] "Odebírá se jeden balíček."
 msgstr[1] "Odebírají se %(num)d balíčky."
 msgstr[2] "Odebírá se %(num)d balíčků."
-
-#: src/modules/packages/main.py:68
-msgid "Install packages."
-msgstr "Instalovat balíčky."
-
-#: src/modules/dummypython/main.py:44
-msgid "Dummy python job."
-msgstr "Testovací úloha python."
-
-#: src/modules/dummypython/main.py:97
-msgid "Dummy python step {}"
-msgstr "Testovací krok {} python."
-
-#: src/modules/machineid/main.py:35
-msgid "Generate machine-id."
-msgstr "Vytvořit identifikátor stroje."

lang/python/da/LC_MESSAGES/python.po

@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-11-06 06:02-0500\n"
+"POT-Creation-Date: 2018-01-17 19:16+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Dan Johansen (Strit) <strit83@gmail.com>, 2017\n"
+"Last-Translator: Dan Johansen (Strit), 2017\n"
 "Language-Team: Danish (https://www.transifex.com/calamares/teams/20061/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,37 +18,37 @@ msgstr ""
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/packages/main.py:59
+#: src/modules/dummypython/main.py:44
+msgid "Dummy python job."
+msgstr "Dummy python-job."
+
+#: src/modules/dummypython/main.py:97
+msgid "Dummy python step {}"
+msgstr "Dummy python-trin {}"
+
+#: src/modules/machineid/main.py:35
+msgid "Generate machine-id."
+msgstr "Generere maskine-id."
+
+#: src/modules/packages/main.py:60
 #, python-format
 msgid "Processing packages (%(count)d / %(total)d)"
 msgstr "Forarbejder pakker (%(count)d / %(total)d)"
 
-#: src/modules/packages/main.py:61
+#: src/modules/packages/main.py:62 src/modules/packages/main.py:72
+msgid "Install packages."
+msgstr "Installér pakker."
+
+#: src/modules/packages/main.py:65
 #, python-format
 msgid "Installing one package."
 msgid_plural "Installing %(num)d packages."
 msgstr[0] "Installerer én pakke."
 msgstr[1] "Installerer %(num)d pakker."
 
-#: src/modules/packages/main.py:64
+#: src/modules/packages/main.py:68
 #, python-format
 msgid "Removing one package."
 msgid_plural "Removing %(num)d packages."
 msgstr[0] "Fjerner én pakke."
 msgstr[1] "Fjerne %(num)d pakker."
-
-#: src/modules/packages/main.py:68
-msgid "Install packages."
-msgstr "Installér pakker."
-
-#: src/modules/dummypython/main.py:44
-msgid "Dummy python job."
-msgstr "Dummy python-job."
-
-#: src/modules/dummypython/main.py:97
-msgid "Dummy python step {}"
-msgstr "Dummy python-trin {}"
-
-#: src/modules/machineid/main.py:35
-msgid "Generate machine-id."
-msgstr "Generere maskine-id."

lang/python/de/LC_MESSAGES/python.po

@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-11-06 06:02-0500\n"
+"POT-Creation-Date: 2018-01-17 19:16+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Christian Spaan <gyges@gmx.net>, 2017\n"
+"Last-Translator: Dirk Hein <bankman@posteo.de>, 2017\n"
 "Language-Team: German (https://www.transifex.com/calamares/teams/20061/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,29 +18,6 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/packages/main.py:59
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Verarbeite Pakete (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:61
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:64
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:68
-msgid "Install packages."
-msgstr "Pakete installieren "
-
 #: src/modules/dummypython/main.py:44
 msgid "Dummy python job."
 msgstr "Dummy Python-Job"
@@ -52,3 +29,26 @@ msgstr "Dummy Python-Schritt {}"
 #: src/modules/machineid/main.py:35
 msgid "Generate machine-id."
 msgstr "Generiere Computer-ID"
+
+#: src/modules/packages/main.py:60
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Verarbeite Pakete (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:62 src/modules/packages/main.py:72
+msgid "Install packages."
+msgstr "Pakete installieren "
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Installiere ein Paket"
+msgstr[1] "Installiere %(num)dPakete "
+
+#: src/modules/packages/main.py:68
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Entferne ein Paket"
+msgstr[1] "Entferne %(num)dPakete."

lang/python/el/LC_MESSAGES/python.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-11-06 06:02-0500\n"
+"POT-Creation-Date: 2018-01-17 19:16+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Efstathios Iosifidis <iefstathios@gmail.com>, 2017\n"
 "Language-Team: Greek (https://www.transifex.com/calamares/teams/20061/el/)\n"
@@ -18,37 +18,37 @@ msgstr ""
 "Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/packages/main.py:59
+#: src/modules/dummypython/main.py:44
+msgid "Dummy python job."
+msgstr ""
+
+#: src/modules/dummypython/main.py:97
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/machineid/main.py:35
+msgid "Generate machine-id."
+msgstr ""
+
+#: src/modules/packages/main.py:60
 #, python-format
 msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/packages/main.py:61
+#: src/modules/packages/main.py:62 src/modules/packages/main.py:72
+msgid "Install packages."
+msgstr "εγκατάσταση πακέτων."
+
+#: src/modules/packages/main.py:65
 #, python-format
 msgid "Installing one package."
 msgid_plural "Installing %(num)d packages."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/modules/packages/main.py:64
+#: src/modules/packages/main.py:68
 #, python-format
 msgid "Removing one package."
 msgid_plural "Removing %(num)d packages."
 msgstr[0] ""
 msgstr[1] ""
-
-#: src/modules/packages/main.py:68
-msgid "Install packages."
-msgstr "εγκατάσταση πακέτων."
-
-#: src/modules/dummypython/main.py:44
-msgid "Dummy python job."
-msgstr ""
-
-#: src/modules/dummypython/main.py:97
-msgid "Dummy python step {}"
-msgstr ""
-
-#: src/modules/machineid/main.py:35
-msgid "Generate machine-id."
-msgstr ""

lang/python/en_GB/LC_MESSAGES/python.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-11-06 06:02-0500\n"
+"POT-Creation-Date: 2018-01-17 19:16+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: English (United Kingdom) (https://www.transifex.com/calamares/teams/20061/en_GB/)\n"
 "MIME-Version: 1.0\n"
@@ -17,37 +17,37 @@ msgstr ""
 "Language: en_GB\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/packages/main.py:59
+#: src/modules/dummypython/main.py:44
+msgid "Dummy python job."
+msgstr ""
+
+#: src/modules/dummypython/main.py:97
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/machineid/main.py:35
+msgid "Generate machine-id."
+msgstr ""
+
+#: src/modules/packages/main.py:60
 #, python-format
 msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/packages/main.py:61
+#: src/modules/packages/main.py:62 src/modules/packages/main.py:72
+msgid "Install packages."
+msgstr ""
+
+#: src/modules/packages/main.py:65
 #, python-format
 msgid "Installing one package."
 msgid_plural "Installing %(num)d packages."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/modules/packages/main.py:64
+#: src/modules/packages/main.py:68
 #, python-format
 msgid "Removing one package."
 msgid_plural "Removing %(num)d packages."
 msgstr[0] ""
 msgstr[1] ""
-
-#: src/modules/packages/main.py:68
-msgid "Install packages."
-msgstr ""
-
-#: src/modules/dummypython/main.py:44
-msgid "Dummy python job."
-msgstr ""
-
-#: src/modules/dummypython/main.py:97
-msgid "Dummy python step {}"
-msgstr ""
-
-#: src/modules/machineid/main.py:35
-msgid "Generate machine-id."
-msgstr ""

lang/python/es/LC_MESSAGES/python.po

@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-11-06 06:02-0500\n"
+"POT-Creation-Date: 2018-01-17 19:16+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: strel <strelnic@gmail.com>, 2017\n"
+"Last-Translator: strel, 2017\n"
 "Language-Team: Spanish (https://www.transifex.com/calamares/teams/20061/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,37 +18,37 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/packages/main.py:59
+#: src/modules/dummypython/main.py:44
+msgid "Dummy python job."
+msgstr "Tarea de python ficticia."
+
+#: src/modules/dummypython/main.py:97
+msgid "Dummy python step {}"
+msgstr "Paso {} de python ficticio"
+
+#: src/modules/machineid/main.py:35
+msgid "Generate machine-id."
+msgstr "Generar identificación-de-maquina."
+
+#: src/modules/packages/main.py:60
 #, python-format
 msgid "Processing packages (%(count)d / %(total)d)"
 msgstr "Procesando paquetes (%(count)d / %(total)d)"
 
-#: src/modules/packages/main.py:61
+#: src/modules/packages/main.py:62 src/modules/packages/main.py:72
+msgid "Install packages."
+msgstr "Instalar paquetes."
+
+#: src/modules/packages/main.py:65
 #, python-format
 msgid "Installing one package."
 msgid_plural "Installing %(num)d packages."
 msgstr[0] "Instalando un paquete."
 msgstr[1] "Instalando %(num)d paquetes."
 
-#: src/modules/packages/main.py:64
+#: src/modules/packages/main.py:68
 #, python-format
 msgid "Removing one package."
 msgid_plural "Removing %(num)d packages."
 msgstr[0] "Eliminando un paquete."
 msgstr[1] "Eliminando %(num)d paquetes."
-
-#: src/modules/packages/main.py:68
-msgid "Install packages."
-msgstr "Instalar paquetes."
-
-#: src/modules/dummypython/main.py:44
-msgid "Dummy python job."
-msgstr "Tarea de python ficticia."
-
-#: src/modules/dummypython/main.py:97
-msgid "Dummy python step {}"
-msgstr "Paso {} de python ficticio"
-
-#: src/modules/machineid/main.py:35
-msgid "Generate machine-id."
-msgstr "Generar identificación-de-maquina."

lang/python/es_ES/LC_MESSAGES/python.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-11-06 06:02-0500\n"
+"POT-Creation-Date: 2018-01-17 19:16+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Spanish (Spain) (https://www.transifex.com/calamares/teams/20061/es_ES/)\n"
 "MIME-Version: 1.0\n"
@@ -17,37 +17,37 @@ msgstr ""
 "Language: es_ES\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/packages/main.py:59
+#: src/modules/dummypython/main.py:44
+msgid "Dummy python job."
+msgstr ""
+
+#: src/modules/dummypython/main.py:97
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/machineid/main.py:35
+msgid "Generate machine-id."
+msgstr ""
+
+#: src/modules/packages/main.py:60
 #, python-format
 msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/packages/main.py:61
+#: src/modules/packages/main.py:62 src/modules/packages/main.py:72
+msgid "Install packages."
+msgstr ""
+
+#: src/modules/packages/main.py:65
 #, python-format
 msgid "Installing one package."
 msgid_plural "Installing %(num)d packages."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/modules/packages/main.py:64
+#: src/modules/packages/main.py:68
 #, python-format
 msgid "Removing one package."
 msgid_plural "Removing %(num)d packages."
 msgstr[0] ""
 msgstr[1] ""
-
-#: src/modules/packages/main.py:68
-msgid "Install packages."
-msgstr ""
-
-#: src/modules/dummypython/main.py:44
-msgid "Dummy python job."
-msgstr ""
-
-#: src/modules/dummypython/main.py:97
-msgid "Dummy python step {}"
-msgstr ""
-
-#: src/modules/machineid/main.py:35
-msgid "Generate machine-id."
-msgstr ""

lang/python/es_MX/LC_MESSAGES/python.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-11-06 06:02-0500\n"
+"POT-Creation-Date: 2018-01-17 19:16+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Spanish (Mexico) (https://www.transifex.com/calamares/teams/20061/es_MX/)\n"
 "MIME-Version: 1.0\n"
@@ -17,37 +17,37 @@ msgstr ""
 "Language: es_MX\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/packages/main.py:59
+#: src/modules/dummypython/main.py:44
+msgid "Dummy python job."
+msgstr ""
+
+#: src/modules/dummypython/main.py:97
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/machineid/main.py:35
+msgid "Generate machine-id."
+msgstr ""
+
+#: src/modules/packages/main.py:60
 #, python-format
 msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/packages/main.py:61
+#: src/modules/packages/main.py:62 src/modules/packages/main.py:72
+msgid "Install packages."
+msgstr ""
+
+#: src/modules/packages/main.py:65
 #, python-format
 msgid "Installing one package."
 msgid_plural "Installing %(num)d packages."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/modules/packages/main.py:64
+#: src/modules/packages/main.py:68
 #, python-format
 msgid "Removing one package."
 msgid_plural "Removing %(num)d packages."
 msgstr[0] ""
 msgstr[1] ""
-
-#: src/modules/packages/main.py:68
-msgid "Install packages."
-msgstr ""
-
-#: src/modules/dummypython/main.py:44
-msgid "Dummy python job."
-msgstr ""
-
-#: src/modules/dummypython/main.py:97
-msgid "Dummy python step {}"
-msgstr ""
-
-#: src/modules/machineid/main.py:35
-msgid "Generate machine-id."
-msgstr ""

lang/python/es_PR/LC_MESSAGES/python.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-11-06 06:02-0500\n"
+"POT-Creation-Date: 2018-01-17 19:16+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Spanish (Puerto Rico) (https://www.transifex.com/calamares/teams/20061/es_PR/)\n"
 "MIME-Version: 1.0\n"
@@ -17,37 +17,37 @@ msgstr ""
 "Language: es_PR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/packages/main.py:59
+#: src/modules/dummypython/main.py:44
+msgid "Dummy python job."
+msgstr ""
+
+#: src/modules/dummypython/main.py:97
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/machineid/main.py:35
+msgid "Generate machine-id."
+msgstr ""
+
+#: src/modules/packages/main.py:60
 #, python-format
 msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/packages/main.py:61
+#: src/modules/packages/main.py:62 src/modules/packages/main.py:72
+msgid "Install packages."
+msgstr ""
+
+#: src/modules/packages/main.py:65
 #, python-format
 msgid "Installing one package."
 msgid_plural "Installing %(num)d packages."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/modules/packages/main.py:64
+#: src/modules/packages/main.py:68
 #, python-format
 msgid "Removing one package."
 msgid_plural "Removing %(num)d packages."
 msgstr[0] ""
 msgstr[1] ""
-
-#: src/modules/packages/main.py:68
-msgid "Install packages."
-msgstr ""
-
-#: src/modules/dummypython/main.py:44
-msgid "Dummy python job."
-msgstr ""
-
-#: src/modules/dummypython/main.py:97
-msgid "Dummy python step {}"
-msgstr ""
-
-#: src/modules/machineid/main.py:35
-msgid "Generate machine-id."
-msgstr ""

lang/python/et/LC_MESSAGES/python.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-11-06 06:02-0500\n"
+"POT-Creation-Date: 2018-01-17 19:16+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Estonian (https://www.transifex.com/calamares/teams/20061/et/)\n"
 "MIME-Version: 1.0\n"
@@ -17,37 +17,37 @@ msgstr ""
 "Language: et\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/packages/main.py:59
+#: src/modules/dummypython/main.py:44
+msgid "Dummy python job."
+msgstr ""
+
+#: src/modules/dummypython/main.py:97
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/machineid/main.py:35
+msgid "Generate machine-id."
+msgstr ""
+
+#: src/modules/packages/main.py:60
 #, python-format
 msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/packages/main.py:61
+#: src/modules/packages/main.py:62 src/modules/packages/main.py:72
+msgid "Install packages."
+msgstr ""
+
+#: src/modules/packages/main.py:65
 #, python-format
 msgid "Installing one package."
 msgid_plural "Installing %(num)d packages."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/modules/packages/main.py:64
+#: src/modules/packages/main.py:68
 #, python-format
 msgid "Removing one package."
 msgid_plural "Removing %(num)d packages."
 msgstr[0] ""
 msgstr[1] ""
-
-#: src/modules/packages/main.py:68
-msgid "Install packages."
-msgstr ""
-
-#: src/modules/dummypython/main.py:44
-msgid "Dummy python job."
-msgstr ""
-
-#: src/modules/dummypython/main.py:97
-msgid "Dummy python step {}"
-msgstr ""
-
-#: src/modules/machineid/main.py:35
-msgid "Generate machine-id."
-msgstr ""

lang/python/eu/LC_MESSAGES/python.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-11-06 06:02-0500\n"
+"POT-Creation-Date: 2018-01-17 19:16+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Basque (https://www.transifex.com/calamares/teams/20061/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -17,37 +17,37 @@ msgstr ""
 "Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/packages/main.py:59
+#: src/modules/dummypython/main.py:44
+msgid "Dummy python job."
+msgstr ""
+
+#: src/modules/dummypython/main.py:97
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/machineid/main.py:35
+msgid "Generate machine-id."
+msgstr ""
+
+#: src/modules/packages/main.py:60
 #, python-format
 msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/packages/main.py:61
+#: src/modules/packages/main.py:62 src/modules/packages/main.py:72
+msgid "Install packages."
+msgstr ""
+
+#: src/modules/packages/main.py:65
 #, python-format
 msgid "Installing one package."
 msgid_plural "Installing %(num)d packages."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/modules/packages/main.py:64
+#: src/modules/packages/main.py:68
 #, python-format
 msgid "Removing one package."
 msgid_plural "Removing %(num)d packages."
 msgstr[0] ""
 msgstr[1] ""
-
-#: src/modules/packages/main.py:68
-msgid "Install packages."
-msgstr ""
-
-#: src/modules/dummypython/main.py:44
-msgid "Dummy python job."
-msgstr ""
-
-#: src/modules/dummypython/main.py:97
-msgid "Dummy python step {}"
-msgstr ""
-
-#: src/modules/machineid/main.py:35
-msgid "Generate machine-id."
-msgstr ""