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

.clang-format

@@ -8,6 +8,7 @@ AlignEscapedNewlines: DontAlign
 AllowAllParametersOfDeclarationOnNextLine: "false"
 AllowShortFunctionsOnASingleLine: Inline
 AllowShortIfStatementsOnASingleLine: "false"
+AllowShortLambdasOnASingleLine: All
 AllowShortLoopsOnASingleLine: "false"
 AlwaysBreakAfterReturnType: TopLevelDefinitions
 AlwaysBreakTemplateDeclarations: Yes
@@ -28,7 +29,6 @@ ReflowComments: "false"
 SortIncludes: "true"
 SpaceAfterCStyleCast: "false"
 SpacesBeforeTrailingComments: "2"
-# SpaceInEmptyBlock: "true"
 SpacesInAngles: "true"
 SpacesInParentheses: "true"
 SpacesInSquareBrackets: "true"

.clang-format.base

@@ -0,0 +1,35 @@
+#   SPDX-FileCopyrightText: no
+#   SPDX-License-Identifier: CC0-1.0
+---
+BasedOnStyle: WebKit
+
+AlignAfterOpenBracket: Align
+AlignEscapedNewlines: DontAlign
+AllowAllParametersOfDeclarationOnNextLine: "false"
+AllowShortFunctionsOnASingleLine: Inline
+AllowShortIfStatementsOnASingleLine: "false"
+AllowShortLambdasOnASingleLine: All
+AllowShortLoopsOnASingleLine: "false"
+AlwaysBreakAfterReturnType: TopLevelDefinitions
+AlwaysBreakTemplateDeclarations: Yes
+BinPackArguments: "false"
+BinPackParameters: "false"
+BreakBeforeBraces: Allman
+BreakBeforeTernaryOperators: "true"
+BreakConstructorInitializers: BeforeComma
+ColumnLimit: 120
+Cpp11BracedListStyle: "false"
+FixNamespaceComments: "true"
+IncludeBlocks: Preserve
+IndentWidth: "4"
+MaxEmptyLinesToKeep: "2"
+NamespaceIndentation: None
+PointerAlignment: Left
+ReflowComments: "false"
+SortIncludes: "true"
+SpaceAfterCStyleCast: "false"
+SpacesBeforeTrailingComments: "2"
+SpacesInAngles: "true"
+SpacesInParentheses: "true"
+SpacesInSquareBrackets: "true"
+Standard: Cpp11

.github/actions/notify-push/action.yml

@@ -1,20 +0,0 @@
-name: 'Notify on Push'
-description: 'Notify Matrix room'
-
-inputs:
-  room:
-    description: 'Matrix Room ID'
-    required: true
-  token:
-    description: 'Matrix Token'
-    required: true
-  message:
-    description: 'Message to send'
-    required: true
-
-runs:
-  using: "composite"
-  steps:
-    - shell: bash
-      run: |
-        curl -s -XPOST -d "$( echo "${{ inputs.message }}" | jq -Rsc '{"msgtype": "m.text", "body":@text}' )" "https://matrix.org/_matrix/client/r0/rooms/%21${{ inputs.room }}/send/m.room.message?access_token=${{ inputs.token }}" > /dev/null

.github/workflows/issues.yml

@@ -5,20 +5,28 @@ on:
     types: [opened, reopened, closed]
 
 jobs:
-  irc:
+  notify:
     runs-on: ubuntu-latest
     steps:
       - name: "notify: new"
         if: github.event.issue.state == 'open'
-        uses: ./.github/actions/notify-push
+        uses: calamares/actions/matrix-notify@v3
         with:
           token: ${{ secrets.MATRIX_TOKEN }}
           room: ${{ secrets.MATRIX_ROOM }}
           message: "OPENED ${{ github.event.issue.html_url }} by ${{ github.actor }} ${{ github.event.issue.title }}"
       - name: "notify: closed"
         if: github.event.issue.state != 'open'
-        uses: ./.github/actions/notify-push
+        uses: calamares/actions/matrix-notify@v3
         with:
           token: ${{ secrets.MATRIX_TOKEN }}
           room: ${{ secrets.MATRIX_ROOM }}
           message: "CLOSED ${{ github.event.issue.html_url }} by ${{ github.actor }} ${{ github.event.issue.title }}"
+      - name: "remove in-progress label"
+        if: github.event.issue.state != 'open'
+        run: |
+          curl -X DELETE \
+            -H 'Accept: application/vnd.github.v3+json' \
+            -H 'Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}' \
+            "https://api.github.com/repos/${{ github.repository }}/issues/${{ github.event.issue.number }}/labels/hacking%3A%20in-progress"
+

.github/workflows/nightly-debian.yml

@@ -22,77 +22,23 @@ jobs:
       options: --tmpfs /build:rw --user 0:0
     steps:
       - name: "prepare env"
-        run: |
+        uses: calamares/actions/prepare-debian@v3
-          apt-get update
-          apt-get -y install git-core jq
-          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 \
-            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
-          # Same name as on KDE neon, different version
-          apt-get -y install libkpmcore-dev
-          # Additional dependencies
-          apt-get -y install \
-            libappstreamqt-dev \
-            libicu-dev \
-            libkf5crash-dev \
-            libkf5package-dev \
-            libkf5plasma-dev \
-            libpwquality-dev \
-            libqt5webenginewidgets5 \
-            qtwebengine5-dev
       - name: "prepare source"
         uses: actions/checkout@v2
-      - name: "prepare build"
+      - name: "build"
-        id: pre_build
+        id: build
-        run: |
+        uses: calamares/actions/generic-build@v3
-          test -n "$BUILDDIR" || { echo "! \$BUILDDIR not set" ; exit 1 ; }
-          mkdir -p $BUILDDIR
-          test -f $SRCDIR/CMakeLists.txt || { echo "! Missing $SRCDIR/CMakeLists.txt" ; exit 1 ; }
-          echo "::set-output name=message::"`git log -1 --abbrev-commit --pretty=oneline --no-decorate ${{ github.event.head_commit.id }}`
-      - name: "Calamares: cmake"
-        working-directory: ${{ env.BUILDDIR }}
-        run: cmake $CMAKE_ARGS $SRCDIR
-      - name: "Calamares: make"
-        working-directory: ${{ env.BUILDDIR }}
-        run: make -j2 VERBOSE=1
-      - name: "Calamares: install"
-        working-directory: ${{ env.BUILDDIR }}
-        run: make install VERBOSE=1
       - name: "notify: ok"
         if: ${{ success() && github.repository == 'calamares/calamares' }}
-        uses: ./.github/actions/notify-push
+        uses: calamares/actions/matrix-notify@v3
         with:
           token: ${{ secrets.MATRIX_TOKEN }}
           room: ${{ secrets.MATRIX_ROOM }}
-          message: "OK ${{ github.workflow }} in ${{ github.repository }} ${{ steps.pre_build.outputs.message }}"
+          message: "OK ${{ github.workflow }} in ${{ github.repository }} ${{ steps.build.outputs.git-summary }}"
       - name: "notify: fail"
         if: ${{ failure() && github.repository == 'calamares/calamares' }}
-        uses: ./.github/actions/notify-push
+        uses: calamares/actions/matrix-notify@v3
         with:
           token: ${{ secrets.MATRIX_TOKEN }}
           room: ${{ secrets.MATRIX_ROOM }}
-          message: "FAIL ${{ github.workflow }} in ${{ github.repository }} ${{ steps.pre_build.outputs.message }}"
+          message: "FAIL ${{ github.workflow }} in ${{ github.repository }} ${{ steps.build.outputs.git-summary }}"

.github/workflows/nightly-neon.yml

@@ -22,59 +22,18 @@ jobs:
       options: --tmpfs /build:rw --user 0:0
     steps:
       - name: "prepare env"
-        run: |
+        uses: calamares/actions/prepare-neon@v3
-          sudo apt-get update
-          sudo apt-get -y install git-core jq
-          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
       - name: "prepare source"
         uses: actions/checkout@v2
-      - name: "prepare build"
+      - name: "build"
-        id: pre_build
+        id: build
-        run: |
+        uses: calamares/actions/generic-build@v3
-          test -n "$BUILDDIR" || { echo "! \$BUILDDIR not set" ; exit 1 ; }
-          mkdir -p $BUILDDIR
-          test -f $SRCDIR/CMakeLists.txt || { echo "! Missing $SRCDIR/CMakeLists.txt" ; exit 1 ; }
-          echo "::set-output name=message::"`git log -1 --abbrev-commit --pretty=oneline --no-decorate ${{ github.event.head_commit.id }}`
-      - name: "Calamares: cmake"
-        working-directory: ${{ env.BUILDDIR }}
-        run: cmake $CMAKE_ARGS $SRCDIR
-      - name: "Calamares: make"
-        working-directory: ${{ env.BUILDDIR }}
-        run: make -j2 VERBOSE=1
-      - name: "Calamares: install"
-        working-directory: ${{ env.BUILDDIR }}
-        run: make install VERBOSE=1 DESTDIR=${{ env.BUILDDIR }}/stage
       - name: "Calamares: archive"
         working-directory: ${{ env.BUILDDIR }}
-        run: tar czf calamares.tar.gz stage
+        run: |
-      - name: "upload"
+          make install DESTDIR=${{ env.BUILDDIR }}/stage
+          tar czf calamares.tar.gz stage
+      - name: "Calamares: upload"
         uses: actions/upload-artifact@v2
         with:
           name: calamares-tarball
@@ -83,15 +42,15 @@ jobs:
           retention-days: 3
       - name: "notify: ok"
         if: ${{ success() && github.repository == 'calamares/calamares' }}
-        uses: ./.github/actions/notify-push
+        uses: calamares/actions/matrix-notify@v3
         with:
           token: ${{ secrets.MATRIX_TOKEN }}
           room: ${{ secrets.MATRIX_ROOM }}
-          message: "OK ${{ github.workflow }} in ${{ github.repository }} ${{ steps.pre_build.outputs.message }}"
+          message: "OK ${{ github.workflow }} in ${{ github.repository }} ${{ steps.build.outputs.git-summary }}"
       - name: "notify: fail"
         if: ${{ failure() && github.repository == 'calamares/calamares' }}
-        uses: ./.github/actions/notify-push
+        uses: calamares/actions/matrix-notify@v3
         with:
           token: ${{ secrets.MATRIX_TOKEN }}
           room: ${{ secrets.MATRIX_ROOM }}
-          message: "FAIL ${{ github.workflow }} in ${{ github.repository }} ${{ steps.pre_build.outputs.message }}"
+          message: "FAIL ${{ github.workflow }} in ${{ github.repository }} ${{ steps.build.outputs.git-summary }}"

.github/workflows/nightly-opensuse.yml

@@ -22,75 +22,24 @@ jobs:
       options: --tmpfs /build:rw --user 0:0
     steps:
       - name: "prepare env"
-        run: |
+        uses: calamares/actions/prepare-opensuse@v3
-          zypper --non-interactive up
-          zypper --non-interactive in git-core jq
-          # From deploycala.py
-          zypper --non-interactive in \
-            "autoconf" \
-            "automake" \
-            "bison" \
-            "flex" \
-            "git" \
-            "libtool" \
-            "m4" \
-            "make" \
-            "cmake" \
-            "extra-cmake-modules" \
-            "gcc-c++" \
-            "libqt5-qtbase-devel" \
-            "libqt5-linguist-devel" \
-            "libqt5-qtsvg-devel" \
-            "libqt5-qtdeclarative-devel" \
-            "libqt5-qtwebengine-devel" \
-            "yaml-cpp-devel" \
-            "libpolkit-qt5-1-devel" \
-            "kservice-devel" \
-            "kpackage-devel" \
-            "kparts-devel" \
-            "kcrash-devel" \
-            "kpmcore-devel" \
-            "plasma5-workspace-devel" \
-            "plasma-framework-devel" \
-            "libpwquality-devel" \
-            "parted-devel" \
-            "python3-devel" \
-            "boost-devel" \
-            "libboost_python-py3-*-devel"
-          # Additional dependencies
-          zypper --non-interactive in \
-            libicu-devel \
-            libAppStreamQt-devel \
-            libatasmart-devel
       - name: "prepare source"
         uses: actions/checkout@v2
-      - name: "prepare build"
+      - name: "build"
-        id: pre_build
+        id: build
-        run: |
+        uses: calamares/actions/generic-build@v3
-          test -n "$BUILDDIR" || { echo "! \$BUILDDIR not set" ; exit 1 ; }
-          mkdir -p $BUILDDIR
-          test -f $SRCDIR/CMakeLists.txt || { echo "! Missing $SRCDIR/CMakeLists.txt" ; exit 1 ; }
-          echo "::set-output name=message::"`git log -1 --abbrev-commit --pretty=oneline --no-decorate ${{ github.event.head_commit.id }}`
-      - name: "Calamares: cmake"
-        working-directory: ${{ env.BUILDDIR }}
-        run: cmake $CMAKE_ARGS $SRCDIR
-      - name: "Calamares: make"
-        working-directory: ${{ env.BUILDDIR }}
-        run: make -j2 VERBOSE=1
-      - name: "Calamares: install"
-        working-directory: ${{ env.BUILDDIR }}
-        run: make install VERBOSE=1
       - name: "notify: ok"
         if: ${{ success() && github.repository == 'calamares/calamares' }}
-        uses: ./.github/actions/notify-push
+        uses: calamares/actions/matrix-notify@v3
         with:
           token: ${{ secrets.MATRIX_TOKEN }}
           room: ${{ secrets.MATRIX_ROOM }}
-          message: "OK ${{ github.workflow }} in ${{ github.repository }} ${{ steps.pre_build.outputs.message }}"
+          message: |
+            OK ${{ github.workflow }} in ${{ github.repository }} ${{ steps.build.outputs.git-summary }}"
       - name: "notify: fail"
         if: ${{ failure() && github.repository == 'calamares/calamares' }}
-        uses: ./.github/actions/notify-push
+        uses: calamares/actions/matrix-notify@v3
         with:
           token: ${{ secrets.MATRIX_TOKEN }}
           room: ${{ secrets.MATRIX_ROOM }}
-          message: "FAIL ${{ github.workflow }} in ${{ github.repository }} ${{ steps.pre_build.outputs.message }}"
+          message: "FAIL ${{ github.workflow }} in ${{ github.repository }} ${{ steps.build.outputs.git-summary }}"

.github/workflows/push.yml

@@ -28,71 +28,28 @@ jobs:
       options: --tmpfs /build:rw --user 0:0
     steps:
       - name: "prepare env"
-        run: |
+        uses: calamares/actions/prepare-neon@v3
-          sudo apt-get update
-          sudo apt-get -y install git-core jq
-          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
       - name: "prepare source"
         uses: actions/checkout@v2
-      - name: "prepare build"
+      - name: "build"
-        id: pre_build
+        id: build
-        run: |
+        uses: calamares/actions/generic-build@v3
-          test -n "$BUILDDIR" || { echo "! \$BUILDDIR not set" ; exit 1 ; }
-          mkdir -p $BUILDDIR
-          test -f $SRCDIR/CMakeLists.txt || { echo "! Missing $SRCDIR/CMakeLists.txt" ; exit 1 ; }
-          echo "::set-output name=message::"`git log -1 --abbrev-commit --pretty=oneline --no-decorate ${{ github.event.head_commit.id }}`
-      - name: "Calamares: cmake"
-        working-directory: ${{ env.BUILDDIR }}
-        run: cmake $CMAKE_ARGS $SRCDIR
-      - name: "Calamares: make"
-        working-directory: ${{ env.BUILDDIR }}
-        run: make -j2 VERBOSE=1
-      - name: "Calamares: install"
-        working-directory: ${{ env.BUILDDIR }}
-        run: make install VERBOSE=1
       - name: "notify: ok"
         if: ${{ success() && github.repository == 'calamares/calamares' }}
-        uses: ./.github/actions/notify-push
+        uses: calamares/actions/matrix-notify@v3
         with:
           token: ${{ secrets.MATRIX_TOKEN }}
           room: ${{ secrets.MATRIX_ROOM }}
           message: |
             OK ${{ github.workflow }} in ${{ github.repository }} by ${{ github.actor }} on ${{ github.event.ref }}
-            .. ${{ steps.pre_build.outputs.message }}
+            .. ${{ steps.build.outputs.git-summary }}
       - name: "notify: fail"
         if: ${{ failure() && github.repository == 'calamares/calamares' }}
-        uses: ./.github/actions/notify-push
+        uses: calamares/actions/matrix-notify@v3
         with:
           token: ${{ secrets.MATRIX_TOKEN }}
           room: ${{ secrets.MATRIX_ROOM }}
           message: |
             FAIL ${{ github.workflow }} in ${{ github.repository }} by ${{ github.actor }} on ${{ github.event.ref }}
-              .. ${{ steps.pre_build.outputs.message }}
+              .. ${{ steps.build.outputs.git-summary }}
               .. ${{ github.event.compare }}

CHANGES

@@ -17,6 +17,10 @@ This release contains contributions from (alphabetically by first name):
  - Joe Kamprad
  - Lisa Vitolo (blast from the past!)
 
+In project news, chat (instant-messaging) communications has largely
+moved to Matrix and Libera.Chat. CI notifications -- issues and build
+results -- are sent to Matrix only.
+
 ## Core ##
  - The CMake modules for consumption by external modules (e.g. the
    calamares-extensions repository, but also any other modules built

CONTRIBUTING.md

@@ -36,8 +36,8 @@ that chat window open because it can easily take a few hours for
 someone to notice a message.
 The Matrix room is relatively new.
 
-* [![Chat on IRC](https://img.shields.io/badge/IRC-Freenode%20%23calamares-green)](https://webchat.freenode.net/?randomnick=1&channels=%23calamares)
 * [![Join us on Matrix](https://img.shields.io/badge/Matrix-%23calamares:kde.org-blue)](https://webchat.kde.org/#/room/%23calamares:kde.org)
+* [![Chat on IRC](https://img.shields.io/badge/IRC-Libera.Chat%20%23calamares-green)](https://kiwiirc.com/client/irc.libera.chat/#calamares)
 
 
 ## General Guidelines

README.md

@@ -5,14 +5,13 @@
 # Calamares: Distribution-Independent Installer Framework
 ---------
 
+[![Current issue](https://img.shields.io/badge/issue-in_progress-FE9B48)](https://github.com/calamares/calamares/labels/hacking%3A%20in-progress)
 [![GitHub release](https://img.shields.io/github/release/calamares/calamares.svg)](https://github.com/calamares/calamares/releases)
 [![GitHub Build Status](https://img.shields.io/github/workflow/status/calamares/calamares/ci?label=GH%20build)](https://github.com/calamares/calamares/actions?query=workflow%3Aci)
-[![Travis Build Status](https://travis-ci.org/calamares/calamares.svg?branch=calamares)](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/calamares/LICENSE)
 
 
-| [Report a Bug](https://github.com/calamares/calamares/issues/new) | [Translate](https://www.transifex.com/projects/p/calamares/) | [Contribute](CONTRIBUTING.md) | [IRC: Freenode #calamares](https://webchat.freenode.net/?channel=#calamares?nick=guest) | [Matrix: #calamares:kde.org](https://webchat.kde.org/#/room/%23calamares:kde.org) | [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](CONTRIBUTING.md) | [IRC: Libera.Chat #calamares](https://kiwiirc.com/client/irc.libera.chat/#calamares) | [Matrix: #calamares:kde.org](https://webchat.kde.org/#/room/%23calamares:kde.org) | [Wiki](https://github.com/calamares/calamares/wiki) |
 |:--:|:--:|:--:|:--:|:--:|:--:|
 
 
@@ -61,5 +60,5 @@ Regular Calamares development chit-chat happens on old-school IRC
 (no registration required). Responsiveness is best during the day
 in Europe, but feel free to idle. The Matrix room is relatively new.
 
-* [![Chat on IRC](https://img.shields.io/badge/IRC-Freenode%20%23calamares-green)](https://webchat.freenode.net/?randomnick=1&channels=%23calamares)
 * [![Join us on Matrix](https://img.shields.io/badge/Matrix-%23calamares:kde.org-blue)](https://webchat.kde.org/#/room/%23calamares:kde.org)
+* [![Chat on IRC](https://img.shields.io/badge/IRC-Libera.Chat%20%23calamares-green)](https://kiwiirc.com/client/irc.libera.chat/#calamares)

ci/calamaresstyle

@@ -5,12 +5,7 @@
 #   SPDX-License-Identifier: BSD-2-Clause
 #
 # Calls astyle with settings matching Calamares coding style
-# Requires astyle >= 2.04 and clang-format-7 -8 or -9
+# Requires astyle >= 2.04 and clang-format-8 or later
-#
-# Clang-format-10 is **not** supported, since it changes a default
-# that re-introduces a space into empty function bodies; this
-# can be turned off with a style setting, but that breaks
-# older format versions which don't recognize the setting.
 #
 # You can pass in directory names, in which case the files
 # in that directory (NOT below it) are processed.
@@ -20,9 +15,16 @@ LC_ALL=C
 LC_NUMERIC=C
 export LANG LC_ALL LC_NUMERIC
 
+BASEDIR=$(dirname $0)
+TOPDIR=$( cd $BASEDIR/.. && pwd -P )
+test -d "$BASEDIR" || { echo "! Could not determine base for $0" ; exit 1 ; }
+test -d "$TOPDIR" || { echo "! Cound not determine top-level source dir" ; exit 1 ; }
+test -f "$TOPDIR/.clang-format.base" || { echo "! No .clang-format support files in $TOPDIR" ; exit 1 ; }
+
 AS=$( which astyle )
 
-CF_VERSIONS="clang-format-8 clang-format80 clang-format90 clang-format-9.0.1 clang-format"
+# Allow specifying CF_VERSIONS outside already
+CF_VERSIONS="$CF_VERSIONS clang-format-8 clang-format80 clang-format90 clang-format-9.0.1 clang-format"
 for _cf in $CF_VERSIONS
 do
 	# Not an error if this particular clang-format isn't found
@@ -35,19 +37,39 @@ test -n "$CF" || { echo "! No clang-format ($CF_VERSIONS) found in PATH"; exit 1
 test -x "$AS" || { echo "! $AS is not executable."; exit 1 ; }
 test -x "$CF" || { echo "! $CF is not executable."; exit 1 ; }
 
-unmangle_clang_format=""
+### CLANG-FORMAT-WRANGLING
-format_version=`"$CF" --version | tr -dc '[^.0-9]' | cut  -d . -f 1`
+#
-if expr "$format_version" '<' 8 > /dev/null ; then
+# Version 7 and earlier doesn't understand all the options we would like
-	echo "! Clang-format version 8+ required"
+# Version 8 is ok
-	exit 1
+# Version 9 is ok
-fi
+# Later versions change some defaults so need extra wrangling.
-if expr "$format_version" '<' 10 > /dev/null ; then
+# .. there are extra files that are appended to the settings, per
-	:
+# .. clang-format version.
-else
-	unmangle_clang_format=$( dirname $0 )/../.clang-format
-	echo "SpaceInEmptyBlock: false" >> "$unmangle_clang_format"
-fi
 
+format_version=`"$CF" --version | tr -dc '[^.0-9]' | cut  -d . -f 1`
+case "$format_version" in
+	[0-7] )
+		echo "! Clang-format version 8+ required"
+		exit 1
+		;;
+	[89] )
+		:
+		;;
+	* )
+		echo "! Clang-format version '$format_version' unsupported."
+		exit 1
+		;;
+esac
+_fmt="$TOPDIR/.clang-format"
+cp "$_fmt.base" "$_fmt"
+for f in "$extra_settings" ; do
+	test -f "$_fmt.$f" && cat "$_fmt.$f" >> "$_fmt"
+done
+
+
+### FILE PROCESSING
+#
+#
 set -e
 
 any_dirs=no
@@ -59,7 +81,7 @@ done
 style_some()
 {
 	if test -n "$*" ; then
-		$AS --options=$(dirname $0)/astylerc --quiet "$@"
+		$AS --options=$BASEDIR/astylerc --quiet "$@"
 		$CF -i -style=file "$@"
 	fi
 }
@@ -77,6 +99,7 @@ else
 	style_some "$@"
 fi
 
-if test -n "$unmangle_clang_format" ; then
+### CLANG-FORMAT-WRANGLING
-	sed -i.bak '/^SpaceInEmptyBlock/d' "$unmangle_clang_format"
+#
-fi
+# Restore the original .clang-format
+cp "$_fmt.base" "$_fmt"

ci/notify.sh

@@ -1,52 +0,0 @@
-#! /bin/sh
-#
-# SPDX-FileCopyrightText: 2021 Adriaan de Groot <groot@kde.org>
-# SPDX-License-Identifier: BSD-2-Clause
-#
-###
-#
-# Sends a notification to wherever the notifications need to be sent.
-#
-# Called with the following environment (for tokens / secrets):
-#	MATRIX_ROOM
-#	MATRIX_TOKEN
-#
-# Called with the following arguments (in order):
-#	- "OK" or "FAIL"
-#	- github.workflow
-#	- github.repository
-#	- github.actor
-#	- github.event.ref
-#	- commit-message-summary (produced in the workflow)
-#	- github.event.compare
-#
-
-test -z "$MATRIX_ROOM" && { echo "! No secrets" ; exit 1 ; }
-test -z "$MATRIX_TOKEN" && { echo "! No secrets" ; exit 1 ; }
-
-STATUS="$1"
-
-WORKFLOW="$2"
-REPOSITORY="$3"
-ACTOR="$4"
-EVENT="$5"
-SUMMARY="$6"
-COMPARE="$7"
-
-test "x$STATUS" = "xOK" -o "x$STATUS" = "xFAIL" || { echo "! Invalid status" ; exit 1 ; }
-
-test -z "$WORKFLOW" && { echo "! No event data" ; exit 1 ; }
-test -z "$REPOSITORY" && { echo "! No event data" ; exit 1 ; }
-test -z "$ACTOR" && { echo "! No event data" ; exit 1 ; }
-test -z "$EVENT" && { echo "! No event data" ; exit 1 ; }
-# It's ok for summary or the compare URL to be empty
-
-url="https://matrix.org/_matrix/client/r0/rooms/%21${MATRIX_ROOM}/send/m.room.message?access_token=${MATRIX_TOKEN}"
-message_data=$(
-{
-	echo "${STATUS} ${WORKFLOW} in ${REPOSITORY} ${ACTOR} on ${EVENT}"
-	test -n "$SUMMARY" && echo ".. ${SUMMARY}"
-	test -n "$COMPARE" && echo ".. DIFF ${COMPARE}"
-} | jq -Rs '{"msgtype": "m.text", "body":@text}' )
-
-curl -s -XPOST -d "$message_data" "$url" > /dev/null

lang/calamares_es.ts

@@ -6,7 +6,7 @@
     <message>
       <location filename="../src/modules/partition/jobs/AutoMountManagementJob.cpp" line="22"/>
       <source>Manage auto-mount settings</source>
-      <translation type="unfinished"/>
+      <translation>Gestionar la configuración de montaje automático</translation>
     </message>
   </context>
   <context>
@@ -14,7 +14,7 @@
     <message>
       <location filename="../src/modules/partition/gui/BootInfoWidget.cpp" line="62"/>
       <source>The &lt;strong&gt;boot environment&lt;/strong&gt; of this system.&lt;br&gt;&lt;br&gt;Older x86 systems only support &lt;strong&gt;BIOS&lt;/strong&gt;.&lt;br&gt;Modern systems usually use &lt;strong&gt;EFI&lt;/strong&gt;, but may also show up as BIOS if started in compatibility mode.</source>
-      <translation>El &lt;strong&gt;entorno de arranque&lt;strong&gt; de este sistema.&lt;br&gt;&lt;br&gt;Los sistemas x86 sólo soportan &lt;strong&gt;BIOS&lt;/strong&gt;.&lt;br&gt;Los sistemas modernos habitualmente usan &lt;strong&gt;EFI&lt;/strong&gt;, pero también pueden mostrarse como BIOS si se inician en modo de compatibildiad.</translation>
+      <translation>El &lt;strong&gt;entorno de arranque&lt;strong&gt; de este sistema.&lt;br&gt;&lt;br&gt;Los sistemas x86 sólo tienen soporte para &lt;strong&gt;BIOS&lt;/strong&gt;.&lt;br&gt;Los sistemas modernos habitualmente usan &lt;strong&gt;EFI&lt;/strong&gt;, pero también pueden mostrarse como BIOS si se inician en modo de compatibildiad.</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/BootInfoWidget.cpp" line="72"/>
@@ -115,12 +115,12 @@ Para configurar el arranque desde un entorno BIOS, este instalador debe instalar
     <message>
       <location filename="../src/calamares/DebugWindow.ui" line="141"/>
       <source>Uploads the session log to the configured pastebin.</source>
-      <translation type="unfinished"/>
+      <translation>Sube el log de la sesión hacia el pastebin configurado.</translation>
     </message>
     <message>
       <location filename="../src/calamares/DebugWindow.ui" line="144"/>
       <source>Send Session Log</source>
-      <translation type="unfinished"/>
+      <translation>Envía el Log de la Sesión.</translation>
     </message>
     <message>
       <location filename="../src/calamares/DebugWindow.ui" line="118"/>

lang/calamares_es_MX.ts

@@ -1882,7 +1882,7 @@ El instalador terminará y se perderán todos los cambios.</translation>
     <message>
       <location filename="../src/modules/machineid/MachineIdJob.cpp" line="53"/>
       <source>Configuration Error</source>
-      <translation type="unfinished"/>
+      <translation>Error de configuración</translation>
     </message>
     <message>
       <location filename="../src/modules/machineid/MachineIdJob.cpp" line="54"/>

lang/calamares_fr.ts

@@ -104,7 +104,7 @@
     <message>
       <location filename="../src/calamares/DebugWindow.ui" line="102"/>
       <source>Crashes Calamares, so that Dr. Konqui can look at it.</source>
-      <translation>Crashes Calamares, pour que le Dr. Konqui puisse les regarder.</translation>
+      <translation>Accidents de Calamares, pour que le Dr. Konqui puisse les regarder.</translation>
     </message>
     <message>
       <location filename="../src/calamares/DebugWindow.ui" line="115"/>

lang/calamares_he.ts

@@ -119,7 +119,7 @@
     <message>
       <location filename="../src/calamares/DebugWindow.ui" line="144"/>
       <source>Send Session Log</source>
-      <translation type="unfinished"/>
+      <translation>שליחת קובץ היומן של ההפעלה</translation>
     </message>
     <message>
       <location filename="../src/calamares/DebugWindow.ui" line="118"/>
@@ -758,7 +758,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
       <location filename="../src/modules/netinstall/Config.cpp" line="53"/>
       <source>Network Installation. (Disabled: Incorrect configuration)</source>
-      <translation>התקנת רשת. (מושבתת: תצורה שגויה)</translation>
+      <translation>התקנה מהרשת. (מושבתת: תצורה שגויה)</translation>
     </message>
     <message>
       <location filename="../src/modules/netinstall/Config.cpp" line="55"/>
@@ -768,7 +768,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
       <location filename="../src/modules/netinstall/Config.cpp" line="57"/>
       <source>Network Installation. (Disabled: Internal error)</source>
-      <translation type="unfinished"/>
+      <translation>התקנה מהרשת. (מושבתת: שגיאה פנימית)</translation>
     </message>
     <message>
       <location filename="../src/modules/netinstall/Config.cpp" line="61"/>
@@ -888,12 +888,12 @@ The installer will quit and all changes will be lost.</source>
     <message>
       <location filename="../src/modules/finished/Config.cpp" line="147"/>
       <source>The setup of %1 did not complete successfully.</source>
-      <translation type="unfinished"/>
+      <translation>התקנת %1 לא הושלמה בהצלחה.</translation>
     </message>
     <message>
       <location filename="../src/modules/finished/Config.cpp" line="148"/>
       <source>The installation of %1 did not complete successfully.</source>
-      <translation>ההתקנה של %1 לא הסתיימה בהצלחה.</translation>
+      <translation>התקנת %1 לא הושלמה בהצלחה.</translation>
     </message>
     <message>
       <location filename="../src/modules/finished/Config.cpp" line="152"/>
@@ -1012,7 +1012,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
       <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="125"/>
       <source>Create new %1MiB partition on %3 (%2).</source>
-      <translation type="unfinished"/>
+      <translation>יצירת מחיצה חדשה בגודל %1MiB על גבי %3 ‏(%2).</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="132"/>
@@ -1027,7 +1027,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
       <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="157"/>
       <source>Create new &lt;strong&gt;%1MiB&lt;/strong&gt; partition on &lt;strong&gt;%3&lt;/strong&gt; (%2).</source>
-      <translation type="unfinished"/>
+      <translation>יצירת מחיצה חדשה בגודל &lt;strong&gt;%1MiB&lt;/strong&gt; על גבי &lt;strong&gt;%3&lt;/strong&gt; ‏(%2).</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="164"/>

lang/calamares_ja.ts

@@ -574,7 +574,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
       <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1150"/>
       <source>The EFI system partition at %1 will be used for starting %2.</source>
-      <translation>%1 上のEFIシステムパーテイションは %2 のスタートに使用されます。</translation>
+      <translation>%1 の EFI システム パーティションは、%2 の起動に使用されます。</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1158"/>

lang/calamares_nl.ts

@@ -6,7 +6,7 @@
     <message>
       <location filename="../src/modules/partition/jobs/AutoMountManagementJob.cpp" line="22"/>
       <source>Manage auto-mount settings</source>
-      <translation type="unfinished"/>
+      <translation>Beheer auto-mount instellingen</translation>
     </message>
   </context>
   <context>
@@ -104,22 +104,22 @@
     <message>
       <location filename="../src/calamares/DebugWindow.ui" line="102"/>
       <source>Crashes Calamares, so that Dr. Konqui can look at it.</source>
-      <translation type="unfinished"/>
+      <translation>Laat Calamares crashen, zodat Dr. Konqui er naar kan kijken.</translation>
     </message>
     <message>
       <location filename="../src/calamares/DebugWindow.ui" line="115"/>
       <source>Reloads the stylesheet from the branding directory.</source>
-      <translation type="unfinished"/>
+      <translation>Laadt het stylesheet van de fabrikantsmap opnieuw.</translation>
     </message>
     <message>
       <location filename="../src/calamares/DebugWindow.ui" line="141"/>
       <source>Uploads the session log to the configured pastebin.</source>
-      <translation type="unfinished"/>
+      <translation>Uploads de sessielogboeken naar de geconfigureerde pastebin.</translation>
     </message>
     <message>
       <location filename="../src/calamares/DebugWindow.ui" line="144"/>
       <source>Send Session Log</source>
-      <translation type="unfinished"/>
+      <translation>Verstuur Sessielogboeken</translation>
     </message>
     <message>
       <location filename="../src/calamares/DebugWindow.ui" line="118"/>
@@ -129,7 +129,7 @@
     <message>
       <location filename="../src/calamares/DebugWindow.ui" line="128"/>
       <source>Displays the tree of widget names in the log (for stylesheet debugging).</source>
-      <translation type="unfinished"/>
+      <translation>Weergeeft de boom van widgetnamen in het logboek (voor stylesheet debuggen).</translation>
     </message>
     <message>
       <location filename="../src/calamares/DebugWindow.ui" line="131"/>
@@ -338,7 +338,11 @@
 %1
 
 Link copied to clipboard</source>
-      <translation type="unfinished"/>
+      <translation>Installatielogboek geposte naar:
+
+%1
+
+Link gekopieerd naar klembord</translation>
     </message>
     <message>
       <location filename="../src/libcalamaresui/ViewManager.cpp" line="205"/>
@@ -626,17 +630,17 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan.
     <message>
       <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1443"/>
       <source>This storage device already has an operating system on it, but the partition table &lt;strong&gt;%1&lt;/strong&gt; is different from the needed &lt;strong&gt;%2&lt;/strong&gt;.&lt;br/&gt;</source>
-      <translation type="unfinished"/>
+      <translation>Dit opslagmedium bevat al een besturingssysteem, maar de partitietabel &lt;strong&gt;%1&lt;/strong&gt; is anders dan het benodigde &lt;strong&gt;%2&lt;/strong&gt;.&lt;br/&gt;</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1466"/>
       <source>This storage device has one of its partitions &lt;strong&gt;mounted&lt;/strong&gt;.</source>
-      <translation type="unfinished"/>
+      <translation>Dit opslagmedium heeft een van de partities &lt;strong&gt;gemount&lt;/strong&gt;.</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1471"/>
       <source>This storage device is a part of an &lt;strong&gt;inactive RAID&lt;/strong&gt; device.</source>
-      <translation type="unfinished"/>
+      <translation>Dit opslagmedium maakt deel uit van een &lt;strong&gt;inactieve RAID&lt;/strong&gt; apparaat.</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1598"/>
@@ -764,12 +768,12 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan.
     <message>
       <location filename="../src/modules/netinstall/Config.cpp" line="57"/>
       <source>Network Installation. (Disabled: Internal error)</source>
-      <translation type="unfinished"/>
+      <translation>Netwerkinstallatie. (Uitgeschakeld: Interne Fout)</translation>
     </message>
     <message>
       <location filename="../src/modules/netinstall/Config.cpp" line="61"/>
       <source>Network Installation. (Disabled: No package list)</source>
-      <translation type="unfinished"/>
+      <translation>Netwerkinstallatie. (Uitgeschakeld: Ontbrekende pakketlijst)</translation>
     </message>
     <message>
       <location filename="../src/modules/netinstall/Config.cpp" line="77"/>
@@ -884,12 +888,12 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan.
     <message>
       <location filename="../src/modules/finished/Config.cpp" line="147"/>
       <source>The setup of %1 did not complete successfully.</source>
-      <translation type="unfinished"/>
+      <translation>De voorbereiding van %1 is niet met succes voltooid.</translation>
     </message>
     <message>
       <location filename="../src/modules/finished/Config.cpp" line="148"/>
       <source>The installation of %1 did not complete successfully.</source>
-      <translation type="unfinished"/>
+      <translation>De installatie van %1 is niet met succes voltooid.</translation>
     </message>
     <message>
       <location filename="../src/modules/finished/Config.cpp" line="152"/>
@@ -1003,12 +1007,12 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan.
     <message>
       <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="117"/>
       <source>Create new %1MiB partition on %3 (%2) with entries %4.</source>
-      <translation type="unfinished"/>
+      <translation>Maak nieuwe %1MiB partitie aan op %3 (%2) met onderdelen %4.</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="125"/>
       <source>Create new %1MiB partition on %3 (%2).</source>
-      <translation type="unfinished"/>
+      <translation>Maak nieuwe %1MiB partitie aan op %3 (%2).</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="132"/>
@@ -1018,12 +1022,12 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan.
     <message>
       <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="149"/>
       <source>Create new &lt;strong&gt;%1MiB&lt;/strong&gt; partition on &lt;strong&gt;%3&lt;/strong&gt; (%2) with entries &lt;em&gt;%4&lt;/em&gt;.</source>
-      <translation type="unfinished"/>
+      <translation>Maak een nieuwe &lt;strong&gt;%1MiB&lt;/strong&gt; partitie aan op &lt;strong&gt;%3&lt;/strong&gt; (%2) met onderdelen &lt;em&gt;%4&lt;/em&gt;.</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="157"/>
       <source>Create new &lt;strong&gt;%1MiB&lt;/strong&gt; partition on &lt;strong&gt;%3&lt;/strong&gt; (%2).</source>
-      <translation type="unfinished"/>
+      <translation>Maak een nieuwe &lt;strong&gt;%1MiB&lt;/strong&gt; partitie aan op &lt;strong&gt;%3&lt;/strong&gt; (%2).</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="164"/>
@@ -1108,13 +1112,13 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan.
     <message>
       <location filename="../src/modules/users/CreateUserJob.cpp" line="126"/>
       <source>Preserving home directory</source>
-      <translation type="unfinished"/>
+      <translation>Gebruikersmap wordt behouden</translation>
     </message>
     <message>
       <location filename="../src/modules/users/CreateUserJob.cpp" line="50"/>
       <location filename="../src/modules/users/CreateUserJob.cpp" line="143"/>
       <source>Creating user %1</source>
-      <translation type="unfinished"/>
+      <translation>Gebruiker %1 aanmaken</translation>
     </message>
     <message>
       <location filename="../src/modules/users/CreateUserJob.cpp" line="151"/>
@@ -1371,7 +1375,7 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan.
     <message>
       <location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="195"/>
       <source>Install %1 on &lt;strong&gt;new&lt;/strong&gt; %2 system partition with features &lt;em&gt;%3&lt;/em&gt;</source>
-      <translation type="unfinished"/>
+      <translation>Installeer %1 op &lt;strong&gt;nieuwe&lt;/strong&gt; %2 systeempartitie met features &lt;em&gt;%3&lt;/em&gt;</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="203"/>
@@ -1381,27 +1385,27 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan.
     <message>
       <location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="212"/>
       <source>Set up &lt;strong&gt;new&lt;/strong&gt; %2 partition with mount point &lt;strong&gt;%1&lt;/strong&gt; and features &lt;em&gt;%3&lt;/em&gt;.</source>
-      <translation type="unfinished"/>
+      <translation>&lt;strong&gt;Nieuwe&lt;/strong&gt; %2 partitie voorbereiden met aankoppelpunt &lt;strong&gt;%1&lt;/strong&gt; en features &lt;em&gt;%3&lt;/em&gt;.</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="220"/>
       <source>Set up &lt;strong&gt;new&lt;/strong&gt; %2 partition with mount point &lt;strong&gt;%1&lt;/strong&gt;%3.</source>
-      <translation type="unfinished"/>
+      <translation>Maak &lt;strong&gt;nieuwe&lt;/strong&gt; %2 partitie met aankoppelpunt &lt;strong&gt;%1&lt;/strong&gt;%3.</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="234"/>
       <source>Install %2 on %3 system partition &lt;strong&gt;%1&lt;/strong&gt; with features &lt;em&gt;%4&lt;/em&gt;.</source>
-      <translation type="unfinished"/>
+      <translation>Installeer %2 op %3 systeempartitie &lt;strong&gt;%1&lt;/strong&gt; met features &lt;em&gt;%4&lt;/em&gt;</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="253"/>
       <source>Set up %3 partition &lt;strong&gt;%1&lt;/strong&gt; with mount point &lt;strong&gt;%2&lt;/strong&gt; and features &lt;em&gt;%4&lt;/em&gt;.</source>
-      <translation type="unfinished"/>
+      <translation>Stel %3 partitie &lt;strong&gt;%1&lt;/strong&gt; in met aankoppelpunt &lt;strong&gt;%2&lt;/strong&gt; met features &lt;em&gt;%4&lt;/em&gt;.</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="262"/>
       <source>Set up %3 partition &lt;strong&gt;%1&lt;/strong&gt; with mount point &lt;strong&gt;%2&lt;/strong&gt;%4.</source>
-      <translation type="unfinished"/>
+      <translation>Stel %3 partitie &lt;strong&gt;%1&lt;/strong&gt; in met aankoppelpunt &lt;strong&gt;%2&lt;/strong&gt;%4.</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="243"/>
@@ -2146,9 +2150,9 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan.
     <message numerus="yes">
       <location filename="../src/modules/users/CheckPWQuality.cpp" line="232"/>
       <source>The password contains fewer than %n lowercase letters</source>
-      <translation type="unfinished">
+      <translation>
-        <numerusform/>
+        <numerusform>Het wachtwoord bevat minder dan %n kleine letters</numerusform>
-        <numerusform/>
+        <numerusform>Het wachtwoord bevat minder dan %n kleine letters</numerusform>
       </translation>
     </message>
     <message>
@@ -2184,70 +2188,70 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan.
     <message numerus="yes">
       <location filename="../src/modules/users/CheckPWQuality.cpp" line="218"/>
       <source>The password contains fewer than %n digits</source>
-      <translation type="unfinished">
+      <translation>
-        <numerusform/>
+        <numerusform>Het wachtwoord bevat minder dan %n getallen</numerusform>
-        <numerusform/>
+        <numerusform>Het wachtwoord bevat minder dan %n getallen</numerusform>
       </translation>
     </message>
     <message numerus="yes">
       <location filename="../src/modules/users/CheckPWQuality.cpp" line="225"/>
       <source>The password contains fewer than %n uppercase letters</source>
-      <translation type="unfinished">
+      <translation>
-        <numerusform/>
+        <numerusform>Het wachtwoord bevat minder dan %n hoofdletters</numerusform>
-        <numerusform/>
+        <numerusform>Het wachtwoord bevat minder dan %n hoofdletters</numerusform>
       </translation>
     </message>
     <message numerus="yes">
       <location filename="../src/modules/users/CheckPWQuality.cpp" line="239"/>
       <source>The password contains fewer than %n non-alphanumeric characters</source>
-      <translation type="unfinished">
+      <translation>
-        <numerusform/>
+        <numerusform>Het wachtwoord bevat minder dan %n niet-alfanumerieke symbolen.</numerusform>
-        <numerusform/>
+        <numerusform>Het wachtwoord bevat minder dan %n niet-alfanumerieke symbolen.</numerusform>
       </translation>
     </message>
     <message numerus="yes">
       <location filename="../src/modules/users/CheckPWQuality.cpp" line="246"/>
       <source>The password is shorter than %n characters</source>
-      <translation type="unfinished">
+      <translation>
-        <numerusform/>
+        <numerusform>Het wachtwoord is korter dan %n karakters</numerusform>
-        <numerusform/>
+        <numerusform>Het wachtwoord is korter dan %n karakters</numerusform>
       </translation>
     </message>
     <message>
       <location filename="../src/modules/users/CheckPWQuality.cpp" line="251"/>
       <source>The password is a rotated version of the previous one</source>
-      <translation type="unfinished"/>
+      <translation>Het wachtwoord is een omgedraaide versie van de oude</translation>
     </message>
     <message numerus="yes">
       <location filename="../src/modules/users/CheckPWQuality.cpp" line="255"/>
       <source>The password contains fewer than %n character classes</source>
-      <translation type="unfinished">
+      <translation>
-        <numerusform/>
+        <numerusform>Het wachtwoord bevat minder dan %n karaktergroepen</numerusform>
-        <numerusform/>
+        <numerusform>Het wachtwoord bevat minder dan %n karaktergroepen</numerusform>
       </translation>
     </message>
     <message numerus="yes">
       <location filename="../src/modules/users/CheckPWQuality.cpp" line="262"/>
       <source>The password contains more than %n same characters consecutively</source>
-      <translation type="unfinished">
+      <translation>
-        <numerusform/>
+        <numerusform>Het wachtwoord bevat meer dan %n dezelfde karakters na elkaar</numerusform>
-        <numerusform/>
+        <numerusform>Het wachtwoord bevat meer dan %n dezelfde karakters na elkaar</numerusform>
       </translation>
     </message>
     <message numerus="yes">
       <location filename="../src/modules/users/CheckPWQuality.cpp" line="269"/>
       <source>The password contains more than %n characters of the same class consecutively</source>
-      <translation type="unfinished">
+      <translation>
-        <numerusform/>
+        <numerusform>Het wachtwoord bevat meer dan %n dezelfde karakters van dezelfde groep na elkaar</numerusform>
-        <numerusform/>
+        <numerusform>Het wachtwoord bevat meer dan %n dezelfde karakters van dezelfde groep na elkaar</numerusform>
       </translation>
     </message>
     <message numerus="yes">
       <location filename="../src/modules/users/CheckPWQuality.cpp" line="280"/>
       <source>The password contains monotonic sequence longer than %n characters</source>
-      <translation type="unfinished">
+      <translation>
-        <numerusform/>
+        <numerusform>Het wachtwoord bevat een monotone sequentie van meer dan %n karakters</numerusform>
-        <numerusform/>
+        <numerusform>Het wachtwoord bevat een monotone sequentie van meer dan %n karakters</numerusform>
       </translation>
     </message>
     <message>
@@ -2966,7 +2970,7 @@ Uitvoer:
     <message>
       <location filename="../src/modules/machineid/MachineIdJob.cpp" line="83"/>
       <source>Directory not found</source>
-      <translation type="unfinished"/>
+      <translation>Map niet gevonden</translation>
     </message>
     <message>
       <location filename="../src/modules/machineid/MachineIdJob.cpp" line="84"/>
@@ -3530,12 +3534,12 @@ De installatie kan niet doorgaan.</translation>
       <location filename="../src/modules/users/MiscJobs.cpp" line="178"/>
       <location filename="../src/modules/users/MiscJobs.cpp" line="183"/>
       <source>Could not create groups in target system</source>
-      <translation type="unfinished"/>
+      <translation>Kan groepen niet creëren in doelsysteem.</translation>
     </message>
     <message>
       <location filename="../src/modules/users/MiscJobs.cpp" line="184"/>
       <source>These groups are missing in the target system: %1</source>
-      <translation type="unfinished"/>
+      <translation>Deze groepen bestaan niet in het doelsysteem: %1</translation>
     </message>
   </context>
   <context>
@@ -3543,7 +3547,7 @@ De installatie kan niet doorgaan.</translation>
     <message>
       <location filename="../src/modules/users/MiscJobs.cpp" line="33"/>
       <source>Configure &lt;pre&gt;sudo&lt;/pre&gt; users.</source>
-      <translation type="unfinished"/>
+      <translation>Configureer &lt;pre&gt;sudo&lt;/pre&gt; (administratie) gebruikers.</translation>
     </message>
     <message>
       <location filename="../src/modules/users/MiscJobs.cpp" line="55"/>
@@ -3954,7 +3958,7 @@ De installatie kan niet doorgaan.</translation>
                         development is sponsored by &lt;br/&gt;
                         &lt;a href='http://www.blue-systems.com/'&gt;Blue Systems&lt;/a&gt; -
                         Liberating Software.</source>
-      <translation type="unfinished"/>
+      <translation>&lt;h1&gt;%1&lt;/h1&gt;&lt;br/&gt;&lt;strong&gt;%2&lt;br/&gt;voor %3&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;Copyright 2014-2017 Teo Mrnjavac &amp;lt;teo@kde.org&amp;gt;&lt;br/&gt;Copyright 2017-2020 Adriaan de Groot &amp;lt;groot@kde.org&amp;gt;&lt;br/&gt; Met dank aan &lt;a href="https://calamares.io/team/"&gt;het Calamares team&lt;/a&gt; en &lt;a href="https://www.transifex.com/calamares/calamares/"&gt;het  Calamares vertaalteam&lt;/a&gt;.&lt;br/&gt;&lt;br/&gt;&lt;a href="https://calamares.io/"&gt;Calamares&lt;/a&gt; ontwikkeling gesponsord door &lt;br/&gt;&lt;a href="http://www.blue-systems.com/"&gt;Blue Systems&lt;/a&gt; - Liberating Software.</translation>
     </message>
     <message>
       <location filename="../src/modules/welcomeq/about.qml" line="96"/>
@@ -3975,29 +3979,31 @@ De installatie kan niet doorgaan.</translation>
     <message>
       <location filename="../src/modules/finishedq/finishedq.qml" line="36"/>
       <source>Installation Completed</source>
-      <translation type="unfinished"/>
+      <translation>Installatie Voltooid</translation>
     </message>
     <message>
       <location filename="../src/modules/finishedq/finishedq.qml" line="43"/>
       <source>%1 has been installed on your computer.&lt;br/&gt;
             You may now restart into your new system, or continue using the Live environment.</source>
-      <translation type="unfinished"/>
+      <translation>%1 is geïnstalleerd op je computer.&lt;br/&gt;
+Je mag nu opnieuw opstarten in je systeem, of de Live-omgeving blijven gebruiken.</translation>
     </message>
     <message>
       <location filename="../src/modules/finishedq/finishedq.qml" line="65"/>
       <source>Close Installer</source>
-      <translation type="unfinished"/>
+      <translation>Sluit Installatieprogramma</translation>
     </message>
     <message>
       <location filename="../src/modules/finishedq/finishedq.qml" line="71"/>
       <source>Restart System</source>
-      <translation type="unfinished"/>
+      <translation>Herstart Systeem</translation>
     </message>
     <message>
       <location filename="../src/modules/finishedq/finishedq.qml" line="89"/>
       <source>&lt;p&gt;A full log of the install is available as installation.log in the home directory of the Live user.&lt;br/&gt;
             This log is copied to /var/log/installation.log of the target system.&lt;/p&gt;</source>
-      <translation type="unfinished"/>
+      <translation>&lt;p&gt;Een logboek van de installatie is beschikbaar als installation.log in de gebruikersmap van de Live gebruiker&lt;br/&gt;
+Dit logboek is ook gekopieerd naar /var/log/installation.log van het doelsysteem.&lt;/p&gt;</translation>
     </message>
   </context>
   <context>
@@ -4042,7 +4048,7 @@ De systeemstijdinstellingen beïnvloeden de cijfer- en datumsformaat. De huidige
     <message>
       <location filename="../src/modules/keyboardq/keyboardq.qml" line="60"/>
       <source>Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.</source>
-      <translation type="unfinished"/>
+      <translation>Kies je voorkeurstoetsenbordmodel om lay-out en variant te selecteren, of gebruik het standaardmodel op de gedetecteerde hardware.</translation>
     </message>
     <message>
       <location filename="../src/modules/keyboardq/keyboardq.qml" line="253"/>
@@ -4057,7 +4063,7 @@ De systeemstijdinstellingen beïnvloeden de cijfer- en datumsformaat. De huidige
     <message>
       <location filename="../src/modules/keyboardq/keyboardq.qml" line="276"/>
       <source>Keyboard Variant</source>
-      <translation type="unfinished"/>
+      <translation>Toetsenbord Variant</translation>
     </message>
     <message>
       <location filename="../src/modules/keyboardq/keyboardq.qml" line="386"/>
@@ -4140,7 +4146,7 @@ De systeemstijdinstellingen beïnvloeden de cijfer- en datumsformaat. De huidige
     <message>
       <location filename="../src/modules/usersq/usersq.qml" line="36"/>
       <source>Pick your user name and credentials to login and perform admin tasks</source>
-      <translation type="unfinished"/>
+      <translation>Kies je gebruikersnaam en wachtwoord om in te loggen en administratieve taken uit te voeren</translation>
     </message>
     <message>
       <location filename="../src/modules/usersq/usersq.qml" line="52"/>
@@ -4160,12 +4166,12 @@ De systeemstijdinstellingen beïnvloeden de cijfer- en datumsformaat. De huidige
     <message>
       <location filename="../src/modules/usersq/usersq.qml" line="90"/>
       <source>Login Name</source>
-      <translation type="unfinished"/>
+      <translation>Inlognaam</translation>
     </message>
     <message>
       <location filename="../src/modules/usersq/usersq.qml" line="106"/>
       <source>If more than one person will use this computer, you can create multiple accounts after installation.</source>
-      <translation type="unfinished"/>
+      <translation>Als meer dan één persoon deze computer zal gebruiken, kan je meerdere accounts aanmaken na installatie.</translation>
     </message>
     <message>
       <location filename="../src/modules/usersq/usersq.qml" line="121"/>
@@ -4180,7 +4186,7 @@ De systeemstijdinstellingen beïnvloeden de cijfer- en datumsformaat. De huidige
     <message>
       <location filename="../src/modules/usersq/usersq.qml" line="144"/>
       <source>This name will be used if you make the computer visible to others on a network.</source>
-      <translation type="unfinished"/>
+      <translation>Deze naam zal worden gebruikt als u de computer zichtbaar maakt voor anderen op een netwerk.</translation>
     </message>
     <message>
       <location filename="../src/modules/usersq/usersq.qml" line="159"/>
@@ -4200,12 +4206,12 @@ De systeemstijdinstellingen beïnvloeden de cijfer- en datumsformaat. De huidige
     <message>
       <location filename="../src/modules/usersq/usersq.qml" line="212"/>
       <source>Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.</source>
-      <translation type="unfinished"/>
+      <translation>Voer hetzelfde wachtwoord twee keer in, zodat het gecontroleerd kan worden op tikfouten. Een goed wachtwoord bevat een combinatie van letters, cijfers en leestekens, is ten minste acht tekens lang, en zou regelmatig moeten worden gewijzigd.</translation>
     </message>
     <message>
       <location filename="../src/modules/usersq/usersq.qml" line="223"/>
       <source>Validate passwords quality</source>
-      <translation type="unfinished"/>
+      <translation>Controleer wachtwoorden op gelijkheid</translation>
     </message>
     <message>
       <location filename="../src/modules/usersq/usersq.qml" line="231"/>
@@ -4215,12 +4221,12 @@ De systeemstijdinstellingen beïnvloeden de cijfer- en datumsformaat. De huidige
     <message>
       <location filename="../src/modules/usersq/usersq.qml" line="238"/>
       <source>Log in automatically without asking for the password</source>
-      <translation type="unfinished"/>
+      <translation>Automatisch aanmelden zonder wachtwoord te vragen</translation>
     </message>
     <message>
       <location filename="../src/modules/usersq/usersq.qml" line="246"/>
       <source>Reuse user password as root password</source>
-      <translation type="unfinished"/>
+      <translation>Hergebruik gebruikerswachtwoord als root (administratie) wachtwoord.</translation>
     </message>
     <message>
       <location filename="../src/modules/usersq/usersq.qml" line="254"/>
@@ -4230,22 +4236,22 @@ De systeemstijdinstellingen beïnvloeden de cijfer- en datumsformaat. De huidige
     <message>
       <location filename="../src/modules/usersq/usersq.qml" line="269"/>
       <source>Choose a root password to keep your account safe.</source>
-      <translation type="unfinished"/>
+      <translation>Kies een root (administratie) wachtwoord om je account veilig te houden.</translation>
     </message>
     <message>
       <location filename="../src/modules/usersq/usersq.qml" line="280"/>
       <source>Root Password</source>
-      <translation type="unfinished"/>
+      <translation>Root (Administratie) Wachtwoord</translation>
     </message>
     <message>
       <location filename="../src/modules/usersq/usersq.qml" line="301"/>
       <source>Repeat Root Password</source>
-      <translation type="unfinished"/>
+      <translation>Herhaal Root Wachtwoord</translation>
     </message>
     <message>
       <location filename="../src/modules/usersq/usersq.qml" line="323"/>
       <source>Enter the same password twice, so that it can be checked for typing errors.</source>
-      <translation type="unfinished"/>
+      <translation>Voer hetzelfde wachtwoord twee keer in, zodat het gecontroleerd kan worden op tikfouten.</translation>
     </message>
   </context>
   <context>

lang/python/es_MX/LC_MESSAGES/python.po

@@ -6,6 +6,7 @@
 # Translators:
 # guillermo pacheco <guillopacheco@gmail.com>, 2018
 # Logan 8192 <logan8192@protonmail.com>, 2018
+# Erland Huaman <blackadress.01@gmail.com>, 2021
 # 
 #, fuzzy
 msgid ""
@@ -14,7 +15,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-03-19 14:27+0100\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
-"Last-Translator: Logan 8192 <logan8192@protonmail.com>, 2018\n"
+"Last-Translator: Erland Huaman <blackadress.01@gmail.com>, 2021\n"
 "Language-Team: Spanish (Mexico) (https://www.transifex.com/calamares/teams/20061/es_MX/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,11 +25,11 @@ msgstr ""
 
 #: src/modules/grubcfg/main.py:28
 msgid "Configure GRUB."
-msgstr ""
+msgstr "Configura GRUB."
 
 #: src/modules/mount/main.py:30
 msgid "Mounting partitions."
-msgstr ""
+msgstr "Montando particiones."
 
 #: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198
 #: src/modules/initcpiocfg/main.py:202
@@ -40,51 +41,56 @@ msgstr ""
 #: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135
 #: src/modules/networkcfg/main.py:39
 msgid "Configuration Error"
-msgstr ""
+msgstr "Error de configuración"
 
 #: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199
 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
 #: src/modules/fstab/main.py:356
 msgid "No partitions are defined for <pre>{!s}</pre> to use."
-msgstr ""
+msgstr "No hay particiones definidas para que <pre>{!s}</pre> use."
 
 #: src/modules/services-systemd/main.py:26
 msgid "Configure systemd services"
-msgstr ""
+msgstr "Configura los servicios de systemd"
 
 #: src/modules/services-systemd/main.py:59
 #: src/modules/services-openrc/main.py:93
 msgid "Cannot modify service"
-msgstr ""
+msgstr "No se puede modificar el servicio."
 
 #: src/modules/services-systemd/main.py:60
 msgid ""
 "<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
 msgstr ""
+"La llamada de: <code>systemctl {arg!s}</code> en chroot retorna código de "
+"error {num!s}."
 
 #: src/modules/services-systemd/main.py:63
 #: src/modules/services-systemd/main.py:67
 msgid "Cannot enable systemd service <code>{name!s}</code>."
-msgstr ""
+msgstr "No se puede habilitar el servicio <code>{name!s}</code> de systemd."
 
 #: src/modules/services-systemd/main.py:65
 msgid "Cannot enable systemd target <code>{name!s}</code>."
-msgstr ""
+msgstr "No se puede habilitar el objetivo <code>{name!s}</code> de systemd."
 
 #: src/modules/services-systemd/main.py:69
 msgid "Cannot disable systemd target <code>{name!s}</code>."
 msgstr ""
+"No se puede deshabilitar el objetivo <code>{name!s}</code> de systemd."
 
 #: src/modules/services-systemd/main.py:71
 msgid "Cannot mask systemd unit <code>{name!s}</code>."
-msgstr ""
+msgstr "No se puede enmascarar la unidad <code>{name!s}</code> de systemd."
 
 #: src/modules/services-systemd/main.py:73
 msgid ""
 "Unknown systemd commands <code>{command!s}</code> and "
 "<code>{suffix!s}</code> for unit {name!s}."
 msgstr ""
+"systemd no reconoce los comandos <code>{command!s}</code> y "
+"<code>{suffix!s}</code>para la unidad {name!s}."
 
 #: src/modules/umount/main.py:31
 msgid "Unmount file systems."
@@ -92,62 +98,67 @@ msgstr "Desmontar sistemas de archivo."
 
 #: src/modules/unpackfs/main.py:35
 msgid "Filling up filesystems."
-msgstr ""
+msgstr "Llenando sistema de archivos."
 
 #: src/modules/unpackfs/main.py:255
 msgid "rsync failed with error code {}."
-msgstr ""
+msgstr "rsync falló con código de error {}."
 
 #: src/modules/unpackfs/main.py:300
 msgid "Unpacking image {}/{}, file {}/{}"
-msgstr ""
+msgstr "Desempaquetando imagen {}/{}, archivo {}/{}"
 
 #: src/modules/unpackfs/main.py:315
 msgid "Starting to unpack {}"
-msgstr ""
+msgstr "Iniciando a desempaquetar {}"
 
 #: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
 msgid "Failed to unpack image \"{}\""
-msgstr ""
+msgstr "Se falló en la desempaquetización de la imagen \"{}\""
 
 #: src/modules/unpackfs/main.py:431
 msgid "No mount point for root partition"
-msgstr ""
+msgstr "No existe punto de montaje para la partición raíz"
 
 #: src/modules/unpackfs/main.py:432
 msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
+"el globalstorage no contiene una llave \"rootMountPoint\", no se hace nada"
 
 #: src/modules/unpackfs/main.py:437
 msgid "Bad mount point for root partition"
-msgstr ""
+msgstr "Mal punto de montaje para la partición raíz"
 
 #: src/modules/unpackfs/main.py:438
 msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr ""
+msgstr "rootMountPoint es \"{}\", el cual no existe, no se hace nada"
 
 #: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
 #: src/modules/unpackfs/main.py:478
 msgid "Bad unsquash configuration"
-msgstr ""
+msgstr "Mala configuración del paquete unsquash"
 
 #: src/modules/unpackfs/main.py:455
 msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
+"Tu kernel actual no tiene soporte para el sistema de archivos para \"{}\" "
+"({})"
 
 #: src/modules/unpackfs/main.py:459
 msgid "The source filesystem \"{}\" does not exist"
-msgstr ""
+msgstr "El sistema de archivos fuente \"{}\" no existe"
 
 #: src/modules/unpackfs/main.py:465
 msgid ""
 "Failed to find unsquashfs, make sure you have the squashfs-tools package "
 "installed"
 msgstr ""
+"Falla buscando unsquashfs, asegúrate de tener el paquete squashfs-tools "
+"instalado"
 
 #: src/modules/unpackfs/main.py:479
 msgid "The destination \"{}\" in the target system is not a directory"
-msgstr ""
+msgstr "El destino \"{}\" en el sistema objetivo no es un directorio"
 
 #: src/modules/displaymanager/main.py:514
 msgid "Cannot write KDM configuration file"
@@ -179,7 +190,7 @@ msgstr "No se puede configurar LightDM"
 
 #: src/modules/displaymanager/main.py:736
 msgid "No LightDM greeter installed."
-msgstr ""
+msgstr "LightDM greeter no está instalado."
 
 #: src/modules/displaymanager/main.py:767
 msgid "Cannot write SLIM configuration file"
@@ -191,21 +202,23 @@ msgstr ""
 
 #: src/modules/displaymanager/main.py:894
 msgid "No display managers selected for the displaymanager module."
-msgstr ""
+msgstr "No se seleccionaron gestores para el módulo de gestor de pantalla."
 
 #: src/modules/displaymanager/main.py:895
 msgid ""
 "The displaymanagers list is empty or undefined in both globalstorage and "
 "displaymanager.conf."
 msgstr ""
+"La lista de gestores de pantalla está vacía o indefinida tanto en el "
+"globalstorage como en el displaymanager.conf."
 
 #: src/modules/displaymanager/main.py:977
 msgid "Display manager configuration was incomplete"
-msgstr ""
+msgstr "La configuración del gestor de pantalla estaba incompleta"
 
 #: src/modules/initcpiocfg/main.py:28
 msgid "Configuring mkinitcpio."
-msgstr ""
+msgstr "Configurando mkinitcpio"
 
 #: src/modules/initcpiocfg/main.py:203
 #: src/modules/luksopenswaphookcfg/main.py:91
@@ -217,15 +230,15 @@ msgstr ""
 
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
-msgstr ""
+msgstr "Configurando la swap encriptada."
 
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
-msgstr ""
+msgstr "Instalando data."
 
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
-msgstr ""
+msgstr "Configura los servicios de OpenRC"
 
 #: src/modules/services-openrc/main.py:57
 msgid "Cannot add service {name!s} to run-level {level!s}."
@@ -248,7 +261,7 @@ msgstr ""
 
 #: src/modules/services-openrc/main.py:101
 msgid "Target runlevel does not exist"
-msgstr ""
+msgstr "El nivel de ejecución del objetivo no existe"
 
 #: src/modules/services-openrc/main.py:102
 msgid ""
@@ -258,7 +271,7 @@ msgstr ""
 
 #: src/modules/services-openrc/main.py:110
 msgid "Target service does not exist"
-msgstr ""
+msgstr "El servicio objetivo no existe"
 
 #: src/modules/services-openrc/main.py:111
 msgid ""
@@ -268,7 +281,7 @@ msgstr ""
 
 #: src/modules/plymouthcfg/main.py:27
 msgid "Configure Plymouth theme"
-msgstr ""
+msgstr "Configurando el tema de Plymouth"
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
 #: src/modules/packages/main.py:69
@@ -296,43 +309,43 @@ msgstr[1] "Removiendo %(num)dpaquetes."
 
 #: src/modules/bootloader/main.py:43
 msgid "Install bootloader."
-msgstr ""
+msgstr "Instalar el cargador de arranque."
 
 #: src/modules/hwclock/main.py:26
 msgid "Setting hardware clock."
-msgstr ""
+msgstr "Configurando el reloj del hardware."
 
 #: src/modules/mkinitfs/main.py:27
 msgid "Creating initramfs with mkinitfs."
-msgstr ""
+msgstr "Creando initramfs con mkinitfs."
 
 #: src/modules/mkinitfs/main.py:49
 msgid "Failed to run mkinitfs on the target"
-msgstr ""
+msgstr "Se falló al intentar correr mkinitfs en el objetivo"
 
 #: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
 msgid "The exit code was {}"
-msgstr ""
+msgstr "El código de salida fue {}"
 
 #: src/modules/dracut/main.py:27
 msgid "Creating initramfs with dracut."
-msgstr ""
+msgstr "Creando initramfs con dracut"
 
 #: src/modules/dracut/main.py:49
 msgid "Failed to run dracut on the target"
-msgstr ""
+msgstr "Se falló al intentar correr dracut en el objetivo"
 
 #: src/modules/initramfscfg/main.py:32
 msgid "Configuring initramfs."
-msgstr ""
+msgstr "Configurando initramfs."
 
 #: src/modules/openrcdmcryptcfg/main.py:26
 msgid "Configuring OpenRC dmcrypt service."
-msgstr ""
+msgstr "Configurando el servicio OpenRc dmcrypt."
 
 #: src/modules/fstab/main.py:29
 msgid "Writing fstab."
-msgstr ""
+msgstr "Escribiento fstab."
 
 #: src/modules/dummypython/main.py:35
 msgid "Dummy python job."
@@ -345,8 +358,8 @@ msgstr "Paso python ficticio {}"
 
 #: src/modules/localecfg/main.py:30
 msgid "Configuring locales."
-msgstr ""
+msgstr "Configurando locales."
 
 #: src/modules/networkcfg/main.py:28
 msgid "Saving network configuration."
-msgstr ""
+msgstr "Guardando configuración de red."

lang/python/es_PE/LC_MESSAGES/python.po

@@ -0,0 +1,347 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-03-19 14:27+0100\n"
+"PO-Revision-Date: 2017-08-09 10:34+0000\n"
+"Language-Team: Spanish (Peru) (https://www.transifex.com/calamares/teams/20061/es_PE/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_PE\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr ""
+
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr ""
+
+#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198
+#: src/modules/initcpiocfg/main.py:202
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135
+#: src/modules/networkcfg/main.py:39
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for <pre>{!s}</pre> to use."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr ""
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr ""
+
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service <code>{name!s}</code>."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target <code>{name!s}</code>."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target <code>{name!s}</code>."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit <code>{name!s}</code>."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands <code>{command!s}</code> and "
+"<code>{suffix!s}</code> for unit {name!s}."
+msgstr ""
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr ""
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:514
+msgid "Cannot write KDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:515
+msgid "KDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:576
+msgid "Cannot write LXDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:577
+msgid "LXDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:660
+msgid "Cannot write LightDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:661
+msgid "LightDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:735
+msgid "Cannot configure LightDM"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:736
+msgid "No LightDM greeter installed."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:767
+msgid "Cannot write SLIM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:768
+msgid "SLIM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:894
+msgid "No display managers selected for the displaymanager module."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:895
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:977
+msgid "Display manager configuration was incomplete"
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:203
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:40
+msgid "No root mount point is given for <pre>{!s}</pre> to use."
+msgstr ""
+
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr ""
+
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action <code>{arg!s}</code> for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"<code>rc-update {arg!s}</code> call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is <code>{path!s}</code>, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is <code>{path!s}</code>, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr ""
+
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr ""
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr ""
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr ""
+
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr ""
+
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr ""
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr ""
+
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr ""
+
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr ""
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr ""
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr ""
+
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr ""
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr ""

lang/python/he/LC_MESSAGES/python.po

@@ -5,7 +5,7 @@
 # 
 # Translators:
 # Eli Shleifer <eligator@gmail.com>, 2017
-# Omeritzics Games <omeritzicschwartz@gmail.com>, 2020
+# Omer I.S. <omeritzicschwartz@gmail.com>, 2020
 # Yaron Shahrabani <sh.yaron@gmail.com>, 2020
 # 
 #, fuzzy

lang/python/pl/LC_MESSAGES/python.po

@@ -7,6 +7,7 @@
 # Marcin Mikołajczak <me@mkljczk.pl>, 2017
 # KagiSame, 2018
 # Piotr Strębski <strebski@gmail.com>, 2020
+# Jacob B. <brickminerplyt@gmail.com>, 2021
 # 
 #, fuzzy
 msgid ""
@@ -15,7 +16,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-03-19 14:27+0100\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
-"Last-Translator: Piotr Strębski <strebski@gmail.com>, 2020\n"
+"Last-Translator: Jacob B. <brickminerplyt@gmail.com>, 2021\n"
 "Language-Team: Polish (https://www.transifex.com/calamares/teams/20061/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -48,7 +49,7 @@ msgstr "Błąd konfiguracji"
 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
 #: src/modules/fstab/main.py:356
 msgid "No partitions are defined for <pre>{!s}</pre> to use."
-msgstr ""
+msgstr "Nie ma zdefiniowanych partycji dla <pre>{!s}</pre> do użytku."
 
 #: src/modules/services-systemd/main.py:26
 msgid "Configure systemd services"
@@ -63,29 +64,32 @@ msgstr "Nie można zmodyfikować usług"
 msgid ""
 "<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
 msgstr ""
+"Wezwanie <code>systemctl {arg!s}</code> w chroot zwróciło kod błędu {num!s}."
 
 #: src/modules/services-systemd/main.py:63
 #: src/modules/services-systemd/main.py:67
 msgid "Cannot enable systemd service <code>{name!s}</code>."
-msgstr ""
+msgstr "Nie można włączyć usługi systemd <code>{name!s}</code>."
 
 #: src/modules/services-systemd/main.py:65
 msgid "Cannot enable systemd target <code>{name!s}</code>."
-msgstr ""
+msgstr "Nie można włączyć celu w systemd <code>{name!s}</code>."
 
 #: src/modules/services-systemd/main.py:69
 msgid "Cannot disable systemd target <code>{name!s}</code>."
-msgstr ""
+msgstr "Nie można wyłączyć celu w systemd <code>{name!s}</code>."
 
 #: src/modules/services-systemd/main.py:71
 msgid "Cannot mask systemd unit <code>{name!s}</code>."
-msgstr ""
+msgstr "Nie można zamaskować jednostki systemd <code>{name!s}</code>."
 
 #: src/modules/services-systemd/main.py:73
 msgid ""
 "Unknown systemd commands <code>{command!s}</code> and "
 "<code>{suffix!s}</code> for unit {name!s}."
 msgstr ""
+"Nieznana komenda systemd <code>{command!s}</code> oraz "
+"<code>{suffix!s}</code> dla jednostki {name!s}."
 
 #: src/modules/umount/main.py:31
 msgid "Unmount file systems."
@@ -101,11 +105,11 @@ msgstr "rsync zakończyło działanie kodem błędu {}."
 
 #: src/modules/unpackfs/main.py:300
 msgid "Unpacking image {}/{}, file {}/{}"
-msgstr ""
+msgstr "Odpakowywanie obrazu {}/{}, pliku {}/{}"
 
 #: src/modules/unpackfs/main.py:315
 msgid "Starting to unpack {}"
-msgstr ""
+msgstr "Rozpoczynanie odpakowywania {}"
 
 #: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
 msgid "Failed to unpack image \"{}\""
@@ -139,6 +143,8 @@ msgstr "Błędna konfiguracja unsquash"
 #: src/modules/unpackfs/main.py:455
 msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
+"System plików dla \"{}\" ({}) nie jest wspierany przez obecne jądro twojego "
+"systemu"
 
 #: src/modules/unpackfs/main.py:459
 msgid "The source filesystem \"{}\" does not exist"
@@ -205,6 +211,8 @@ msgid ""
 "The displaymanagers list is empty or undefined in both globalstorage and "
 "displaymanager.conf."
 msgstr ""
+"Lista displaymanagers jest pusta lub niezdefiniowana w globalstorage oraz "
+"displaymanager.conf."
 
 #: src/modules/displaymanager/main.py:977
 msgid "Display manager configuration was incomplete"
@@ -221,6 +229,7 @@ msgstr "Konfigurowanie mkinitcpio."
 #: src/modules/networkcfg/main.py:40
 msgid "No root mount point is given for <pre>{!s}</pre> to use."
 msgstr ""
+"Nie znaleziono głównego punktu montowania dla <pre>{!s}</pre> do użycia."
 
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
@@ -237,31 +246,38 @@ msgstr "Konfiguracja usług OpenRC"
 #: src/modules/services-openrc/main.py:57
 msgid "Cannot add service {name!s} to run-level {level!s}."
 msgstr ""
+"Nie udało się dodać usługi {name!s} do poziomu-uruchamiania {level!s}."
 
 #: src/modules/services-openrc/main.py:59
 msgid "Cannot remove service {name!s} from run-level {level!s}."
 msgstr ""
+"Nie udało się usunąć usługi {name!s} do poziomu-uruchamiania {level!s}."
 
 #: src/modules/services-openrc/main.py:61
 msgid ""
 "Unknown service-action <code>{arg!s}</code> for service {name!s} in run-"
 "level {level!s}."
 msgstr ""
+"Nieznana akcja-usługi <code>{arg!s}</code> dla usługi {name!s} w poziomie-"
+"uruchamiania {level!s}."
 
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "<code>rc-update {arg!s}</code> call in chroot returned error code {num!s}."
 msgstr ""
+"<code>rc-update {arg!s}</code> wezwanie w chroot zwróciło kod błędu {num!s}."
 
 #: src/modules/services-openrc/main.py:101
 msgid "Target runlevel does not exist"
-msgstr ""
+msgstr "Docelowy poziom odtwarzania nie istnieje"
 
 #: src/modules/services-openrc/main.py:102
 msgid ""
 "The path for runlevel {level!s} is <code>{path!s}</code>, which does not "
 "exist."
 msgstr ""
+"Ścieżka do poziomu odtwarzania {level!s} to <code>{path!s}</code>,  nie "
+"istnieje."
 
 #: src/modules/services-openrc/main.py:110
 msgid "Target service does not exist"
@@ -271,7 +287,7 @@ msgstr "Docelowa usługa nie istnieje"
 msgid ""
 "The path for service {name!s} is <code>{path!s}</code>, which does not "
 "exist."
-msgstr ""
+msgstr "Ścieżka do usługi {name!s} to <code>{path!s}</code>,  nie istnieje."
 
 #: src/modules/plymouthcfg/main.py:27
 msgid "Configure Plymouth theme"
@@ -315,15 +331,15 @@ msgstr "Ustawianie zegara systemowego."
 
 #: src/modules/mkinitfs/main.py:27
 msgid "Creating initramfs with mkinitfs."
-msgstr ""
+msgstr "Tworzenie initramfs z mkinitfs."
 
 #: src/modules/mkinitfs/main.py:49
 msgid "Failed to run mkinitfs on the target"
-msgstr ""
+msgstr "Nie udało się włączyć mkinitfs."
 
 #: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
 msgid "The exit code was {}"
-msgstr ""
+msgstr "Kod wyjściowy to {}"
 
 #: src/modules/dracut/main.py:27
 msgid "Creating initramfs with dracut."
@@ -331,7 +347,7 @@ msgstr "Tworzenie initramfs z dracut."
 
 #: src/modules/dracut/main.py:49
 msgid "Failed to run dracut on the target"
-msgstr ""
+msgstr "Nie udało się włączyć dracut."
 
 #: src/modules/initramfscfg/main.py:32
 msgid "Configuring initramfs."
@@ -339,7 +355,7 @@ msgstr "Konfigurowanie initramfs."
 
 #: src/modules/openrcdmcryptcfg/main.py:26
 msgid "Configuring OpenRC dmcrypt service."
-msgstr ""
+msgstr "Konfigurowanie usługi OpenRC dmcrypt."
 
 #: src/modules/fstab/main.py:29
 msgid "Writing fstab."

src/libcalamares/utils/Logger.cpp

@@ -33,7 +33,7 @@ static unsigned int s_threshold =
 #ifdef QT_NO_DEBUG
     Logger::LOG_DISABLE;
 #else
-    Logger::LOGEXTRA + 1;  // Comparison is < in log() function
+    Logger::LOGDEBUG;  // Comparison is < in log() function
 #endif
 static QMutex s_mutex;
 
@@ -69,7 +69,7 @@ logLevel()
 static void
 log( const char* msg, unsigned int debugLevel, bool withTime = true )
 {
-    if ( true )
+    if ( logLevelEnabled( debugLevel ) )
     {
         QMutexLocker lock( &s_mutex );
 
@@ -81,11 +81,7 @@ log( const char* msg, unsigned int debugLevel, bool withTime = true )
                 << QString::number( debugLevel ).toUtf8().data() << "]: " << msg << std::endl;
 
         logfile.flush();
-    }
 
-    if ( logLevelEnabled( debugLevel ) )
-    {
-        QMutexLocker lock( &s_mutex );
         if ( withTime )
         {
             std::cout << QTime::currentTime().toString().toUtf8().data() << " ["
@@ -105,20 +101,21 @@ CalamaresLogHandler( QtMsgType type, const QMessageLogContext&, const QString& m
     const char* message = ba.constData();
 
     QMutexLocker locker( &s_mutex );
+
     switch ( type )
     {
-    case QtDebugMsg:
+    case QtInfoMsg:
         log( message, LOGVERBOSE );
         break;
-
+    case QtDebugMsg:
-    case QtInfoMsg:
+        log( message, LOGDEBUG );
-        log( message, 1 );
         break;
-
-    case QtCriticalMsg:
     case QtWarningMsg:
+        log( message, LOGWARNING );
+        break;
+    case QtCriticalMsg:
     case QtFatalMsg:
-        log( message, 0 );
+        log( message, LOGERROR );
         break;
     }
 }

src/libcalamares/utils/Logger.h

@@ -47,8 +47,6 @@ enum
     LOG_DISABLE = 0,
     LOGERROR = 1,
     LOGWARNING = 2,
-    LOGINFO = 3,
-    LOGEXTRA = 5,
     LOGDEBUG = 6,
     LOGVERBOSE = 8
 };
@@ -60,7 +58,7 @@ public:
     virtual ~CDebug();
 
     friend CDebug& operator<<( CDebug&&, const FuncSuppressor& );
-    friend CDebug& operator<<( CDebug&&, Once& );
+    friend CDebug& operator<<( CDebug&&, const Once& );
 
 private:
     QString m_msg;
@@ -308,14 +306,14 @@ public:
         : m( true )
     {
     }
-    friend CDebug& operator<<( CDebug&&, Once& );
+    friend CDebug& operator<<( CDebug&&, const Once& );
 
 private:
-    bool m = false;
+    mutable bool m = false;
 };
 
 inline CDebug&
-operator<<( CDebug&& s, Once& o )
+operator<<( CDebug&& s, const Once& o )
 {
     if ( o.m )
     {

src/modules/localeq/Offline.qml

@@ -1,6 +1,6 @@
 /* === This file is part of Calamares - <https://calamares.io> ===
  *
- *   SPDX-FileCopyrightText: 2020 Anke Boersma <demm@kaosx.us>
+ *   SPDX-FileCopyrightText: 2020-2021 Anke Boersma <demm@kaosx.us>
  *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Calamares is Free Software: see the License-Identifier above.
@@ -21,6 +21,10 @@ Page {
     width: 800 //parent.width
     height: 500
 
+    id: control
+    property string currentRegion
+    property string currentZone
+
      StackView {
         id: stack
         anchors.fill: parent
@@ -34,7 +38,7 @@ Page {
                 anchors.horizontalCenter: parent.horizontalCenter
                 color: Kirigami.Theme.textColor
                 horizontalAlignment: Text.AlignCenter
-                text: qsTr("Select your preferred Region, or use the default one based on your current location.")
+                text: qsTr("Select your preferred Region, or use the default settings.")
             }
 
             ListView {
@@ -45,7 +49,7 @@ Page {
                 }
 
                 width: parent.width / 2
-                height: 250
+                height: parent.height / 1.5
                 anchors.centerIn: parent
                 anchors.verticalCenterOffset: -30
                 focus: true
@@ -62,20 +66,19 @@ Page {
                     opacity: 0.7
                 }
 
-                // model loads, dozens of variations tried for currentIndex all fail
                 model: config.regionModel
-                currentIndex: config.currentIndex
+                currentIndex: -1
                 delegate: ItemDelegate {
-                    
+
                     hoverEnabled: true
                     width: parent.width
                     highlighted: ListView.isCurrentItem
 
                     Label {
 
-                        text: name
+                        text: model.name
-                        Layout.fillHeight: true
+                        horizontalAlignment: Text.AlignHCenter
-                        Layout.fillWidth: true
+                        verticalAlignment: Text.AlignVCenter
                         width: parent.width
                         height: 30
                         color: highlighted ? Kirigami.Theme.highlightedTextColor : Kirigami.Theme.textColor
@@ -89,8 +92,9 @@ Page {
 
                     onClicked: {
 
-                        list.model.currentIndex = index
+                        list.currentIndex = index
-                        // correct to use config.currentTimezoneName when index is updated?
+                        control.currentRegion = model.name
+                        config.regionalZonesModel.region = control.currentRegion
                         tztext.text = qsTr("Timezone: %1").arg(config.currentTimezoneName)
                         stack.push(zoneView)
                     }
@@ -119,7 +123,7 @@ Page {
                     }
 
                     width: parent.width / 2
-                    height: 250
+                    height: parent.height / 1.5
                     anchors.centerIn: parent
                     anchors.verticalCenterOffset: -30
                     focus: true
@@ -136,9 +140,8 @@ Page {
                         opacity: 0.7
                     }
 
-                    // model loads, dozens of variations tried for currentIndex all fail
                     model: config.regionalZonesModel
-                    currentIndex: config.currentIndex
+                    currentIndex : -1
                     delegate: ItemDelegate {
 
                         hoverEnabled: true
@@ -147,9 +150,9 @@ Page {
 
                         Label {
 
-                            text: name
+                            text: model.name
-                            Layout.fillHeight: true
+                            horizontalAlignment: Text.AlignHCenter
-                            Layout.fillWidth: true
+                            verticalAlignment: Text.AlignVCenter
                             width: parent.width
                             height: 30
                             color: highlighted ? Kirigami.Theme.highlightedTextColor : Kirigami.Theme.textColor
@@ -163,20 +166,21 @@ Page {
 
                         onClicked: {
 
-                            list2.model.currentIndex = index
+                            list2.currentIndex = index
                             list2.positionViewAtIndex(index, ListView.Center)
-                            // correct to use config.currentTimezoneName when index is updated?
+                            control.currentZone = model.name
+                            config.setCurrentLocation(control.currentRegion, control.currentZone)
                             tztext.text = qsTr("Timezone: %1").arg(config.currentTimezoneName)
                         }
                     }
                 }
-                
+
                 Button {
 
                     Layout.fillWidth: true
                     anchors.verticalCenter: parent.verticalCenter
                     anchors.verticalCenterOffset: -30
-                    anchors.left: parent.left 
+                    anchors.left: parent.left
                     anchors.leftMargin: parent.width / 15
                     icon.name: "go-previous"
                     text: qsTr("Zones")

src/modules/partition/CMakeLists.txt

@@ -8,8 +8,9 @@
 # want to allow unsafe partitioning choices (e.g. doing things to the
 # current disk). Set DEBUG_PARTITION_UNSAFE to allow that (it turns off
 # some filtering of devices). If you **do** allow unsafe partitioning,
-# it will error out unless you **also** switch **off** DEBUG_PARTITION_LAME,
+# it will error out at runtime unless you **also** switch **off**
-# at which point you are welcome to shoot yourself in the foot.
+# DEBUG_PARTITION_LAME, at which point you are welcome to shoot
+# yourself in the foot.
 option( DEBUG_PARTITION_UNSAFE "Allow unsafe partitioning choices." OFF )
 option( DEBUG_PARTITION_LAME   "Unsafe partitioning will error out on exec." ON )
 

src/modules/partition/core/DeviceList.cpp

@@ -10,14 +10,8 @@
 
 #include "DeviceList.h"
 
-#include "PartitionCoreModule.h"
-#include "core/DeviceModel.h"
-#include "core/KPMHelpers.h"
-
-#include "GlobalStorage.h"
-#include "JobQueue.h"
-#include "partition/PartitionIterator.h"
 #include "utils/Logger.h"
+#include "partition/PartitionIterator.h"
 
 #include <kpmcore/backend/corebackend.h>
 #include <kpmcore/backend/corebackendmanager.h>
@@ -25,7 +19,6 @@
 #include <kpmcore/core/partition.h>
 
 #include <QProcess>
-#include <QTemporaryDir>
 
 using CalamaresUtils::Partition::PartitionIterator;
 
@@ -118,8 +111,6 @@ erase( DeviceList& l, DeviceList::iterator& it )
 QList< Device* >
 getDevices( DeviceType which )
 {
-    bool writableOnly = ( which == DeviceType::WritableOnly );
-
     CoreBackend* backend = CoreBackendManager::self()->backend();
 #if defined( WITH_KPMCORE4API )
     DeviceList devices = backend->scanDevices( /* not includeReadOnly, not includeLoopback */ ScanFlag( 0 ) );
@@ -127,47 +118,66 @@ getDevices( DeviceType which )
     DeviceList devices = backend->scanDevices( /* excludeReadOnly */ true );
 #endif
 
+    /* The list of devices is cleaned up for use:
+     *  - some devices can **never** be used (e.g. floppies, nullptr)
+     *  - some devices can be used if unsafe mode is on, but not in normal operation
+     * Two lambda's are defined,
+     *  - removeInAllModes()
+     *  - removeInSafeMode()
+     * To handle the difference.
+     */
 #ifdef DEBUG_PARTITION_UNSAFE
     cWarning() << "Allowing unsafe partitioning choices." << devices.count() << "candidates.";
 #ifdef DEBUG_PARTITION_LAME
-    cDebug() << Logger::SubEntry << "it has been lamed, and will fail.";
+    cDebug() << Logger::SubEntry << "unsafe partitioning has been lamed, and will fail.";
 #endif
+
+    // Unsafe partitioning
+    auto removeInAllModes = []( DeviceList& l, DeviceList::iterator& it) { return erase(l, it); };
+    auto removeInSafeMode = []( DeviceList&, DeviceList::iterator& it) { return ++it; };
 #else
+    // Safe partitioning
+    auto removeInAllModes = []( DeviceList& l, DeviceList::iterator& it) { return erase(l, it); };
+    auto& removeInSafeMode = removeInAllModes;
+#endif
+
     cDebug() << "Removing unsuitable devices:" << devices.count() << "candidates.";
 
+    bool writableOnly = ( which == DeviceType::WritableOnly );
     // Remove the device which contains / from the list
     for ( DeviceList::iterator it = devices.begin(); it != devices.end(); )
+    {
         if ( !( *it ) )
         {
             cDebug() << Logger::SubEntry << "Skipping nullptr device";
-            it = erase( devices, it );
+            it = removeInAllModes( devices, it );
         }
         else if ( isZRam( *it ) )
         {
             cDebug() << Logger::SubEntry << "Removing zram" << it;
-            it = erase( devices, it );
+            it = removeInAllModes( devices, it );
         }
         else if ( isFloppyDrive( ( *it ) ) )
         {
             cDebug() << Logger::SubEntry << "Removing floppy disk" << it;
-            it = erase( devices, it );
+            it = removeInAllModes( devices, it );
         }
         else if ( writableOnly && hasRootPartition( *it ) )
         {
             cDebug() << Logger::SubEntry << "Removing device with root filesystem (/) on it" << it;
-            it = erase( devices, it );
+            it = removeInSafeMode( devices, it );
         }
         else if ( writableOnly && isIso9660( *it ) )
         {
             cDebug() << Logger::SubEntry << "Removing device with iso9660 filesystem (probably a CD) on it" << it;
-            it = erase( devices, it );
+            it = removeInSafeMode( devices, it );
         }
         else
         {
             ++it;
         }
-#endif
+    }
-
+    cDebug() << Logger::SubEntry << "there are" << devices.count() << "devices left.";
     return devices;
 }
 

src/modules/partition/core/DeviceModel.cpp

@@ -99,7 +99,7 @@ DeviceModel::data( const QModelIndex& index, int role ) const
         return CalamaresUtils::defaultPixmap(
             CalamaresUtils::PartitionDisk,
             CalamaresUtils::Original,
-            QSize( CalamaresUtils::defaultIconSize().width() * 3, CalamaresUtils::defaultIconSize().height() * 3 ) );
+            QSize( CalamaresUtils::defaultIconSize().width() * 2, CalamaresUtils::defaultIconSize().height() * 2 ) );
     default:
         return QVariant();
     }

src/modules/partition/core/PartUtils.cpp

@@ -72,15 +72,15 @@ getRequiredStorageGiB( bool& ok )
 }
 
 bool
-canBeReplaced( Partition* candidate )
+canBeReplaced( Partition* candidate, const Logger::Once& o )
 {
     if ( !candidate )
     {
-        cDebug() << "Partition* is NULL";
+        cDebug() << o << "Partition* is NULL";
         return false;
     }
 
-    cDebug() << "Checking if" << convenienceName( candidate ) << "can be replaced.";
+    cDebug() << o << "Checking if" << convenienceName( candidate ) << "can be replaced.";
     if ( candidate->isMounted() )
     {
         cDebug() << Logger::SubEntry << "NO, it is mounted.";
@@ -100,7 +100,7 @@ canBeReplaced( Partition* candidate )
 
     if ( availableStorageB > requiredStorageB )
     {
-        cDebug() << "Partition" << convenienceName( candidate ) << "authorized for replace install.";
+        cDebug() << o << "Partition" << convenienceName( candidate ) << "authorized for replace install.";
         return true;
     }
     else
@@ -117,15 +117,15 @@ canBeReplaced( Partition* candidate )
 
 
 bool
-canBeResized( Partition* candidate )
+canBeResized( Partition* candidate, const Logger::Once& o )
 {
     if ( !candidate )
     {
-        cDebug() << "Partition* is NULL";
+        cDebug() << o << "Partition* is NULL";
         return false;
     }
 
-    cDebug() << "Checking if" << convenienceName( candidate ) << "can be resized.";
+    cDebug() << o << "Checking if" << convenienceName( candidate ) << "can be resized.";
     if ( !candidate->fileSystem().supportGrow() || !candidate->fileSystem().supportShrink() )
     {
         cDebug() << Logger::SubEntry << "NO, filesystem" << candidate->fileSystem().name()
@@ -177,7 +177,7 @@ canBeResized( Partition* candidate )
 
     if ( availableStorageB > advisedStorageB )
     {
-        cDebug() << "Partition" << convenienceName( candidate ) << "authorized for resize + autopartition install.";
+        cDebug() << o << "Partition" << convenienceName( candidate ) << "authorized for resize + autopartition install.";
         return true;
     }
     else
@@ -196,9 +196,9 @@ canBeResized( Partition* candidate )
 
 
 bool
-canBeResized( DeviceModel* dm, const QString& partitionPath )
+canBeResized( DeviceModel* dm, const QString& partitionPath, const Logger::Once& o )
 {
-    cDebug() << "Checking if" << partitionPath << "can be resized.";
+    cDebug() << o << "Checking if" << partitionPath << "can be resized.";
     QString partitionWithOs = partitionPath;
     if ( partitionWithOs.startsWith( "/dev/" ) )
     {
@@ -208,7 +208,7 @@ canBeResized( DeviceModel* dm, const QString& partitionPath )
             Partition* candidate = CalamaresUtils::Partition::findPartitionByPath( { dev }, partitionWithOs );
             if ( candidate )
             {
-                return canBeResized( candidate );
+                return canBeResized( candidate, o );
             }
         }
         cDebug() << Logger::SubEntry << "no Partition* found for" << partitionWithOs;
@@ -357,6 +357,8 @@ findPartitionPathForMountPoint( const FstabEntryList& fstab, const QString& moun
 OsproberEntryList
 runOsprober( DeviceModel* dm )
 {
+    Logger::Once o;
+
     QString osproberOutput;
     QProcess osprober;
     osprober.setProgram( "os-prober" );
@@ -411,18 +413,18 @@ runOsprober( DeviceModel* dm )
             QString homePath = findPartitionPathForMountPoint( fstabEntries, "/home" );
 
             osproberEntries.append(
-                { prettyName, path, file, QString(), canBeResized( dm, path ), lineColumns, fstabEntries, homePath } );
+                { prettyName, path, file, QString(), canBeResized( dm, path, o ), lineColumns, fstabEntries, homePath } );
             osproberCleanLines.append( line );
         }
     }
 
     if ( osproberCleanLines.count() > 0 )
     {
-        cDebug() << "os-prober lines after cleanup:" << Logger::DebugList( osproberCleanLines );
+        cDebug() << o << "os-prober lines after cleanup:" << Logger::DebugList( osproberCleanLines );
     }
     else
     {
-        cDebug() << "os-prober gave no output.";
+        cDebug() << o << "os-prober gave no output.";
     }
 
     Calamares::JobQueue::instance()->globalStorage()->insert( "osproberLines", osproberCleanLines );
@@ -481,7 +483,6 @@ findFS( QString fsName, FileSystem::Type* fsType )
     FileSystem::Type tmpType = FileSystem::typeForName( fsName, fsLanguage );
     if ( tmpType != FileSystem::Unknown )
     {
-        cDebug() << "Found filesystem" << fsName;
         if ( fsType )
         {
             *fsType = tmpType;
@@ -496,7 +497,6 @@ findFS( QString fsName, FileSystem::Type* fsType )
         if ( 0 == QString::compare( fsName, FileSystem::nameForType( t, fsLanguage ), Qt::CaseInsensitive ) )
         {
             QString fsRealName = FileSystem::nameForType( t, fsLanguage );
-            cDebug() << "Filesystem name" << fsName << "translated to" << fsRealName;
             if ( fsType )
             {
                 *fsType = t;
@@ -505,7 +505,7 @@ findFS( QString fsName, FileSystem::Type* fsType )
         }
     }
 
-    cDebug() << "Filesystem" << fsName << "not found, using ext4";
+    cWarning() << "Filesystem" << fsName << "not found, using ext4";
     fsName = QStringLiteral( "ext4" );
     // fsType can be used to check whether fsName was a valid filesystem.
     if ( fsType )

src/modules/partition/core/PartUtils.h

@@ -24,6 +24,10 @@
 
 class DeviceModel;
 class Partition;
+namespace Logger
+{
+    class Once;
+}
 
 namespace PartUtils
 {
@@ -41,26 +45,29 @@ QString convenienceName( const Partition* const candidate );
  * @brief canBeReplaced checks whether the given Partition satisfies the criteria
  * for replacing it with the new OS.
  * @param candidate the candidate partition to replace.
+ * @param o applied to debug-logging.
  * @return true if the criteria are met, otherwise false.
  */
-bool canBeReplaced( Partition* candidate );
+bool canBeReplaced( Partition* candidate, const Logger::Once& o );
 
 /**
  * @brief canBeReplaced checks whether the given Partition satisfies the criteria
  * for resizing (shrinking) it to make room for a new OS.
  * @param candidate the candidate partition to resize.
+ * @param o applied to debug-logging.
  * @return true if the criteria are met, otherwise false.
  */
-bool canBeResized( Partition* candidate );
+bool canBeResized( Partition* candidate, const Logger::Once& o );
 
 /**
  * @brief canBeReplaced checks whether the given Partition satisfies the criteria
  * for resizing (shrinking) it to make room for a new OS.
  * @param dm the DeviceModel instance.
  * @param partitionPath the device path of the candidate partition to resize.
+ * @param o applied to debug-logging.
  * @return true if the criteria are met, otherwise false.
  */
-bool canBeResized( DeviceModel* dm, const QString& partitionPath );
+bool canBeResized( DeviceModel* dm, const QString& partitionPath, const Logger::Once& o );
 
 /**
  * @brief runOsprober executes os-prober, parses the output and writes relevant

src/modules/partition/core/PartitionCoreModule.cpp

@@ -255,13 +255,22 @@ PartitionCoreModule::doInit()
     DeviceList devices = PartUtils::getDevices( PartUtils::DeviceType::WritableOnly );
 
     cDebug() << "LIST OF DETECTED DEVICES:";
-    cDebug() << "node\tcapacity\tname\tprettyName";
+    cDebug() << Logger::SubEntry << "node\tcapacity\tname\tprettyName";
     for ( auto device : devices )
     {
-        // Gives ownership of the Device* to the DeviceInfo object
+        cDebug() << Logger::SubEntry << Logger::Pointer(device);
-        auto deviceInfo = new DeviceInfo( device );
+        if ( device )
-        m_deviceInfos << deviceInfo;
+        {
-        cDebug() << device->deviceNode() << device->capacity() << device->name() << device->prettyName();
+            // Gives ownership of the Device* to the DeviceInfo object
+            auto deviceInfo = new DeviceInfo( device );
+            m_deviceInfos << deviceInfo;
+            cDebug() << Logger::SubEntry << device->deviceNode() << device->capacity() << device->name()
+                     << device->prettyName();
+        }
+        else
+        {
+            cDebug() << Logger::SubEntry << "(skipped null device)";
+        }
     }
     cDebug() << Logger::SubEntry << devices.count() << "devices detected.";
     m_deviceModel->init( devices );
@@ -659,10 +668,10 @@ PartitionCoreModule::dumpQueue() const
     cDebug() << "# Queue:";
     for ( auto info : m_deviceInfos )
     {
-        cDebug() << "## Device:" << info->device->name();
+        cDebug() << Logger::SubEntry << "## Device:" << info->device->name();
         for ( const auto& job : info->jobs() )
         {
-            cDebug() << "-" << job->prettyName();
+            cDebug() << Logger::SubEntry << "-" << job->prettyName();
         }
     }
 }

src/modules/partition/gui/ChoicePage.cpp

@@ -134,6 +134,28 @@ ChoicePage::ChoicePage( Config* config, QWidget* parent )
 ChoicePage::~ChoicePage() {}
 
 
+/** @brief Sets the @p model for the given @p box and adjusts UI sizes to match.
+ *
+ * The model provides data for drawing the items in the model; the
+ * drawing itself is done by the delegate, which may end up drawing a
+ * different width in the popup than in the collapsed combo box.
+ *
+ * Make the box wide enough to accomodate the whole expanded delegate;
+ * this avoids cases where the popup would truncate data being drawn
+ * because the overall box is sized too narrow.
+ */
+void setModelToComboBox( QComboBox* box, QAbstractItemModel* model )
+{
+    box->setModel( model );
+    if ( model->rowCount() > 0 )
+    {
+        QStyleOptionViewItem options;
+        options.initFrom( box );
+        auto delegateSize = box->itemDelegate()->sizeHint(options, model->index(0, 0) );
+        box->setMinimumWidth( delegateSize.width() );
+    }
+}
+
 void
 ChoicePage::init( PartitionCoreModule* core )
 {
@@ -145,10 +167,10 @@ ChoicePage::init( PartitionCoreModule* core )
 
     // We need to do this because a PCM revert invalidates the deviceModel.
     connect( core, &PartitionCoreModule::reverted, this, [=] {
-        m_drivesCombo->setModel( core->deviceModel() );
+        setModelToComboBox( m_drivesCombo, core->deviceModel() );
         m_drivesCombo->setCurrentIndex( m_lastSelectedDeviceIndex );
     } );
-    m_drivesCombo->setModel( core->deviceModel() );
+    setModelToComboBox( m_drivesCombo, core->deviceModel() );
 
     connect( m_drivesCombo,
              static_cast< void ( QComboBox::* )( int ) >( &QComboBox::currentIndexChanged ),
@@ -482,8 +504,6 @@ ChoicePage::applyActionChoice( InstallChoice choice )
                 [] {},
                 this );
         }
-        updateNextEnabled();
-
         connect( m_beforePartitionBarsView->selectionModel(),
                  SIGNAL( currentRowChanged( QModelIndex, QModelIndex ) ),
                  this,
@@ -507,7 +527,6 @@ ChoicePage::applyActionChoice( InstallChoice choice )
                 },
                 this );
         }
-        updateNextEnabled();
 
         connect( m_beforePartitionBarsView->selectionModel(),
                  SIGNAL( currentRowChanged( QModelIndex, QModelIndex ) ),
@@ -519,6 +538,7 @@ ChoicePage::applyActionChoice( InstallChoice choice )
     case InstallChoice::Manual:
         break;
     }
+    updateNextEnabled();
     updateActionChoicePreview( choice );
 }
 
@@ -985,7 +1005,7 @@ ChoicePage::updateActionChoicePreview( InstallChoice choice )
 
         SelectionFilter filter = []( const QModelIndex& index ) {
             return PartUtils::canBeResized(
-                static_cast< Partition* >( index.data( PartitionModel::PartitionPtrRole ).value< void* >() ) );
+                static_cast< Partition* >( index.data( PartitionModel::PartitionPtrRole ).value< void* >() ), Logger::Once() );
         };
         m_beforePartitionBarsView->setSelectionFilter( filter );
         m_beforePartitionLabelsView->setSelectionFilter( filter );
@@ -1074,7 +1094,7 @@ ChoicePage::updateActionChoicePreview( InstallChoice choice )
         {
             SelectionFilter filter = []( const QModelIndex& index ) {
                 return PartUtils::canBeReplaced(
-                    static_cast< Partition* >( index.data( PartitionModel::PartitionPtrRole ).value< void* >() ) );
+                    static_cast< Partition* >( index.data( PartitionModel::PartitionPtrRole ).value< void* >() ), Logger::Once() );
             };
             m_beforePartitionBarsView->setSelectionFilter( filter );
             m_beforePartitionLabelsView->setSelectionFilter( filter );
@@ -1219,10 +1239,12 @@ operator<<( QDebug& s, PartitionIterator& it )
 void
 ChoicePage::setupActions()
 {
+    Logger::Once o;
+
     Device* currentDevice = selectedDevice();
     OsproberEntryList osproberEntriesForCurrentDevice = getOsproberEntriesForDevice( currentDevice );
 
-    cDebug() << "Setting up actions for" << currentDevice->deviceNode() << "with"
+    cDebug() << o << "Setting up actions for" << currentDevice->deviceNode() << "with"
              << osproberEntriesForCurrentDevice.count() << "entries.";
 
     if ( currentDevice->partitionTable() )
@@ -1268,12 +1290,12 @@ ChoicePage::setupActions()
 
     for ( auto it = PartitionIterator::begin( currentDevice ); it != PartitionIterator::end( currentDevice ); ++it )
     {
-        if ( PartUtils::canBeResized( *it ) )
+        if ( PartUtils::canBeResized( *it, o ) )
         {
             cDebug() << Logger::SubEntry << "contains resizable" << it;
             atLeastOneCanBeResized = true;
         }
-        if ( PartUtils::canBeReplaced( *it ) )
+        if ( PartUtils::canBeReplaced( *it, o ) )
         {
             cDebug() << Logger::SubEntry << "contains replaceable" << it;
             atLeastOneCanBeReplaced = true;
@@ -1402,7 +1424,7 @@ ChoicePage::setupActions()
     }
     else
     {
-        cDebug() << "Replace button suppressed because none can be replaced.";
+        cDebug() << "No partitions available for replace-action.";
         force_uncheck( m_grp, m_replaceButton );
     }
 
@@ -1412,7 +1434,7 @@ ChoicePage::setupActions()
     }
     else
     {
-        cDebug() << "Alongside button suppressed because none can be resized.";
+        cDebug() << "No partitions available for resize-action.";
         force_uncheck( m_grp, m_alongsideButton );
     }
 
@@ -1422,8 +1444,8 @@ ChoicePage::setupActions()
     }
     else
     {
-        cDebug() << "Erase button suppressed"
+        cDebug() << "No partitions ("
-                 << "mount?" << atLeastOneIsMounted << "raid?" << isInactiveRAID;
+                 << "any-mounted?" << atLeastOneIsMounted << "is-raid?" << isInactiveRAID << ") for erase-action.";
         force_uncheck( m_grp, m_eraseButton );
     }
 

src/modules/partition/gui/PartitionPage.h

@@ -20,7 +20,6 @@ class PartitionCoreModule;
 class Ui_PartitionPage;
 
 class Device;
-class DeviceModel;
 class Partition;
 
 /**

src/modules/partition/gui/PartitionViewStep.cpp

@@ -16,45 +16,27 @@
 #include "core/BootLoaderModel.h"
 #include "core/Config.h"
 #include "core/DeviceModel.h"
-#include "core/KPMHelpers.h"
-#include "core/OsproberEntry.h"
-#include "core/PartUtils.h"
-#include "core/PartitionActions.h"
 #include "core/PartitionCoreModule.h"
-#include "core/PartitionModel.h"
 #include "gui/ChoicePage.h"
 #include "gui/PartitionBarsView.h"
 #include "gui/PartitionLabelsView.h"
 #include "gui/PartitionPage.h"
 
 #include "Branding.h"
-#include "CalamaresVersion.h"
 #include "GlobalStorage.h"
-#include "Job.h"
 #include "JobQueue.h"
 #include "utils/CalamaresUtilsGui.h"
 #include "utils/Logger.h"
-#include "utils/NamedEnum.h"
 #include "utils/QtCompat.h"
 #include "utils/Retranslator.h"
-#include "utils/Units.h"
 #include "utils/Variant.h"
 #include "widgets/WaitingWidget.h"
 
-
-#include <kpmcore/core/device.h>
 #include <kpmcore/core/partition.h>
-#include <kpmcore/fs/filesystem.h>
 
-#include <QApplication>
-#include <QDir>
 #include <QFormLayout>
-#include <QFutureWatcher>
-#include <QLabel>
 #include <QMessageBox>
-#include <QProcess>
 #include <QStackedWidget>
-#include <QTimer>
 #include <QtConcurrent/QtConcurrent>
 
 PartitionViewStep::PartitionViewStep( QObject* parent )
@@ -406,6 +388,7 @@ shouldWarnForGPTOnBIOS( const PartitionCoreModule* core )
     }
 
     auto [ r, device ] = core->bootLoaderModel()->findBootLoader( core->bootLoaderInstallPath() );
+    Q_UNUSED(r);
     if ( device )
     {
         auto* table = device->partitionTable();
@@ -416,7 +399,7 @@ shouldWarnForGPTOnBIOS( const PartitionCoreModule* core )
             for ( const auto& partition : qAsConst( table->children() ) )
             {
                 using CalamaresUtils::Units::operator""_MiB;
-                if ( ( partition->activeFlags() & PartitionTable::Flag::BiosGrub )
+                if ( ( partition->activeFlags() & KPM_PARTITION_FLAG( BiosGrub ) )
                      && ( partition->fileSystem().type() == FileSystem::Unformatted )
                      && ( partition->capacity() >= 8_MiB ) )
                 {
@@ -559,6 +542,8 @@ PartitionViewStep::onLeave()
 void
 PartitionViewStep::setConfigurationMap( const QVariantMap& configurationMap )
 {
+    Logger::Once o;
+
     m_config->setConfigurationMap( configurationMap );
 
     // Copy the efiSystemPartition setting to the global storage. It is needed not only in
@@ -569,7 +554,7 @@ PartitionViewStep::setConfigurationMap( const QVariantMap& configurationMap )
 
     // Set up firmwareType global storage entry. This is used, e.g. by the bootloader module.
     QString firmwareType( PartUtils::isEfiSystem() ? QStringLiteral( "efi" ) : QStringLiteral( "bios" ) );
-    cDebug() << "Setting firmwareType to" << firmwareType;
+    cDebug() << o << "Setting firmwareType to" << firmwareType;
     gs->insert( "firmwareType", firmwareType );
 
     // Read and parse key efiSystemPartitionSize
@@ -609,7 +594,7 @@ PartitionViewStep::setConfigurationMap( const QVariantMap& configurationMap )
     QString fsRealName = PartUtils::findFS( fsName, &fsType );
     if ( fsRealName == fsName )
     {
-        cDebug() << "Partition-module setting *defaultFileSystemType*" << fsRealName;
+        cDebug() << o << "Partition-module setting *defaultFileSystemType*" << fsRealName;
     }
     else if ( fsType != FileSystem::Unknown )
     {

src/modules/partition/partition.conf

@@ -152,8 +152,6 @@ defaultFileSystemType:  "ext4"
 # may arise as a consequence of setting this option to false.
 # It is strongly recommended that system integrators put in the work to support
 # LUKS unlocking support in GRUB2 and initramfs/dracut/mkinitcpio/etc.
-# Support is offered to system integrators that wish to do so, through the
-# Calamares bug tracker, as well as in #calamares on Freenode.
 # For more information on setting up GRUB2 for Calamares with LUKS, see
 # https://github.com/calamares/calamares/wiki/Deploy-LUKS
 #