Merge pull request #1 from calamares/master

Merge upstream

AUTHORS

@@ -20,8 +20,7 @@ and moral support from (alphabetically by first name or nickname):
  - artoo@cromnix.org
  - Bernhard Landauer
  - Bezzy1999
- - Bill Auguer
+ - Bill Auger
- - bill-auger
  - Caio Jordão Carvalho
  - Collabora LTD
  - crispg72

CHANGES

@@ -3,10 +3,94 @@ contributors are listed. Note that Calamares does not have a historical
 changelog -- this log starts with version 3.2.0. The release notes on the
 website will have to do for older versions.
 
-# 3.2.19 (unreleased) #
+# 3.2.21 (unreleased) #
 
 This release contains contributions from (alphabetically by first name):
- - No other contributors this time around.
+ - Camilo Higuita
+ - Gabriel Craciunescu
+ - Gaël PORTAY
+
+## Core ##
+ - Python job modules (such as *unpackfs* or *packages*) can now provide
+   a `pretty_status_message()` function, like the existing `pretty_name()`
+   function, that is used to update the status during install. #1330
+ - QML support-modules and objects are now registered into the io.calamares
+   namespace. This affects modules using Calamares models inside their
+   QML UI (at this point, very few). With this release, the necessary
+   `import` for Calamares parts looks like
+   > ```import io.calamares.ui 1.0```
+   A complete list of objects available from Calamares van be found in the
+   documentation in `Qml.h`.
+ - The sidebar (which shows overall progress in the installation) is now
+   more configurable: the branding key *sidebar* controls it. The sidebar
+   can be shown as a widget (default, as it has been), hidden, or use a
+   new QML view which is more easily customised.
+ - A new `settings.conf` key *quit-at-end* will automatically close
+   Calamares (by clicking on the *Done* button) when the end of the
+   sequence is reached. If *finished* is the last module in the sequence,
+   this will run whatever it is configured for; you can also leave out
+   the finished page and Calamares will close after the exec parts.
+
+## Modules ##
+ - *packages* now reports more details in the installation progress-bar.
+ - *netinstall* module supports and `expanded` key, which will pre-expand
+   a group (as if the user had pressed the arrow-button in the tree-view).
+   This only affects the UI.
+ - Modules that use QML need a new import line. The QML file for the
+   module is configured through new keys *qmlSearch* and *qmlFilename*
+   (previously those were without the `qml` prefix, which invites name
+   collisions). The full module identifier is also used as a filename,
+   so that multiple instances of a module can use different QML files.
+ - *partition* module has a number of new features and settings for
+   type, UUID, and filesystem characteristics. Thanks to Gaël.
+
+
+# 3.2.20 (2020-02-27) #
+
+This release contains contributions from (alphabetically by first name):
+ - Bart Ribbers
+
+## Core ##
+ - When logging level is set to 8 (eight), for instance via the `-D8`
+   logging flag, or the `-d` debug flag, the *Show debug information*
+   button will appear in the progress view. This helps with debugging
+   issues where the `-d` flag would be inappropriate.
+ - Calamares now starts at logging level 1 (warnings and errors to
+   the console) by default. Previously it (wrongly) started at level 8.
+
+## Modules ##
+ - The *partition* module now stores which filesystems are in use in
+   global storage.
+ - The *contextualprocess* module now understands "compound variable
+   names", where a dot (.) is used to index into structured data
+   stored in global storage. This allows it to use the map stored
+   by the partition module (but also other things, like looking into
+   the branding information).
+ - The *packages* module now understands "apk", the Alpine Linux
+   package manager.
+
+
+# 3.2.19.1 (2020-02-24) #
+
+This is a hotfix release for bugs in the *users* module.
+Reported by Philip Mueller and Walter Lapchynski.
+
+## Modules ##
+ - The *users* module no longer wrote `/etc/hostname` at all.
+ - The *users* module erroneously shows the root password input fields.
+ - The *initramfs* module sets a resume-hook even when there is no swap.
+ - The partitioning service expects *udevadm* in `/sbin`, but some
+   distro's place it elsewhere.
+ - The mount service didn't unmount directories properly, leading to
+   blocked installations.
+
+
+# 3.2.19 (2020-02-21) #
+
+This release contains contributions from (alphabetically by first name):
+ - Anke Boersma
+ - Camilo Higuita
+ - Gabriel Craciunescu
 
 ## Core ##
  - *Assamese* translation has been completed.
@@ -29,6 +113,18 @@ This release contains contributions from (alphabetically by first name):
    "fancy" release notes as a QML application, rather than a webview
    or text widget. Note that this does not replace the slideshow-during-
    installation module.
+ - The *users* module now has knobs for setting the hostname and writing
+   the `/etc/hosts` file. The new configuration options are documented
+   in `users.conf`. #1140
+ - Multiple *netinstall* modules can exist side-by-side, and they each
+   control the package installation for their part of the package list.
+   Previously, a netinstall module would overwrite all of the package
+   configuration done by other netinstall modules. Translations can be
+   provided in the configuration file, `netinstall.conf`. #1303
+ - The *fstab* module no longer "claims" all the swap partitions it finds
+   on disk. It only uses swap specified for the current installation.
+   This means that "replace" and "alongside" installations will have
+   no swap configured in the target system.
 
 
 # 3.2.18 (2020-01-28) #

CMakeLists.txt

@@ -40,7 +40,7 @@
 
 cmake_minimum_required( VERSION 3.3 FATAL_ERROR )
 project( CALAMARES
-    VERSION 3.2.19
+    VERSION 3.2.21
     LANGUAGES C CXX )
 
 set( CALAMARES_VERSION_RC 1 )  # Set to 0 during release cycle, 1 during development
@@ -135,10 +135,11 @@ set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMakeModules" )
 if( POLICY CMP0057 )
     cmake_policy( SET CMP0057 NEW )
 endif()
-# CMake 3.9, 3.10 compatibility
+# Let ``AUTOMOC`` and ``AUTOUIC`` process ``GENERATED`` files.
 if( POLICY CMP0071 )
     cmake_policy( SET CMP0071 NEW )
 endif()
+# Recognize more macros to trigger automoc
 if(NOT CMAKE_VERSION VERSION_LESS "3.10.0")
     list(APPEND CMAKE_AUTOMOC_MACRO_NAMES
         "K_PLUGIN_FACTORY_WITH_JSON"
@@ -549,10 +550,11 @@ install(
         "${PROJECT_BINARY_DIR}/CalamaresConfig.cmake"
         "${PROJECT_BINARY_DIR}/CalamaresConfigVersion.cmake"
         "${PROJECT_BINARY_DIR}/CalamaresUse.cmake"
-        "CMakeModules/CalamaresAddPlugin.cmake"
-        "CMakeModules/CalamaresAddModuleSubdirectory.cmake"
-        "CMakeModules/CalamaresAddLibrary.cmake"
         "CMakeModules/CalamaresAddBrandingSubdirectory.cmake"
+        "CMakeModules/CalamaresAddLibrary.cmake"
+        "CMakeModules/CalamaresAddModuleSubdirectory.cmake"
+        "CMakeModules/CalamaresAddPlugin.cmake"
+        "CMakeModules/CalamaresAddTest.cmake"
         "CMakeModules/CalamaresAddTranslations.cmake"
         "CMakeModules/CalamaresAutomoc.cmake"
         "CMakeModules/CMakeColors.cmake"

CMakeModules/CalamaresAddTest.cmake

@@ -0,0 +1,58 @@
+# === 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
+#
+###
+#
+# Support functions for building Calamares tests.
+# This extends KDE's ECM tests with some custom patterns.
+#
+# calamares_add_test(
+#   <NAME>
+#   [GUI]
+#   SOURCES <FILE..>
+#   )
+
+include( CMakeParseArguments )
+include( CalamaresAutomoc )
+
+function( calamares_add_test )
+    # parse arguments (name needs to be saved before passing ARGN into the macro)
+    set( NAME ${ARGV0} )
+    set( options GUI )
+    set( multiValueArgs SOURCES LIBRARIES DEFINITIONS )
+    cmake_parse_arguments( TEST "${options}" "" "${multiValueArgs}" ${ARGN} )
+    set( TEST_NAME ${NAME} )
+
+    if( ECM_FOUND AND BUILD_TESTING )
+        ecm_add_test(
+            ${TEST_SOURCES}
+            TEST_NAME
+                ${TEST_NAME}
+            LINK_LIBRARIES
+                calamares
+                ${TEST_LIBRARIES}
+                Qt5::Core
+                Qt5::Test
+            )
+        calamares_automoc( ${TEST_NAME} )
+        target_compile_definitions( ${TEST_NAME} PRIVATE -DBUILD_AS_TEST ${TEST_DEFINITIONS} )
+        if( TEST_GUI )
+            target_link_libraries( ${TEST_NAME} calamaresui Qt5::Gui )
+        endif()
+    endif()
+endfunction()

CMakeModules/FindYAMLCPP.cmake

@@ -1,9 +1,11 @@
 # Locate yaml-cpp
 #
 # This module defines
-#  YAMLCPP_FOUND, if false, do not try to link to yaml-cpp
+#   YAMLCPP_FOUND, if false, do not try to link to yaml-cpp
-#  YAMLCPP_LIBRARY, where to find yaml-cpp
+#   YAMLCPP_LIBRARY, where to find yaml-cpp
-#  YAMLCPP_INCLUDE_DIR, where to find yaml.h
+#   YAMLCPP_INCLUDE_DIR, where to find yaml.h
+# There is also one IMPORTED library target,
+#   yamlcpp
 #
 # By default, the dynamic libraries of yaml-cpp will be found. To find the static ones instead,
 # you must set the YAMLCPP_STATIC_LIBRARY variable to TRUE before calling find_package(YamlCpp ...).
@@ -48,3 +50,12 @@ find_library(YAMLCPP_LIBRARY
 include(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(YAMLCPP DEFAULT_MSG YAMLCPP_INCLUDE_DIR YAMLCPP_LIBRARY)
 mark_as_advanced(YAMLCPP_INCLUDE_DIR YAMLCPP_LIBRARY)
+
+# Add an imported target
+if( YAMLCPP_LIBRARY )
+    add_library( yamlcpp UNKNOWN IMPORTED )
+    set_property( TARGET yamlcpp PROPERTY IMPORTED_LOCATION ${YAMLCPP_LIBRARY} )
+    if ( YAMLCPP_INCLUDE_DIR )
+        set_property( TARGET yamlcpp PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${YAMLCPP_INCLUDE_DIR} )
+    endif()
+endif()

README.md

@@ -2,12 +2,11 @@
 ---------
 
 [![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://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) |
+| [Report a Bug](https://github.com/calamares/calamares/issues/new) | [Translate](https://www.transifex.com/projects/p/calamares/) | [Contribute](https://github.com/calamares/calamares/wiki/Develop-Guide) | Freenode (IRC): #calamares | [Wiki](https://github.com/calamares/calamares/wiki) |
 |:-----------------------------------------:|:----------------------:|:-----------------------:|:--------------------------:|:--------------------------:|
 
 ### Dependencies

calamares.desktop

@@ -17,9 +17,9 @@ Name[ar]=تثبيت النظام
 Icon[ar]=كالامارس
 GenericName[ar]=مثبت النظام
 Comment[ar]=كالامارس - مثبت النظام
-Name[as]=চিছ্তেম ইনস্তল কৰক
+Name[as]=চিছটেম ইনস্তল কৰক
 Icon[as]=কেলামাৰেচ
-GenericName[as]=চিছ্তেম ইনস্তলাৰ
+GenericName[as]=চিছটেম ইনস্তলাৰ
 Comment[as]=কেলামাৰেচ — চিছটেম​ ইনস্তলাৰ
 Name[be]=Усталяваць сістэму
 Icon[be]=calamares
@@ -103,9 +103,9 @@ Icon[ja]=calamares
 GenericName[ja]=システムインストーラー
 Comment[ja]=Calamares — システムインストーラー
 Name[ko]=시스템 설치
-Icon[ko]=깔라마레스 (Calamares)
+Icon[ko]=깔라마레스
 GenericName[ko]=시스템 설치 관리자
-Comment[ko]=깔라마레스 (Calamares) — 시스템 설치 관리자
+Comment[ko]=깔라마레스 — 시스템 설치 관리자
 Name[lt]=Įdiegti Sistemą
 Icon[lt]=calamares
 GenericName[lt]=Sistemos diegimas į kompiuterį

ci/HACKING.md

@@ -1,211 +1 @@
-Hacking on Calamares
+This has moved [to the wiki](https://github.com/calamares/calamares/wiki/Develop-Code).
-====================
-
-These are the guidelines for hacking on Calamares. Except for the licensing,
-which **must** be GPLv3+, these are guidelines and -- like PEP8 -- the most
-important thing is to know when you can ignore them.
-
-
-Licensing
----------
-Calamares is released under the terms of the GNU GPL, version 3 or later.
-Every source file must have a license header, with a list of copyright holders and years.
-
-Example:
-```
-/* === 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>
- *
- *   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/>.
- */
-```
-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 C++
---------------
-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.
-* Spaces between brackets and argument functions, including for template arguments
-* No space before brackets, except for keywords, for example `function( argument )` but
-  `if ( condition )`.
-* For pointer and reference variable declarations, put a space before the variable name
-  and no space between the type and the `*` or `&`, e.g. `int* p`.
-* `for`, `if`, `else`, `while` and similar statements put the braces on the next line,
-  if the following block is more than one statement. Always use braces.
-* Function and class definitions have their braces on separate lines.
-* A function implementation's return type is on its own line.
-* `CamelCase.{cpp,h}` style file names.
-* Lambdas are preferrably indented to a 4-space tab, even when passed as an
-  argument to functions.
-
-Example:
-```
-bool
-MyClass::myMethod( QStringList list, const QString& name )
-{
-    if ( list.isEmpty() )
-        return false;
-
-    cDebug() << "Items in list ..";
-    foreach ( const QString& string, list )
-        cDebug() << "  .." << string;
-
-    switch ( m_enumValue )
-    {
-    case Something:
-        return true;
-    case SomethingElse:
-        doSomething();
-        break;
-    }
-}
-```
-
-You can use `clang-format` (version 7) to have Calamares sources formatted
-the right way. There is a `.clang-format` file that specifies the details.
-In general:
-```
-    $ clang-format-7 -i -style=file <files>
-```
-`
-
-**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
-------
-* Use CamelCase for everything.
-* Local variables should start out with a lowercase letter.
-* Class names are capitalized
-* Prefix class member variables with `m_`, e.g. `m_queue`.
-* Prefix static member variables with `s_`, e.g. `s_instance`.
-* Functions are named in the Qt style, like Java's, without the 'get' prefix.
-    * A getter is `variable()`.
-    * If it's a getter for a boolean, prefix with 'is', so `isCondition()`.
-    * A setter is `setVariable( arg )`.
-
-
-Includes
---------
-Header includes should be listed in the following order:
-
-* own header,
-* Calamares includes,
-* includes for Qt-based libraries,
-* Qt includes,
-* other includes.
-
-They should also be sorted alphabetically for ease of locating them.
-
-Includes in a header file should be kept to the absolute minimum, as to keep
-compile times short. This can be achieved by using forward declarations
-instead of includes, like `class QListView;`.
-
-Example:
-```
-#include "Settings.h"
-
-#include "CalamaresApplication.h"
-#include "utils/CalamaresUtils.h"
-#include "utils/Logger.h"
-#include "YamlUtils.h"
-
-#include <QDir>
-#include <QFile>
-
-#include <yaml-cpp/yaml.h>
-```
-
-Use include guards, not `#pragma once`.
-
-
-C++ tips
---------
-All C++11 features are acceptable, and the use of new C++11 features is encouraged when
-it makes the code easier to understand and more maintainable.
-
-The use of `nullptr` is preferred over the use of `0` or `NULL`.
-
-For Qt containers it is better to use Qt's own `foreach`. For all other containers, the
-range-based `for` syntax introduced with C++11 is preferred ([see this blog post][1]).
-
-When re-implementing a virtual method, always add the `override` keyword.
-
-Try to keep your code const correct. Declare methods const if they don't mutate the
-object, and use const variables. It improves safety, and also makes it easier to
-understand the code.
-
-For the Qt signal-slot system, the new (Qt5) syntax is to be preferred because it allows
-the compiler to check for the existence of signals and slots. As an added benefit, the
-new syntax can also be used with `tr1::bind` and C++11 lambdas. For more information, see
-the [Qt wiki][2].
-
-Example:
-```
-connect( m_next, &QPushButton::clicked, this, &ViewManager::next );
-
-connect( m_moduleManager, &Calamares::ModuleManager::modulesLoaded, [this]
-{
-    m_mainwindow->show();
-});
-```
-
-[1]: http://blog.qt.digia.com/blog/2011/05/26/cpp0x-in-qt/
-[2]: http://qt-project.org/wiki/New_Signal_Slot_Syntax
-
-
-Debugging
----------
-Use `cDebug()` from `utils/Logger.h`. You can pass a debug-level to the
-macro (6 is debugging, higher is less important). Use `cWarning()` for warning
-messages (equivalent to level 2) and `cError()` for errors (level 1). Warnings
-and errors will add relevant text automatically. See `libcalamares/utils/Logger.h`
-for details.
-
-For log messages that are continued across multiple calls to `cDebug()`,
-in particular listing things, conventional formatting is as follows:
-* End the first debug message with ` ..`
-* Start the next debug message by outputting `Logger::SubEntry`
-
-For single-outputs that need to be split across multiplt lines,
-output `Logger::Continuation`.
-
-
-Commit Messages
----------------
-Keep commit messages short(-ish) and try to describe what is being changed
-*as well as why*. Use the commit keywords for GitHub, especially *FIXES:*
-to auto-close issues when they are resolved.
-
-For functional changes to Calamares modules or libraries, try to put
-*[modulename]* in front of the first line of the commit message.
-
-For non-functional changes to infrastructure, try to label the change
-with the kind of change, e.g. *CMake* or *i18n* or *Documentation*.

ci/RELEASE.md

@@ -1,17 +1,16 @@
-The Calamares release process
+# Calamares Release Process
-=============================
 
-> As releases from *master* are now rolling when-they-are-ready releases,
+> Calamares releases are now rolling when-they-are-ready releases.
-> some of these steps no longer are followed. In particular, -RC releases
+> Releases are made from *master* and tagged there. When, in future,
-> are not done anymore (although the RC variable is set in `CMakeLists.txt`
+> LTS releases resume, these steps may be edited again.
-> to avoid accidents) and most things are automated through the release
+>
-> script [RELEASE.sh](RELEASE.sh)
+> Most things are automated through the release script [RELEASE.sh](RELEASE.sh)
 
-#### (0) A week in advance
+## (0) A week in advance
 
-* (Only releases from master)
+* Run [Coverity scan][coverity], fix what's relevant. The Coverity scan runs
-  Run [Coverity scan][coverity], fix what's relevant. The Coverity scan runs
+  automatically once a week on master. The badge is displayed on the
-  automatically once a week on master.
+  project front page and in the wiki.
 * Build with clang -Weverything, fix what's relevant.
   ```
     rm -rf build ; mkdir build ; cd build
@@ -26,34 +25,69 @@ The Calamares release process
   an additional environment variable to be set for some tests, which will
   destroy an attached disk. This is not always desirable. There are some
   sample config-files that are empty and which fail the config-tests.
-* (Only releases from master)
+* Notify [translators][transifex]. In the dashboard there is an *Announcements*
-  Notify [translators][transifex]. In the dashboard there is an *Announcements*
+  link that you can use to send a translation announcement. Note that regular
-  link that you can use to send a translation announcement.
+  use of `txpush.sh` will notify translators as well of any changes.
 
 [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
+## (1) Preparation
-  RC to a non-zero value (e.g. doing -rc1, -rc2, ...). Push that.
+
-* Check `README.md` and everything `ci/HACKING.md`, make sure it's all still
+* Pull latest translations from Transifex. We only push / pull translations
-  relevant. Run `ci/calamaresstyle` to check the C++ code style.
-  Run pycodestyle on recently-modified Python modules, fix what makes sense.
-* Check defaults in `settings.conf` and other configuration files.
-* (Only releases from master)
-  Pull latest translations from Transifex. We only push / pull translations
   from master, so longer-lived branches (e.g. 3.1.x) don't get translation
-  updates. This is to keep the translation workflow simple.
+  updates. This is to keep the translation workflow simple. The script
+  automatically commits changes to the translations.
   ```
     sh ci/txpull.sh
   ```
-* (Only releases from master)
+* Update the list of enabled translation languages in `CMakeLists.txt`.
-  Update the list of enabled translation languages in `CMakeLists.txt`.
   Check the [translation site][transifex] for the list of languages with
-  fairly complete translations.
+  fairly complete translations, or use `ci/txstats.py` for an automated
+  suggestion. If there are changes, commit them.
+* Push the changes.
+* Drop the RC variable to 0 in `CMakeLists.txt`, *CALAMARES_VERSION_RC*.
+* Check `README.md` and the
+  [Coding Guide](https://github.com/calamares/calamares/wiki/Develop-Code),
+  make sure it's all still
+  relevant. Run `ci/calamaresstyle` to check the C++ code style.
+  Run pycodestyle on recently-modified Python modules, fix what makes sense.
+* Check defaults in `settings.conf` and other configuration files.
+* Edit `CHANGES` and set the date of the release.
+* Commit both. This is usually done with commit-message
+  *Changes: pre-release housekeeping*.
 
-#### (2) Tarball
+
+## (2) Release Day
+
+* Run the helper script `ci/RELEASE.sh` or follow steps below.
+  The script checks:
+  - for uncommitted local changes,
+  - if translations are up-to-date and translators
+    have had enough time to chase new strings,
+  - that the build is successful (with gcc and clang, if available),
+  - tests pass,
+  - tarball can be created,
+  - tarball can be signed.
+  On success, it prints out a suitable signature- and SHA256 blurb
+  for use in the release announcement.
+
+### (2.1) Buld and Test
+
+* Build with gcc. If available, build again with Clang and double-check
+  any warnings Clang produces.
+* Run the tests; `make test` in the build directory should have no
+  failures (or if there are, know why they are there).
+
+### (2.2) Tag
+
+* `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.
+  You can use `make show-version` in the build directory to get the right
+  version number -- this will fail if you didn't follow step (1).
+
+### (2.3) Tarball
 
 * Create tarball: `git-archive-all -v calamares-1.1-rc1.tar.gz` or without
   the helper script,
@@ -64,21 +98,38 @@ The Calamares release process
   Double check that the tarball matches the version number.
 * Test tarball (e.g. unpack somewhere else and run the tests from step 0).
 
-#### (3) Tag
 
-* Set RC to zero in `CMakeLists.txt` if this is the actual release.
+## (3) Housekeeping
-* `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.
+
+## (4) Post-Release
+
+* Bump the version number in `CMakeLists.txt` in the `project()` command.
+* Set *CALAMARES_VERSION_RC* back to 1.
+* Add a placeholder entry for the next release in `CHANGES` with date
+  text *not released yet*.
+* Commit and push that, usually with the message
+  *Changes: post-release housekeeping*.
+
+```
+# 3.2.XX (unreleased) #
+
+This release contains contributions from (alphabetically by first name):
+ - No external contributors yet
+
+## Core ##
+ - No core changes yet
+
+## Modules ##
+ - No module changes yet
+```

ci/calamaresstyle

@@ -6,6 +6,11 @@
 # You can pass in directory names, in which case the files
 # in that directory (NOT below it) are processed.
 #
+LANG=C
+LC_ALL=C
+LC_NUMERIC=C
+export LANG LC_ALL LC_NUMERIC
+
 AS=$( which astyle )
 
 for _cf in clang-format-7 clang-format-8 clang-format70 clang-format80 clang-format

lang/python.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-01-29 11:14+0100\n"
+"POT-Creation-Date: 2020-02-19 17:27+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"
@@ -30,8 +30,8 @@ msgstr "Mounting partitions."
 #: src/modules/initcpiocfg/main.py:205
 #: src/modules/luksopenswaphookcfg/main.py:95
 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171
-#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94
+#: src/modules/initramfscfg/main.py:94 src/modules/initramfscfg/main.py:98
-#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78
+#: src/modules/openrcdmcryptcfg/main.py:78
 #: src/modules/openrcdmcryptcfg/main.py:82 src/modules/fstab/main.py:322
 #: src/modules/fstab/main.py:328 src/modules/localecfg/main.py:144
 #: src/modules/networkcfg/main.py:48
@@ -204,9 +204,9 @@ msgstr "Configuring mkinitcpio."
 
 #: src/modules/initcpiocfg/main.py:206
 #: src/modules/luksopenswaphookcfg/main.py:100
-#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99
+#: src/modules/initramfscfg/main.py:99 src/modules/openrcdmcryptcfg/main.py:83
-#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:329
+#: src/modules/fstab/main.py:329 src/modules/localecfg/main.py:145
-#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49
+#: src/modules/networkcfg/main.py:49
 msgid "No root mount point is given for <pre>{!s}</pre> to use."
 msgstr "No root mount point is given for <pre>{!s}</pre> to use."
 
@@ -272,10 +272,6 @@ msgstr ""
 msgid "Configure Plymouth theme"
 msgstr "Configure Plymouth theme"
 
-#: src/modules/machineid/main.py:36
-msgid "Generate machine-id."
-msgstr "Generate machine-id."
-
 #: src/modules/packages/main.py:62
 #, python-format
 msgid "Processing packages (%(count)d / %(total)d)"

lang/python/ar/LC_MESSAGES/python.po

@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-01-29 11:14+0100\n"
+"POT-Creation-Date: 2020-02-19 17:27+0100\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: aboodilankaboot, 2019\n"
 "Language-Team: Arabic (https://www.transifex.com/calamares/teams/20061/ar/)\n"
@@ -34,8 +34,8 @@ msgstr "جاري تركيب الأقسام"
 #: src/modules/initcpiocfg/main.py:205
 #: src/modules/luksopenswaphookcfg/main.py:95
 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171
-#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94
+#: src/modules/initramfscfg/main.py:94 src/modules/initramfscfg/main.py:98
-#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78
+#: src/modules/openrcdmcryptcfg/main.py:78
 #: src/modules/openrcdmcryptcfg/main.py:82 src/modules/fstab/main.py:322
 #: src/modules/fstab/main.py:328 src/modules/localecfg/main.py:144
 #: src/modules/networkcfg/main.py:48
@@ -201,9 +201,9 @@ msgstr ""
 
 #: src/modules/initcpiocfg/main.py:206
 #: src/modules/luksopenswaphookcfg/main.py:100
-#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99
+#: src/modules/initramfscfg/main.py:99 src/modules/openrcdmcryptcfg/main.py:83
-#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:329
+#: src/modules/fstab/main.py:329 src/modules/localecfg/main.py:145
-#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49
+#: src/modules/networkcfg/main.py:49
 msgid "No root mount point is given for <pre>{!s}</pre> to use."
 msgstr ""
 
@@ -262,10 +262,6 @@ msgstr ""
 msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/machineid/main.py:36
-msgid "Generate machine-id."
-msgstr "توليد معرف الجهاز"
-
 #: src/modules/packages/main.py:62
 #, python-format
 msgid "Processing packages (%(count)d / %(total)d)"

lang/python/as/LC_MESSAGES/python.po

@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-01-29 11:14+0100\n"
+"POT-Creation-Date: 2020-02-19 17:27+0100\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Deep Jyoti Choudhury <deep.choudhury@libresoft.in>, 2020\n"
 "Language-Team: Assamese (https://www.transifex.com/calamares/teams/20061/as/)\n"
@@ -33,8 +33,8 @@ msgstr "বিভাজন মাউন্ট্ কৰা।"
 #: src/modules/initcpiocfg/main.py:205
 #: src/modules/luksopenswaphookcfg/main.py:95
 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171
-#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94
+#: src/modules/initramfscfg/main.py:94 src/modules/initramfscfg/main.py:98
-#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78
+#: src/modules/openrcdmcryptcfg/main.py:78
 #: src/modules/openrcdmcryptcfg/main.py:82 src/modules/fstab/main.py:322
 #: src/modules/fstab/main.py:328 src/modules/localecfg/main.py:144
 #: src/modules/networkcfg/main.py:48
@@ -206,9 +206,9 @@ msgstr "mkinitcpio কনফিগাৰ কৰি আছে।"
 
 #: src/modules/initcpiocfg/main.py:206
 #: src/modules/luksopenswaphookcfg/main.py:100
-#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99
+#: src/modules/initramfscfg/main.py:99 src/modules/openrcdmcryptcfg/main.py:83
-#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:329
+#: src/modules/fstab/main.py:329 src/modules/localecfg/main.py:145
-#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49
+#: src/modules/networkcfg/main.py:49
 msgid "No root mount point is given for <pre>{!s}</pre> to use."
 msgstr "ব্যৱহাৰৰ বাবে <pre>{!s}</pre>ৰ কোনো মাউন্ট্ পাইন্ট্ দিয়া হোৱা নাই।"
 
@@ -270,10 +270,6 @@ msgstr "{name!s}ৰ বাবে পথ হ'ল <code>{path!s}</code> যিট
 msgid "Configure Plymouth theme"
 msgstr "Plymouth theme কন্ফিগাৰ কৰি আছে।​"
 
-#: src/modules/machineid/main.py:36
-msgid "Generate machine-id."
-msgstr "মেচিন-আইডি সৃষ্টি কৰক।"
-
 #: src/modules/packages/main.py:62
 #, python-format
 msgid "Processing packages (%(count)d / %(total)d)"

lang/python/ast/LC_MESSAGES/python.po

@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-01-29 11:14+0100\n"
+"POT-Creation-Date: 2020-02-19 17:27+0100\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: enolp <enolp@softastur.org>, 2019\n"
 "Language-Team: Asturian (https://www.transifex.com/calamares/teams/20061/ast/)\n"
@@ -33,8 +33,8 @@ msgstr ""
 #: src/modules/initcpiocfg/main.py:205
 #: src/modules/luksopenswaphookcfg/main.py:95
 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171
-#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94
+#: src/modules/initramfscfg/main.py:94 src/modules/initramfscfg/main.py:98
-#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78
+#: src/modules/openrcdmcryptcfg/main.py:78
 #: src/modules/openrcdmcryptcfg/main.py:82 src/modules/fstab/main.py:322
 #: src/modules/fstab/main.py:328 src/modules/localecfg/main.py:144
 #: src/modules/networkcfg/main.py:48
@@ -205,9 +205,9 @@ msgstr "Configurando mkinitcpio."
 
 #: src/modules/initcpiocfg/main.py:206
 #: src/modules/luksopenswaphookcfg/main.py:100
-#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99
+#: src/modules/initramfscfg/main.py:99 src/modules/openrcdmcryptcfg/main.py:83
-#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:329
+#: src/modules/fstab/main.py:329 src/modules/localecfg/main.py:145
-#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49
+#: src/modules/networkcfg/main.py:49
 msgid "No root mount point is given for <pre>{!s}</pre> to use."
 msgstr ""
 
@@ -267,10 +267,6 @@ msgstr ""
 msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/machineid/main.py:36
-msgid "Generate machine-id."
-msgstr "Xeneración de machine-id."
-
 #: src/modules/packages/main.py:62
 #, python-format
 msgid "Processing packages (%(count)d / %(total)d)"

lang/python/be/LC_MESSAGES/python.po

@@ -4,16 +4,16 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 # Translators:
-# Zmicer Turok <nashtlumach@gmail.com>, 2019
+# Zmicer Turok <nashtlumach@gmail.com>, 2020
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-01-29 11:14+0100\n"
+"POT-Creation-Date: 2020-02-19 17:27+0100\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
-"Last-Translator: Zmicer Turok <nashtlumach@gmail.com>, 2019\n"
+"Last-Translator: Zmicer Turok <nashtlumach@gmail.com>, 2020\n"
 "Language-Team: Belarusian (https://www.transifex.com/calamares/teams/20061/be/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -33,8 +33,8 @@ msgstr "Мантаванне раздзелаў."
 #: src/modules/initcpiocfg/main.py:205
 #: src/modules/luksopenswaphookcfg/main.py:95
 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171
-#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94
+#: src/modules/initramfscfg/main.py:94 src/modules/initramfscfg/main.py:98
-#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78
+#: src/modules/openrcdmcryptcfg/main.py:78
 #: src/modules/openrcdmcryptcfg/main.py:82 src/modules/fstab/main.py:322
 #: src/modules/fstab/main.py:328 src/modules/localecfg/main.py:144
 #: src/modules/networkcfg/main.py:48
@@ -206,9 +206,9 @@ msgstr "Наладка mkinitcpio."
 
 #: src/modules/initcpiocfg/main.py:206
 #: src/modules/luksopenswaphookcfg/main.py:100
-#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99
+#: src/modules/initramfscfg/main.py:99 src/modules/openrcdmcryptcfg/main.py:83
-#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:329
+#: src/modules/fstab/main.py:329 src/modules/localecfg/main.py:145
-#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49
+#: src/modules/networkcfg/main.py:49
 msgid "No root mount point is given for <pre>{!s}</pre> to use."
 msgstr "Каранёвы пункт мантавання для<pre>{!s}</pre> не пададзены."
 
@@ -230,7 +230,7 @@ msgstr "Не атрымалася дадаць службу {name!s} на ўзр
 
 #: src/modules/services-openrc/main.py:68
 msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr "Не атрымалася выдаліць службу {name!s} з узроўня запуску {level!s}."
+msgstr "Не атрымалася выдаліць службу {name!s} з узроўню запуску {level!s}."
 
 #: src/modules/services-openrc/main.py:70
 msgid ""
@@ -270,10 +270,6 @@ msgstr "Шлях <code>{path!s}</code> да службы {level!s} не існу
 msgid "Configure Plymouth theme"
 msgstr "Наладзіць тэму Plymouth"
 
-#: src/modules/machineid/main.py:36
-msgid "Generate machine-id."
-msgstr "Стварыць machine-id."
-
 #: src/modules/packages/main.py:62
 #, python-format
 msgid "Processing packages (%(count)d / %(total)d)"

lang/python/bg/LC_MESSAGES/python.po

@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-01-29 11:14+0100\n"
+"POT-Creation-Date: 2020-02-19 17:27+0100\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Georgi Georgiev <georgiev_1994@abv.bg>, 2018\n"
 "Language-Team: Bulgarian (https://www.transifex.com/calamares/teams/20061/bg/)\n"
@@ -33,8 +33,8 @@ msgstr ""
 #: src/modules/initcpiocfg/main.py:205
 #: src/modules/luksopenswaphookcfg/main.py:95
 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171
-#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94
+#: src/modules/initramfscfg/main.py:94 src/modules/initramfscfg/main.py:98
-#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78
+#: src/modules/openrcdmcryptcfg/main.py:78
 #: src/modules/openrcdmcryptcfg/main.py:82 src/modules/fstab/main.py:322
 #: src/modules/fstab/main.py:328 src/modules/localecfg/main.py:144
 #: src/modules/networkcfg/main.py:48
@@ -200,9 +200,9 @@ msgstr ""
 
 #: src/modules/initcpiocfg/main.py:206
 #: src/modules/luksopenswaphookcfg/main.py:100
-#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99
+#: src/modules/initramfscfg/main.py:99 src/modules/openrcdmcryptcfg/main.py:83
-#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:329
+#: src/modules/fstab/main.py:329 src/modules/localecfg/main.py:145
-#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49
+#: src/modules/networkcfg/main.py:49
 msgid "No root mount point is given for <pre>{!s}</pre> to use."
 msgstr ""
 
@@ -261,10 +261,6 @@ msgstr ""
 msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/machineid/main.py:36
-msgid "Generate machine-id."
-msgstr "Генерирай machine-id."
-
 #: src/modules/packages/main.py:62
 #, python-format
 msgid "Processing packages (%(count)d / %(total)d)"

lang/python/ca/LC_MESSAGES/python.po

@@ -4,16 +4,16 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 # Translators:
-# Davidmp <medipas@gmail.com>, 2019
+# Davidmp <medipas@gmail.com>, 2020
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-01-29 11:14+0100\n"
+"POT-Creation-Date: 2020-02-19 17:27+0100\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
-"Last-Translator: Davidmp <medipas@gmail.com>, 2019\n"
+"Last-Translator: Davidmp <medipas@gmail.com>, 2020\n"
 "Language-Team: Catalan (https://www.transifex.com/calamares/teams/20061/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -33,8 +33,8 @@ msgstr "Es munten les particions."
 #: src/modules/initcpiocfg/main.py:205
 #: src/modules/luksopenswaphookcfg/main.py:95
 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171
-#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94
+#: src/modules/initramfscfg/main.py:94 src/modules/initramfscfg/main.py:98
-#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78
+#: src/modules/openrcdmcryptcfg/main.py:78
 #: src/modules/openrcdmcryptcfg/main.py:82 src/modules/fstab/main.py:322
 #: src/modules/fstab/main.py:328 src/modules/localecfg/main.py:144
 #: src/modules/networkcfg/main.py:48
@@ -119,7 +119,7 @@ msgstr "No hi ha punt de muntatge per a la partició d'arrel."
 
 #: src/modules/unpackfs/main.py:371
 msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage no conté cap clau \"rootMountPoint\". No es fa res."
+msgstr "globalstorage no conté cap clau de \"rootMountPoint\". No es fa res."
 
 #: src/modules/unpackfs/main.py:376
 msgid "Bad mount point for root partition"
@@ -209,9 +209,9 @@ msgstr "Es configura mkinitcpio."
 
 #: src/modules/initcpiocfg/main.py:206
 #: src/modules/luksopenswaphookcfg/main.py:100
-#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99
+#: src/modules/initramfscfg/main.py:99 src/modules/openrcdmcryptcfg/main.py:83
-#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:329
+#: src/modules/fstab/main.py:329 src/modules/localecfg/main.py:145
-#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49
+#: src/modules/networkcfg/main.py:49
 msgid "No root mount point is given for <pre>{!s}</pre> to use."
 msgstr ""
 "No s'ha proporcionat el punt de muntatge perquè l'usi <pre>{!s}</pre>."
@@ -279,10 +279,6 @@ msgstr ""
 msgid "Configure Plymouth theme"
 msgstr "Configura el tema del Plymouth"
 
-#: src/modules/machineid/main.py:36
-msgid "Generate machine-id."
-msgstr "Generació de l'id. de la màquina."
-
 #: src/modules/packages/main.py:62
 #, python-format
 msgid "Processing packages (%(count)d / %(total)d)"

lang/python/ca@valencia/LC_MESSAGES/python.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-01-29 11:14+0100\n"
+"POT-Creation-Date: 2020-02-19 17:27+0100\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Catalan (Valencian) (https://www.transifex.com/calamares/teams/20061/ca@valencia/)\n"
 "MIME-Version: 1.0\n"
@@ -29,8 +29,8 @@ msgstr ""
 #: src/modules/initcpiocfg/main.py:205
 #: src/modules/luksopenswaphookcfg/main.py:95
 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171
-#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94
+#: src/modules/initramfscfg/main.py:94 src/modules/initramfscfg/main.py:98
-#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78
+#: src/modules/openrcdmcryptcfg/main.py:78
 #: src/modules/openrcdmcryptcfg/main.py:82 src/modules/fstab/main.py:322
 #: src/modules/fstab/main.py:328 src/modules/localecfg/main.py:144
 #: src/modules/networkcfg/main.py:48
@@ -196,9 +196,9 @@ msgstr ""
 
 #: src/modules/initcpiocfg/main.py:206
 #: src/modules/luksopenswaphookcfg/main.py:100
-#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99
+#: src/modules/initramfscfg/main.py:99 src/modules/openrcdmcryptcfg/main.py:83
-#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:329
+#: src/modules/fstab/main.py:329 src/modules/localecfg/main.py:145
-#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49
+#: src/modules/networkcfg/main.py:49
 msgid "No root mount point is given for <pre>{!s}</pre> to use."
 msgstr ""
 
@@ -257,10 +257,6 @@ msgstr ""
 msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/machineid/main.py:36
-msgid "Generate machine-id."
-msgstr ""
-
 #: src/modules/packages/main.py:62
 #, python-format
 msgid "Processing packages (%(count)d / %(total)d)"

lang/python/cs_CZ/LC_MESSAGES/python.po

@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-01-29 11:14+0100\n"
+"POT-Creation-Date: 2020-02-19 17:27+0100\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>, 2019\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/calamares/teams/20061/cs_CZ/)\n"
@@ -34,8 +34,8 @@ msgstr "Připojování oddílů."
 #: src/modules/initcpiocfg/main.py:205
 #: src/modules/luksopenswaphookcfg/main.py:95
 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171
-#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94
+#: src/modules/initramfscfg/main.py:94 src/modules/initramfscfg/main.py:98
-#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78
+#: src/modules/openrcdmcryptcfg/main.py:78
 #: src/modules/openrcdmcryptcfg/main.py:82 src/modules/fstab/main.py:322
 #: src/modules/fstab/main.py:328 src/modules/localecfg/main.py:144
 #: src/modules/networkcfg/main.py:48
@@ -208,9 +208,9 @@ msgstr "Nastavování mkinitcpio."
 
 #: src/modules/initcpiocfg/main.py:206
 #: src/modules/luksopenswaphookcfg/main.py:100
-#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99
+#: src/modules/initramfscfg/main.py:99 src/modules/openrcdmcryptcfg/main.py:83
-#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:329
+#: src/modules/fstab/main.py:329 src/modules/localecfg/main.py:145
-#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49
+#: src/modules/networkcfg/main.py:49
 msgid "No root mount point is given for <pre>{!s}</pre> to use."
 msgstr "Pro <pre>{!s}</pre> není zadán žádný přípojný bod."
 
@@ -278,10 +278,6 @@ msgstr ""
 msgid "Configure Plymouth theme"
 msgstr "Nastavit téma vzhledu pro Plymouth"
 
-#: src/modules/machineid/main.py:36
-msgid "Generate machine-id."
-msgstr "Vytvořit identifikátor stroje."
-
 #: src/modules/packages/main.py:62
 #, python-format
 msgid "Processing packages (%(count)d / %(total)d)"

lang/python/da/LC_MESSAGES/python.po

@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-01-29 11:14+0100\n"
+"POT-Creation-Date: 2020-02-19 17:27+0100\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: scootergrisen, 2019\n"
 "Language-Team: Danish (https://www.transifex.com/calamares/teams/20061/da/)\n"
@@ -34,8 +34,8 @@ msgstr "Monterer partitioner."
 #: src/modules/initcpiocfg/main.py:205
 #: src/modules/luksopenswaphookcfg/main.py:95
 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171
-#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94
+#: src/modules/initramfscfg/main.py:94 src/modules/initramfscfg/main.py:98
-#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78
+#: src/modules/openrcdmcryptcfg/main.py:78
 #: src/modules/openrcdmcryptcfg/main.py:82 src/modules/fstab/main.py:322
 #: src/modules/fstab/main.py:328 src/modules/localecfg/main.py:144
 #: src/modules/networkcfg/main.py:48
@@ -209,9 +209,9 @@ msgstr "Konfigurerer mkinitcpio."
 
 #: src/modules/initcpiocfg/main.py:206
 #: src/modules/luksopenswaphookcfg/main.py:100
-#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99
+#: src/modules/initramfscfg/main.py:99 src/modules/openrcdmcryptcfg/main.py:83
-#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:329
+#: src/modules/fstab/main.py:329 src/modules/localecfg/main.py:145
-#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49
+#: src/modules/networkcfg/main.py:49
 msgid "No root mount point is given for <pre>{!s}</pre> to use."
 msgstr ""
 "Der er ikke angivet noget rodmonteringspunkt som <pre>{!s}</pre> skal bruge."
@@ -277,10 +277,6 @@ msgstr ""
 msgid "Configure Plymouth theme"
 msgstr "Konfigurer Plymouth-tema"
 
-#: src/modules/machineid/main.py:36
-msgid "Generate machine-id."
-msgstr "Generér maskin-id."
-
 #: src/modules/packages/main.py:62
 #, python-format
 msgid "Processing packages (%(count)d / %(total)d)"

lang/python/de/LC_MESSAGES/python.po

@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-01-29 11:14+0100\n"
+"POT-Creation-Date: 2020-02-19 17:27+0100\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Christian Spaan, 2020\n"
 "Language-Team: German (https://www.transifex.com/calamares/teams/20061/de/)\n"
@@ -35,8 +35,8 @@ msgstr "Hänge Partitionen ein."
 #: src/modules/initcpiocfg/main.py:205
 #: src/modules/luksopenswaphookcfg/main.py:95
 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171
-#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94
+#: src/modules/initramfscfg/main.py:94 src/modules/initramfscfg/main.py:98
-#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78
+#: src/modules/openrcdmcryptcfg/main.py:78
 #: src/modules/openrcdmcryptcfg/main.py:82 src/modules/fstab/main.py:322
 #: src/modules/fstab/main.py:328 src/modules/localecfg/main.py:144
 #: src/modules/networkcfg/main.py:48
@@ -211,9 +211,9 @@ msgstr "Konfiguriere mkinitcpio. "
 
 #: src/modules/initcpiocfg/main.py:206
 #: src/modules/luksopenswaphookcfg/main.py:100
-#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99
+#: src/modules/initramfscfg/main.py:99 src/modules/openrcdmcryptcfg/main.py:83
-#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:329
+#: src/modules/fstab/main.py:329 src/modules/localecfg/main.py:145
-#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49
+#: src/modules/networkcfg/main.py:49
 msgid "No root mount point is given for <pre>{!s}</pre> to use."
 msgstr ""
 "Für <pre>{!s}</pre> wurde kein Einhängepunkt für die Root-Partition "
@@ -282,10 +282,6 @@ msgstr ""
 msgid "Configure Plymouth theme"
 msgstr "Konfiguriere Plymouth-Thema"
 
-#: src/modules/machineid/main.py:36
-msgid "Generate machine-id."
-msgstr "Generiere Computer-ID"
-
 #: src/modules/packages/main.py:62
 #, python-format
 msgid "Processing packages (%(count)d / %(total)d)"

lang/python/el/LC_MESSAGES/python.po

@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-01-29 11:14+0100\n"
+"POT-Creation-Date: 2020-02-19 17:27+0100\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Efstathios Iosifidis <iefstathios@gmail.com>, 2017\n"
 "Language-Team: Greek (https://www.transifex.com/calamares/teams/20061/el/)\n"
@@ -33,8 +33,8 @@ msgstr ""
 #: src/modules/initcpiocfg/main.py:205
 #: src/modules/luksopenswaphookcfg/main.py:95
 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171
-#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94
+#: src/modules/initramfscfg/main.py:94 src/modules/initramfscfg/main.py:98
-#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78
+#: src/modules/openrcdmcryptcfg/main.py:78
 #: src/modules/openrcdmcryptcfg/main.py:82 src/modules/fstab/main.py:322
 #: src/modules/fstab/main.py:328 src/modules/localecfg/main.py:144
 #: src/modules/networkcfg/main.py:48
@@ -200,9 +200,9 @@ msgstr ""
 
 #: src/modules/initcpiocfg/main.py:206
 #: src/modules/luksopenswaphookcfg/main.py:100
-#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99
+#: src/modules/initramfscfg/main.py:99 src/modules/openrcdmcryptcfg/main.py:83
-#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:329
+#: src/modules/fstab/main.py:329 src/modules/localecfg/main.py:145
-#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49
+#: src/modules/networkcfg/main.py:49
 msgid "No root mount point is given for <pre>{!s}</pre> to use."
 msgstr ""
 
@@ -261,10 +261,6 @@ msgstr ""
 msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/machineid/main.py:36
-msgid "Generate machine-id."
-msgstr ""
-
 #: src/modules/packages/main.py:62
 #, python-format
 msgid "Processing packages (%(count)d / %(total)d)"

lang/python/en_GB/LC_MESSAGES/python.po

@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-01-29 11:14+0100\n"
+"POT-Creation-Date: 2020-02-19 17:27+0100\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Jason Collins <JasonPCollins@protonmail.com>, 2018\n"
 "Language-Team: English (United Kingdom) (https://www.transifex.com/calamares/teams/20061/en_GB/)\n"
@@ -33,8 +33,8 @@ msgstr ""
 #: src/modules/initcpiocfg/main.py:205
 #: src/modules/luksopenswaphookcfg/main.py:95
 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171
-#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94
+#: src/modules/initramfscfg/main.py:94 src/modules/initramfscfg/main.py:98
-#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78
+#: src/modules/openrcdmcryptcfg/main.py:78
 #: src/modules/openrcdmcryptcfg/main.py:82 src/modules/fstab/main.py:322
 #: src/modules/fstab/main.py:328 src/modules/localecfg/main.py:144
 #: src/modules/networkcfg/main.py:48
@@ -200,9 +200,9 @@ msgstr ""
 
 #: src/modules/initcpiocfg/main.py:206
 #: src/modules/luksopenswaphookcfg/main.py:100
-#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99
+#: src/modules/initramfscfg/main.py:99 src/modules/openrcdmcryptcfg/main.py:83
-#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:329
+#: src/modules/fstab/main.py:329 src/modules/localecfg/main.py:145
-#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49
+#: src/modules/networkcfg/main.py:49
 msgid "No root mount point is given for <pre>{!s}</pre> to use."
 msgstr ""
 
@@ -261,10 +261,6 @@ msgstr ""
 msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/machineid/main.py:36
-msgid "Generate machine-id."
-msgstr "Generate machine-id."
-
 #: src/modules/packages/main.py:62
 #, python-format
 msgid "Processing packages (%(count)d / %(total)d)"

lang/python/eo/LC_MESSAGES/python.po

@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-01-29 11:14+0100\n"
+"POT-Creation-Date: 2020-02-19 17:27+0100\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Kurt Ankh Phoenix <kurtphoenix@tuta.io>, 2018\n"
 "Language-Team: Esperanto (https://www.transifex.com/calamares/teams/20061/eo/)\n"
@@ -33,8 +33,8 @@ msgstr ""
 #: src/modules/initcpiocfg/main.py:205
 #: src/modules/luksopenswaphookcfg/main.py:95
 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171
-#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94
+#: src/modules/initramfscfg/main.py:94 src/modules/initramfscfg/main.py:98
-#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78
+#: src/modules/openrcdmcryptcfg/main.py:78
 #: src/modules/openrcdmcryptcfg/main.py:82 src/modules/fstab/main.py:322
 #: src/modules/fstab/main.py:328 src/modules/localecfg/main.py:144
 #: src/modules/networkcfg/main.py:48
@@ -200,9 +200,9 @@ msgstr ""
 
 #: src/modules/initcpiocfg/main.py:206
 #: src/modules/luksopenswaphookcfg/main.py:100
-#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99
+#: src/modules/initramfscfg/main.py:99 src/modules/openrcdmcryptcfg/main.py:83
-#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:329
+#: src/modules/fstab/main.py:329 src/modules/localecfg/main.py:145
-#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49
+#: src/modules/networkcfg/main.py:49
 msgid "No root mount point is given for <pre>{!s}</pre> to use."
 msgstr ""
 
@@ -261,10 +261,6 @@ msgstr ""
 msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/machineid/main.py:36
-msgid "Generate machine-id."
-msgstr "Generi maŝino-legitimilo."
-
 #: src/modules/packages/main.py:62
 #, python-format
 msgid "Processing packages (%(count)d / %(total)d)"

lang/python/es/LC_MESSAGES/python.po

@@ -4,7 +4,7 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 # Translators:
-# strel, 2018
+# strel, 2017
 # Francisco Sánchez López de Lerma <fslopezlerma@gmail.com>, 2018
 # Guido Grasso <cuquiman97@gmail.com>, 2018
 # Adolfo Jayme-Barrientos, 2019
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-01-29 11:14+0100\n"
+"POT-Creation-Date: 2020-02-19 17:27+0100\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Miguel Mayol <mitcoes@gmail.com>, 2020\n"
 "Language-Team: Spanish (https://www.transifex.com/calamares/teams/20061/es/)\n"
@@ -37,8 +37,8 @@ msgstr "Montando particiones"
 #: src/modules/initcpiocfg/main.py:205
 #: src/modules/luksopenswaphookcfg/main.py:95
 #: src/modules/luksopenswaphookcfg/main.py:99 src/modules/rawfs/main.py:171
-#: src/modules/machineid/main.py:49 src/modules/initramfscfg/main.py:94
+#: src/modules/initramfscfg/main.py:94 src/modules/initramfscfg/main.py:98
-#: src/modules/initramfscfg/main.py:98 src/modules/openrcdmcryptcfg/main.py:78
+#: src/modules/openrcdmcryptcfg/main.py:78
 #: src/modules/openrcdmcryptcfg/main.py:82 src/modules/fstab/main.py:322
 #: src/modules/fstab/main.py:328 src/modules/localecfg/main.py:144
 #: src/modules/networkcfg/main.py:48
@@ -217,9 +217,9 @@ msgstr "Configurando mkinitcpio - sistema de arranque básico -."
 
 #: src/modules/initcpiocfg/main.py:206
 #: src/modules/luksopenswaphookcfg/main.py:100
-#: src/modules/machineid/main.py:50 src/modules/initramfscfg/main.py:99
+#: src/modules/initramfscfg/main.py:99 src/modules/openrcdmcryptcfg/main.py:83
-#: src/modules/openrcdmcryptcfg/main.py:83 src/modules/fstab/main.py:329
+#: src/modules/fstab/main.py:329 src/modules/localecfg/main.py:145
-#: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49
+#: src/modules/networkcfg/main.py:49
 msgid "No root mount point is given for <pre>{!s}</pre> to use."
 msgstr ""
 "No se facilitó un punto de montaje raíz utilizable para <pre>{!s}</pre> "
@@ -290,10 +290,6 @@ msgstr ""
 msgid "Configure Plymouth theme"
 msgstr "Configure el tema de Plymouth - menú de bienvenida."
 
-#: src/modules/machineid/main.py:36
-msgid "Generate machine-id."
-msgstr "Generar identificación-de-máquina."
-
 #: src/modules/packages/main.py:62
 #, python-format
 msgid "Processing packages (%(count)d / %(total)d)"