diff --git a/.github/workflows/nightly-debian.yml b/.github/workflows/nightly-debian.yml index f7ff254df..eb96fe40e 100644 --- a/.github/workflows/nightly-debian.yml +++ b/.github/workflows/nightly-debian.yml @@ -19,52 +19,16 @@ jobs: image: docker://debian:11 options: --tmpfs /build:rw --user 0:0 steps: - - name: "prepare env" + - name: "prepare git" shell: bash run: | - apt-get update - # Make sure we can send notices later - apt-get -y install git-core jq curl - apt-get -y install \ - build-essential \ - cmake \ - extra-cmake-modules \ - gettext \ - libatasmart-dev \ - libappstreamqt-dev \ - libboost-python-dev \ - libicu-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 (KF5, +) - apt-get -y install \ - libkf5config-dev \ - libkf5coreaddons-dev \ - libkf5i18n-dev \ - libkf5iconthemes-dev \ - libkf5parts-dev \ - libkf5service-dev \ - libkf5solid-dev \ - libkf5crash-dev \ - libkf5package-dev \ - libkf5plasma-dev \ - libpwquality-dev \ - libqt5webenginewidgets5 \ - qtwebengine5-dev + apt-get update + apt-get -y install git-core jq curl - name: "prepare source" - uses: calamares/actions/generic-checkout@v4 + uses: calamares/actions/generic-checkout@v5 + - name: "install dependencies" + shell: bash + run: ./ci/deps-debian11.sh - name: "build" - id: build - uses: calamares/actions/generic-build@v4 + shell: bash + run: ./ci/build.sh diff --git a/.github/workflows/nightly-fedora-qt6.yml b/.github/workflows/nightly-fedora-qt6.yml new file mode 100644 index 000000000..2c8c3af1d --- /dev/null +++ b/.github/workflows/nightly-fedora-qt6.yml @@ -0,0 +1,33 @@ +name: nightly-fedora-qt6 + +on: + schedule: + - cron: "52 2 * * *" + workflow_dispatch: + +env: + BUILDDIR: /build + SRCDIR: ${{ github.workspace }} + CMAKE_ARGS: | + -DKDE_INSTALL_USE_QT_SYS_PATHS=ON + -DCMAKE_BUILD_TYPE=Debug + -DWITH_QT6=ON + +jobs: + build: + runs-on: ubuntu-latest + container: + image: docker://fedora:38 + options: --tmpfs /build:rw --user 0:0 + steps: + - name: "prepare git" + shell: bash + run: yum install -y git-core jq curl + - name: "prepare source" + uses: calamares/actions/generic-checkout@v5 + - name: "install dependencies" + shell: bash + run: ./ci/deps-fedora-qt6.sh + - name: "build" + shell: bash + run: ./ci/build.sh diff --git a/.github/workflows/nightly-neon-unstable.yml b/.github/workflows/nightly-neon-unstable.yml new file mode 100644 index 000000000..f5a2a693c --- /dev/null +++ b/.github/workflows/nightly-neon-unstable.yml @@ -0,0 +1,29 @@ +name: nightly-neon-unstable + +on: + schedule: + - cron: "59 23 * * *" + workflow_dispatch: + +env: + BUILDDIR: /build + SRCDIR: ${{ github.workspace }} + CMAKE_ARGS: | + -DKDE_INSTALL_USE_QT_SYS_PATHS=ON + -DCMAKE_BUILD_TYPE=Debug + +jobs: + build: + runs-on: ubuntu-latest + container: + image: docker://kdeneon/plasma:unstable + options: --tmpfs /build:rw --user 0:0 + steps: + - name: "prepare source" + uses: calamares/actions/generic-checkout@v5 + - name: "install dependencies" + shell: bash + run: ./ci/deps-neon.sh + - name: "build" + shell: bash + run: ./ci/build.sh diff --git a/.github/workflows/nightly-neon.yml b/.github/workflows/nightly-neon.yml index c0f7b9c0e..35ccf488a 100644 --- a/.github/workflows/nightly-neon.yml +++ b/.github/workflows/nightly-neon.yml @@ -20,21 +20,20 @@ jobs: options: --tmpfs /build:rw --user 0:0 steps: - name: "prepare source" - uses: calamares/actions/generic-checkout@v4 + uses: calamares/actions/generic-checkout@v5 - name: "install dependencies" shell: bash - run: | - ./github/workflows/nightly-neon.sh + run: ./ci/deps-neon.sh - name: "build" - id: build - uses: calamares/actions/generic-build@v4 + shell: bash + run: ./ci/build.sh - name: "Calamares: archive" working-directory: ${{ env.BUILDDIR }} run: | - make install DESTDIR=${{ env.BUILDDIR }}/stage + DESTDIR=${{ env.BUILDDIR }}/stage ninja install tar czf calamares.tar.gz stage - name: "Calamares: upload" - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: calamares-tarball path: ${{ env.BUILDDIR }}/calamares.tar.gz diff --git a/.github/workflows/nightly-opensuse-qt6.yml b/.github/workflows/nightly-opensuse-qt6.yml index 8a16743c0..cd286d5db 100644 --- a/.github/workflows/nightly-opensuse-qt6.yml +++ b/.github/workflows/nightly-opensuse-qt6.yml @@ -20,12 +20,14 @@ jobs: image: docker://opensuse/tumbleweed options: --tmpfs /build:rw --user 0:0 steps: + - name: "prepare git" + shell: bash + run: zypper --non-interactive in git-core jq curl - name: "prepare source" - uses: calamares/actions/generic-checkout@v4 + uses: calamares/actions/generic-checkout@v5 - name: "install dependencies" shell: bash - run: | - ./github/workflows/nightly-opensuse-qt6.sh + run: ./ci/deps-opensuse-qt6.sh - name: "build" - id: build - uses: calamares/actions/generic-build@v4 + shell: bash + run: ./ci/build.sh diff --git a/.github/workflows/nightly-opensuse.yml b/.github/workflows/nightly-opensuse.yml index 0ad5d058e..ef743ec56 100644 --- a/.github/workflows/nightly-opensuse.yml +++ b/.github/workflows/nightly-opensuse.yml @@ -19,69 +19,14 @@ jobs: image: docker://opensuse/tumbleweed options: --tmpfs /build:rw --user 0:0 steps: - - name: "prepare env" + - name: "prepare git" shell: bash - run: | - zypper --non-interactive up - zypper --non-interactive in git-core jq curl - # From deploycala.py - zypper --non-interactive in \ - "autoconf" \ - "automake" \ - "bison" \ - "flex" \ - "git" \ - "libtool" \ - "m4" \ - "make" \ - "cmake" \ - "extra-cmake-modules" \ - "gcc-c++" - zypper --non-interactive in \ - "libqt5-qtbase-devel" \ - "libqt5-linguist-devel" \ - "libqt5-qtsvg-devel" \ - "libqt5-qtdeclarative-devel" \ - "libqt5-qtwebengine-devel" \ - "yaml-cpp-devel" \ - "libpolkit-qt5-1-devel" \ - "libpwquality-devel" \ - "parted-devel" \ - "python-devel" \ - "libboost_headers-devel" \ - "libboost_python3-devel" - zypper --non-interactive in \ - "kdbusaddons-devel" \ - "kservice-devel" \ - "kpackage-devel" \ - "kparts-devel" \ - "kcrash-devel" \ - "kpmcore-devel" \ - "plasma5-workspace-devel" \ - "plasma-framework-devel" \ - # Additional dependencies - zypper --non-interactive in \ - libicu-devel \ - libAppStreamQt-devel \ - libatasmart-devel + run: zypper --non-interactive in git-core jq curl - name: "prepare source" - uses: calamares/actions/generic-checkout@v4 + uses: calamares/actions/generic-checkout@v5 + - name: "install dependencies" + shell: bash + run: ./ci/deps-opensuse.sh - name: "build" - id: build - uses: calamares/actions/generic-build@v4 - - name: "notify: ok" - if: ${{ success() && github.repository == 'calamares/calamares' }} - uses: calamares/actions/matrix-notify@v4 - with: - token: ${{ secrets.MATRIX_TOKEN }} - room: ${{ secrets.MATRIX_ROOM }} - message: | - OK ${{ github.workflow }} in ${{ github.repository }} ${{ steps.build.outputs.git-summary }} - - name: "notify: fail" - if: ${{ failure() && github.repository == 'calamares/calamares' }} - uses: calamares/actions/matrix-notify@v4 - with: - token: ${{ secrets.MATRIX_TOKEN }} - room: ${{ secrets.MATRIX_ROOM }} - message: | - FAIL ${{ github.workflow }} in ${{ github.repository }} ${{ steps.build.outputs.git-summary }} + shell: bash + run: ./ci/build.sh diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml deleted file mode 100644 index 5026a4444..000000000 --- a/.github/workflows/pullrequest.yml +++ /dev/null @@ -1,27 +0,0 @@ -name: pullrequest - -on: - pull_request: - types: [opened, closed] - -jobs: - notify: - runs-on: ubuntu-latest - steps: - - name: "notify: new" - if: github.event.action == 'opened' - uses: calamares/actions/matrix-notify@v4 - with: - token: ${{ secrets.MATRIX_TOKEN }} - room: ${{ secrets.MATRIX_ROOM }} - message: | - PR OPENED ${{ github.event.pull_request.html_url }} by ${{ github.actor }} - .. ${{ github.event.pull_request.title }}" - - name: "notify: closed" - if: github.event.action == 'closed' - uses: calamares/actions/matrix-notify@v4 - with: - token: ${{ secrets.MATRIX_TOKEN }} - room: ${{ secrets.MATRIX_ROOM }} - message: | - PR CLOSED ${{ github.event.pull_request.html_url }} by ${{ github.actor }} diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 798ee4edc..858d7bf42 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -4,7 +4,6 @@ on: push: branches: - calamares - - 3.2.x-stable pull_request: types: - opened @@ -18,8 +17,9 @@ env: CMAKE_ARGS: | -DWEBVIEW_FORCE_WEBKIT=1 -DKDE_INSTALL_USE_QT_SYS_PATHS=ON - -DWITH_PYTHONQT=OFF" + -DWITH_PYTHONQT=OFF -DCMAKE_BUILD_TYPE=Debug + GIT_HASH: ${{ github.event.head_commit.id }} jobs: build: @@ -28,29 +28,11 @@ jobs: image: docker://kdeneon/plasma:user options: --tmpfs /build:rw --user 0:0 steps: - - name: "prepare env" - uses: calamares/actions/prepare-neon@v4 - name: "prepare source" - uses: calamares/actions/generic-checkout@330c45ae1eb6efad4ad75a6dd887c3c5d5fe1590 + uses: calamares/actions/generic-checkout@v5 + - name: "install dependencies" + shell: bash + run: ./ci/deps-neon.sh - name: "build" - id: build - uses: calamares/actions/generic-build@v4 - - name: "notify: ok" - if: ${{ success() && github.repository == 'calamares/calamares' }} - uses: calamares/actions/matrix-notify@v4 - with: - token: ${{ secrets.MATRIX_TOKEN }} - room: ${{ secrets.MATRIX_ROOM }} - message: | - OK ${{ github.workflow }} in ${{ github.repository }} by ${{ github.actor }} on ${{ github.event.ref }} - .. ${{ steps.build.outputs.git-summary }} - - name: "notify: fail" - if: ${{ failure() && github.repository == 'calamares/calamares' }} - uses: calamares/actions/matrix-notify@v4 - with: - token: ${{ secrets.MATRIX_TOKEN }} - room: ${{ secrets.MATRIX_ROOM }} - message: | - FAIL ${{ github.workflow }} in ${{ github.repository }} by ${{ github.actor }} on ${{ github.event.ref }} - .. ${{ steps.build.outputs.git-summary }} - .. ${{ github.event.compare }} + shell: bash + run: ./ci/build.sh diff --git a/CHANGES-3.3 b/CHANGES-3.3 index 7add5ca5d..f7ace60a4 100644 --- a/CHANGES-3.3 +++ b/CHANGES-3.3 @@ -7,21 +7,37 @@ contributors are listed. Note that Calamares does not have a historical changelog -- this log starts with version 3.3.0. See CHANGES-3.2 for the history of the 3.2 series (2018-05 - 2022-08). -# 3.3.0 (unreleased) +# 3.3.0-alpha4 (unreleased) -The very first we-will-call-it-3.3 release! One of the big changes is that +Another closing-in-on-3.3.0 release! One of the big changes is that Calamares -- the core and nearly all of the modules in this repository -- -are compatible with Qt6. This means that a Qt6-based distribution can use -Calamares without including another version of Qt. Note that some KDE -Frameworks are required as well, and those need to be Qt6-based as well. +are compatible with Qt6. That is, it compiles. Functionality has not +been tested, but early-testing distributions are encouraged to submit +pull requests to improve the code. This release contains contributions from (alphabetically by first name): - Adriaan de Groot - Anke Boersma + - Emir Sari + - Evan James - Hector Martin - Ivan Borzenkov + - Simon Quigley ## Core ## + - Qt6 compatibility. You can choose Qt5 (with KDE Frameworks 5) as before, + or choose Qt6 (with KDE Frameworks 6). This means that a Qt6-based Linux + distribution can use Calamares without needing an extra version of Qt. + Note that some KDE Frameworks are required as well, and those need to be + Qt6-based also (and are not released as of September 2023). + - QML-based modules are also supported in Qt6, but the QML is likely to + be source-incompatible. The *welcomeq* module shipped with Calamares + now has two `.qrc` files and uses the `${QT_VERSION_SUFFIX}` variable + to pick one of the two depending on the Qt version being used. + Other modules are likely to follow the same pattern. + - C++ namespaces have been shuffled around and `CalamaresUtils` has been + retired. This has an effect on all C++ plugins, since this is neither + a binary- nor source-compatible change. ## Modules ## - *keyboard* module can now be explicitly configured to use X11 keyboard diff --git a/CMakeLists.txt b/CMakeLists.txt index 7aa1f3060..785b42c02 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -46,7 +46,7 @@ cmake_minimum_required(VERSION 3.16 FATAL_ERROR) -set(CALAMARES_VERSION 3.3.0) +set(CALAMARES_VERSION 3.3.0-alpha4) set(CALAMARES_RELEASE_MODE OFF) # Set to ON during a release if(CMAKE_SCRIPT_MODE_FILE) @@ -174,6 +174,8 @@ if(WITH_QT6) set(KF_VERSION 5.240) # KDE Neon weirdness # API that was deprecated before Qt 5.15 causes a compile error add_compile_definitions(QT_DISABLE_DEPRECATED_BEFORE=0x060400) + # Something to add to filenames for this specific Qt version + set(QT_VERSION_SUFFIX "-qt6") else() message(STATUS "Building Calamares with Qt5") set(qtname "Qt5") @@ -183,6 +185,8 @@ else() set(KF_VERSION 5.78) # API that was deprecated before Qt 5.15 causes a compile error add_compile_definitions(QT_DISABLE_DEPRECATED_BEFORE=0x050f00) + # Something to add to filenames for this specific Qt version + set(QT_VERSION_SUFFIX "") endif() set(BOOSTPYTHON_VERSION 1.72.0) diff --git a/CMakeModules/CalamaresAddLibrary.cmake b/CMakeModules/CalamaresAddLibrary.cmake index bc9b4ba6d..c7cc0f329 100644 --- a/CMakeModules/CalamaresAddLibrary.cmake +++ b/CMakeModules/CalamaresAddLibrary.cmake @@ -62,8 +62,10 @@ function(calamares_add_library) add_library(${target} STATIC ${LIBRARY_SOURCES}) elseif(LIBRARY_TARGET_TYPE STREQUAL "MODULE") add_library(${target} MODULE ${LIBRARY_SOURCES}) - else() # default + elseif(LIBRARY_TARGET_TYPE STREQUAL "SHARED") add_library(${target} SHARED ${LIBRARY_SOURCES}) + else() # default + message(FATAL_ERROR "Invalid library type '${LIBRARY_TARGET_TYPE}'") endif() calamares_automoc(${target}) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c8d2081dc..efef2b663 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -36,6 +36,9 @@ room, `#calamares:kde.org`. Responsiveness is best during the day in Europe, but feel free to idle. Matrix is persistent, and we'll see your message eventually. +**Note:** You need an account to access Matrix. It doesn't have to be a KDE account, +it can be on any Matrix homeserver. + * [![Join us on Matrix](https://img.shields.io/badge/Matrix-%23calamares:kde.org-blue)](https://webchat.kde.org/#/room/%23calamares:kde.org) @@ -74,48 +77,68 @@ instructions are on the wiki. ### Simple Build in Docker You may have success with the Docker images that the CI system uses. -Pick one (or both): +Pick one (or more) of these images which are also used in CI: - `docker pull docker://opensuse/tumbleweed` - `docker pull kdeneon/plasma:user` +- `docker pull fedora:38` Then start a container with the right image, from the root of Calamares -source checkout. Pick one: -- `docker run -ti --tmpfs /build:rw --user 0:0 -v .:/src opensuse/tumbleweed ` -- `docker run -ti --tmpfs /build:rw --user 0:0 -v /tmp/.X11-unix:/tmp/.X11-unix -e DISPLAY=:0 -v .:/src kdeneon/plasma:user bash` -This starts a container with the chosen image (openSUSE Tumbleweed or KDE neon, -here) with a temporary build directory in `/build` and the Calamares -sources mounted as `/src`. KDE neon needs some extra settings to avoid -starting a complete desktop. +source checkout. Start with this command and substitute `opensuse/tumbleweed` +or `kdeneon/plasma:user` for the `$IMAGE` part. + +``` +docker run -ti \ + --tmpfs /build:rw,exec \ + --user 0:0 \ + -e DISPLAY=:0 \ + -v /tmp/.X11-unix:/tmp/.X11-unix \ + -v .:/src \ + $IMAGE \ + bash +``` + +This starts a container with the chosen image with a temporary build +directory in `/build` and the Calamaressources mounted as `/src`. Run the script to install dependencies: you could use `deploycala.py` -or one of the shell scripts in `.github/workflows` to install the right -dependencies for the image. +or one of the shell scripts in `ci/` to install the right +dependencies for the image (in this example, for openSUSE and Qt6). - `cd /src` -- `./.github/workflows/nightly-opensuse-qt6.sh` +- `./ci/deps-opensuse-qt6.sh` -Then run CMake (add any CMake options you like at the end) and ninja: +Then run CMake (add any CMake options you like at the end) and ninja. +There is a script `ci/build.sh` that does this, too (without options). - `cmake -S /src -B /build -G Ninja` - `ninja -C /build` -### Dependencies +To run Calamares inside the container, or e.g. `loadmodule` to test +individual modules, you may need to configure X authentication; a +simple and insecure way of doing that is to run `xhost +` in the host +environment of the Docker containers. + +### Dependencies for Calamares 3.3 + +> The dependencies for Calamares 3.3 reflect "resonably current" +> software as of September 2023. For Calamares 3.2 dependencies, +> which are 2017-era, see the `CONTRIBUTING` file in that branch. Main: * Compiler with C++17 support * CMake >= 3.16 -* Qt >= 5.15 * yaml-cpp >= 0.5.1 +* Qt >= 5.15 or Qt >= 6.5 * KDE Frameworks KCoreAddons >= 5.78 -* Python >= 3.6 (required for some modules) -* Boost.Python >= 1.72.0 (required for some modules) * KDE extra-cmake-modules >= 5.78 (recommended; required for some modules; required for some tests) +* Python >= 3.6 (required for some modules) +* Boost.Python >= 1.72.0 (required for some modules) Individual modules may have their own requirements; these are listed in CMake output. Particular requirements (not complete): -* *fsresizer* KPMCore >= 3.3 (>= 4.2 recommended) -* *partition* KPMCore >= 3.3 (>= 4.2 recommended) +* *fsresizer* KPMCore >= 20.04 +* *partition* KPMCore >= 20.04 * *users* LibPWQuality (optional) diff --git a/ci/build.sh b/ci/build.sh new file mode 100755 index 000000000..8cd6416a8 --- /dev/null +++ b/ci/build.sh @@ -0,0 +1,20 @@ +#! /bin/sh +# +# Generic build (driven by environment variables) +# + +# Sanity check +test -n "$BUILDDIR" || { echo "! \$BUILDDIR not set" ; exit 1 ; } +mkdir -p "$BUILDDIR" +test -f "$SRCDIR/CMakeLists.txt" || { echo "! Missing $SRCDIR/CMakeLists.txt" ; exit 1 ; } + +BUILD_MESSAGE="No commit info" +test -n "$GIT_HASH" && BUILD_MESSAGE=$( git log -1 --abbrev-commit --pretty=oneline --no-decorate "$GIT_HASH" ) + +echo "::" ; echo ":: $BUILD_MESSAGE" ; echo "::" + +cmake -S "$SRCDIR" -B "$BUILDDIR" -G Ninja $CMAKE_ARGS || exit 1 +ninja -C "$BUILDDIR" || exit 1 +ninja -C "$BUILDDIR" install || exit 1 + +echo "::" ; echo ":: $BUILD_MESSAGE" ; echo "::" diff --git a/ci/deps-debian11.sh b/ci/deps-debian11.sh new file mode 100755 index 000000000..312364516 --- /dev/null +++ b/ci/deps-debian11.sh @@ -0,0 +1,45 @@ +#! /bin/sh +# +# Install dependencies for the nightly-debian (11) build +# +apt-get update +apt-get -y install git-core jq curl ninja +apt-get -y install \ + build-essential \ + cmake \ + extra-cmake-modules \ + gettext \ + libatasmart-dev \ + libappstreamqt-dev \ + libboost-python-dev \ + libicu-dev \ + libparted-dev \ + libpolkit-qt5-1-dev \ + libqt5svg5-dev \ + libqt5webkit5-dev \ + libyaml-cpp-dev \ + ninja-build \ + 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 (KF5, +) +apt-get -y install \ + libkf5config-dev \ + libkf5coreaddons-dev \ + libkf5i18n-dev \ + libkf5iconthemes-dev \ + libkf5parts-dev \ + libkf5service-dev \ + libkf5solid-dev \ + libkf5crash-dev \ + libkf5package-dev \ + libkf5plasma-dev \ + libpwquality-dev \ + libqt5webenginewidgets5 \ + qtwebengine5-dev diff --git a/ci/deps-fedora-qt6.sh b/ci/deps-fedora-qt6.sh new file mode 100755 index 000000000..aea4ba686 --- /dev/null +++ b/ci/deps-fedora-qt6.sh @@ -0,0 +1,18 @@ +#! /bin/sh +# +# Install dependencies for the nightly-fedora-qt6 build +# + +# Add the KF6 repo +dnf install -y 'dnf-command(copr)' +dnf copr enable -y @kdesig/kde-nightly-qt6 + +yum install -y bison flex git make cmake gcc-c++ ninja-build +yum install -y yaml-cpp-devel libpwquality-devel parted-devel python-devel gettext gettext-devel +yum install -y libicu-devel libatasmart-devel +# Qt6/KF6 dependencies +yum install -y qt6-qtbase-devel qt6-linguist qt6-qtbase-private-devel qt6-qtdeclarative-devel qt6-qtsvg-devel qt6-qttools-devel +yum install -y kf6-kcoreaddons-devel kf6-kdbusaddons-devel kf6-kcrash-devel +yum install -y polkit-qt6-1-devel appstream-qt-devel +# Runtime dependencies for QML modules +yum install -y kf6-kirigami2-devel qt6-qt5compat-devel diff --git a/.github/workflows/nightly-neon.sh b/ci/deps-neon.sh similarity index 94% rename from .github/workflows/nightly-neon.sh rename to ci/deps-neon.sh index 15fa4afe4..5ae1561c5 100755 --- a/.github/workflows/nightly-neon.sh +++ b/ci/deps-neon.sh @@ -3,7 +3,7 @@ # Install dependencies for the nightly-neon build # apt-get update -apt-get -y install git-core jq +apt-get -y install git-core jq ninja apt-get -y install \ build-essential \ cmake \ diff --git a/.github/workflows/nightly-opensuse-qt6.sh b/ci/deps-opensuse-qt6.sh similarity index 82% rename from .github/workflows/nightly-opensuse-qt6.sh rename to ci/deps-opensuse-qt6.sh index 58a176297..9687cea44 100755 --- a/.github/workflows/nightly-opensuse-qt6.sh +++ b/ci/deps-opensuse-qt6.sh @@ -4,9 +4,11 @@ # # Add a Qt6/KF6 repo zypper --non-interactive addrepo -G https://download.opensuse.org/repositories/home:krop:kf6/openSUSE_Tumbleweed/home:krop:kf6.repo +zypper --non-interactive addrepo -G https://download.opensuse.org/repositories/home:/krop:/Qt6:/Release/openSUSE_Tumbleweed/home:krop:Qt6:Release.repo + zypper --non-interactive refresh zypper --non-interactive up -zypper --non-interactive in git-core jq curl +zypper --non-interactive in git-core jq curl ninja # From deploycala.py zypper --non-interactive in bison flex git make cmake gcc-c++ zypper --non-interactive in yaml-cpp-devel libpwquality-devel parted-devel python-devel libboost_headers-devel libboost_python3-devel diff --git a/ci/deps-opensuse.sh b/ci/deps-opensuse.sh new file mode 100755 index 000000000..7f2bca5f1 --- /dev/null +++ b/ci/deps-opensuse.sh @@ -0,0 +1,42 @@ +#! /bin/sh +# +# Install dependencies for the nightly-opensuse build +# +zypper --non-interactive up +zypper --non-interactive in git-core jq curl ninja +# From deploycala.py +zypper --non-interactive in \ + "bison" \ + "flex" \ + "git" \ + "make" \ + "cmake" \ + "gcc-c++" +zypper --non-interactive in \ + "libqt5-qtbase-devel" \ + "libqt5-linguist-devel" \ + "libqt5-qtsvg-devel" \ + "libqt5-qtdeclarative-devel" \ + "libqt5-qtwebengine-devel" \ + "yaml-cpp-devel" \ + "libpolkit-qt5-1-devel" \ + "libpwquality-devel" \ + "parted-devel" \ + "python-devel" \ + "libboost_headers-devel" \ + "libboost_python3-devel" +zypper --non-interactive in \ + "extra-cmake-modules" \ + "kdbusaddons-devel" \ + "kservice-devel" \ + "kpackage-devel" \ + "kparts-devel" \ + "kcrash-devel" \ + "kpmcore-devel" \ + "plasma5-workspace-devel" \ + "plasma-framework-devel" +# Additional dependencies +zypper --non-interactive in \ + libicu-devel \ + libAppStreamQt-devel \ + libatasmart-devel diff --git a/lang/calamares_ar.ts b/lang/calamares_ar.ts index 6c744e4e8..97110143f 100644 --- a/lang/calamares_ar.ts +++ b/lang/calamares_ar.ts @@ -79,16 +79,11 @@ Blank Page - + صفحة فارغة Calamares::DebugWindow - - - Form - نموذج - GlobalStorage @@ -123,12 +118,12 @@ Crashes Calamares, so that Dr. Konqui can look at it. - + يُعطِّل كالاماري، حتى يتفقد د. كونكي الأمر. Reloads the stylesheet from the branding directory. - + يعيد تحميل صفحة الطُرز من الدليل المميز. @@ -556,11 +551,6 @@ The installer will quit and all changes will be lost. ChoicePage - - - Form - نموذج - Select storage de&vice: @@ -926,12 +916,12 @@ The installer will quit and all changes will be lost. - + Your passwords do not match! لا يوجد تطابق في كلمات السر! - + OK! @@ -1468,11 +1458,6 @@ The installer will quit and all changes will be lost. EncryptWidget - - - Form - نموذج - En&crypt system @@ -1578,11 +1563,6 @@ The installer will quit and all changes will be lost. FinishedPage - - - Form - نموذج - &Restart now @@ -1933,11 +1913,6 @@ The installer will quit and all changes will be lost. LicensePage - - - Form - نموذج - <h1>License Agreement</h1> @@ -2093,33 +2068,27 @@ The installer will quit and all changes will be lost. - - + + No partitions are defined. - - - + + Encrypted rootfs setup error - + Root partition %1 is LUKS but no passphrase has been set. - + Could not create LUKS key file for root partition %1. - - - Could not configure LUKS key file on partition %1. - - MachineIdJob @@ -2639,18 +2608,13 @@ The installer will quit and all changes will be lost. - + Password is empty PackageChooserPage - - - Form - نموذج - Product Name @@ -2692,11 +2656,6 @@ The installer will quit and all changes will be lost. Page_Keyboard - - - Form - نموذج - Keyboard Model: @@ -2710,11 +2669,6 @@ The installer will quit and all changes will be lost. Page_UserSetup - - - Form - نموذج - What is your name? @@ -2891,11 +2845,6 @@ The installer will quit and all changes will be lost. PartitionPage - - - Form - نموذج - Storage de&vice: @@ -3005,72 +2954,72 @@ The installer will quit and all changes will be lost. بعد: - + No EFI system partition configured لم يُضبط أيّ قسم نظام EFI - + EFI system partition configured incorrectly - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem. - + The filesystem must be mounted on <strong>%1</strong>. - + The filesystem must have type FAT32. - + The filesystem must be at least %1 MiB in size. - + The filesystem must have flag <strong>%1</strong> set. - + You can continue without setting up an EFI system partition but your system may fail to start. - + Option to use GPT on BIOS - + A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>%2</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. - + Boot partition not encrypted - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. - + has at least one disk device available. - + There are no partitions to install on. @@ -3091,11 +3040,6 @@ The installer will quit and all changes will be lost. PlasmaLnfPage - - - Form - نموذج - Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. @@ -3857,11 +3801,6 @@ Output: TrackingPage - - - Form - نموذج - Placeholder @@ -4023,11 +3962,6 @@ Output: WelcomePage - - - Form - الصيغة - diff --git a/lang/calamares_as.ts b/lang/calamares_as.ts index a2046c3e8..7699a0134 100644 --- a/lang/calamares_as.ts +++ b/lang/calamares_as.ts @@ -84,11 +84,6 @@ Calamares::DebugWindow - - - Form - ৰূপ - GlobalStorage @@ -548,11 +543,6 @@ The installer will quit and all changes will be lost. ChoicePage - - - Form - ৰূপ - Select storage de&vice: @@ -918,12 +908,12 @@ The installer will quit and all changes will be lost. কেৱল বৰ্ণ, সংখ্যা, underscore আৰু hyphenৰ হে মাত্ৰ অনুমতি আছে। - + Your passwords do not match! আপোনাৰ পাছৱৰ্ডকেইটাৰ মিল নাই! - + OK! @@ -1460,11 +1450,6 @@ The installer will quit and all changes will be lost. EncryptWidget - - - Form - ৰূপ - En&crypt system @@ -1570,11 +1555,6 @@ The installer will quit and all changes will be lost. FinishedPage - - - Form - ৰূপ - &Restart now @@ -1925,11 +1905,6 @@ The installer will quit and all changes will be lost. LicensePage - - - Form - ৰূপ - <h1>License Agreement</h1> @@ -2085,33 +2060,27 @@ The installer will quit and all changes will be lost. LUKS কি ফাইল কনফিগাৰ কৰক। - - + + No partitions are defined. কোনো বিভাজনৰ বৰ্ণনা দিয়া নাই। - - - + + Encrypted rootfs setup error এনক্ৰিপছন থকা rootfs চেত্ আপত ত্ৰুটি - + Root partition %1 is LUKS but no passphrase has been set. ৰুট বিভাজন %1 LUKS, কিন্তু পাসফ্রেজ ছেট কৰা হোৱা নাই। - + Could not create LUKS key file for root partition %1. %1 ৰুট বিভাজনৰ বাবে LUKS কি বনাৱ পৰা নগ'ল। - - - Could not configure LUKS key file on partition %1. - %1 বিভাজনত LUKS কি ফাইল কনফিগাৰ কৰিব পৰা নগ'ল। - MachineIdJob @@ -2597,18 +2566,13 @@ The installer will quit and all changes will be lost. অজ্ঞাত ক্ৰুটি - + Password is empty খালী পাছৱৰ্ড PackageChooserPage - - - Form - ৰূপ - Product Name @@ -2650,11 +2614,6 @@ The installer will quit and all changes will be lost. Page_Keyboard - - - Form - ৰূপ - Keyboard Model: @@ -2668,11 +2627,6 @@ The installer will quit and all changes will be lost. Page_UserSetup - - - Form - ৰূপ - What is your name? @@ -2849,11 +2803,6 @@ The installer will quit and all changes will be lost. PartitionPage - - - Form - ৰূপ - Storage de&vice: @@ -2963,72 +2912,72 @@ The installer will quit and all changes will be lost. পিছত: - + No EFI system partition configured কোনো EFI চিছটেম বিভাজন কনফিগাৰ কৰা হোৱা নাই - + EFI system partition configured incorrectly - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem. - + The filesystem must be mounted on <strong>%1</strong>. - + The filesystem must have type FAT32. - + The filesystem must be at least %1 MiB in size. - + The filesystem must have flag <strong>%1</strong> set. - + You can continue without setting up an EFI system partition but your system may fail to start. - + Option to use GPT on BIOS GPTৰ BIOSত ব্যৱহাৰৰ বাবে বিকল্প - + A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>%2</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. - + Boot partition not encrypted বুত্ বিভাজন এনক্ৰিপ্ত্ নহয় - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. এনক্ৰিপ্তেড ৰুট বিভাজনৰ সৈতে এটা বেলেগ বুট বিভাজন চেত্ আপ কৰা হৈছিল, কিন্তু বুট বিভাজন এনক্ৰিপ্তেড কৰা হোৱা নাই। <br/><br/>এইধৰণৰ চেত্ আপ সুৰক্ষিত নহয় কাৰণ গুৰুত্ব্পুৰ্ণ চিছটেম ফাইল আন্এনক্ৰিপ্তেড বিভাজনত ৰখা হয়। <br/>আপুনি বিচাৰিলে চলাই থাকিব পাৰে কিন্তু পিছ্ত চিছটেম আৰম্ভৰ সময়ত ফাইল চিছটেম খোলা যাব। <br/>বুট বিভাজন এনক্ৰিপ্ত্ কৰিবলৈ উভতি যাওক আৰু বিভাজন বনোৱা windowত <strong>Encrypt</strong> বাচনি কৰি আকৌ বনাওক। - + has at least one disk device available. অতি কমেও এখন ডিস্ক্ উপলব্ধ আছে। - + There are no partitions to install on. ইনস্তল কৰিবলৈ কোনো বিভাজন নাই। @@ -3049,11 +2998,6 @@ The installer will quit and all changes will be lost. PlasmaLnfPage - - - Form - ৰূপ - Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. @@ -3819,11 +3763,6 @@ Output: TrackingPage - - - Form - ৰূপ - Placeholder @@ -3985,11 +3924,6 @@ Output: WelcomePage - - - Form - ৰূপ - diff --git a/lang/calamares_ast.ts b/lang/calamares_ast.ts index d21300d4b..b058dd413 100644 --- a/lang/calamares_ast.ts +++ b/lang/calamares_ast.ts @@ -84,11 +84,6 @@ Calamares::DebugWindow - - - Form - Formulariu - GlobalStorage @@ -548,11 +543,6 @@ L'instalador va colar y van perdese tolos cambeos. ChoicePage - - - Form - Formulariu - Select storage de&vice: @@ -918,12 +908,12 @@ L'instalador va colar y van perdese tolos cambeos. - + Your passwords do not match! ¡Les contraseñes nun concasen! - + OK! @@ -1460,11 +1450,6 @@ L'instalador va colar y van perdese tolos cambeos. EncryptWidget - - - Form - Formulariu - En&crypt system @@ -1570,11 +1555,6 @@ L'instalador va colar y van perdese tolos cambeos. FinishedPage - - - Form - Formulariu - &Restart now @@ -1925,11 +1905,6 @@ L'instalador va colar y van perdese tolos cambeos. LicensePage - - - Form - Formulariu - <h1>License Agreement</h1> @@ -2085,33 +2060,27 @@ L'instalador va colar y van perdese tolos cambeos. - - + + No partitions are defined. - - - + + Encrypted rootfs setup error - + Root partition %1 is LUKS but no passphrase has been set. - + Could not create LUKS key file for root partition %1. - - - Could not configure LUKS key file on partition %1. - - MachineIdJob @@ -2595,18 +2564,13 @@ L'instalador va colar y van perdese tolos cambeos. Desconozse'l fallu - + Password is empty La contraseña ta balera PackageChooserPage - - - Form - Formulariu - Product Name @@ -2648,11 +2612,6 @@ L'instalador va colar y van perdese tolos cambeos. Page_Keyboard - - - Form - Formulariu - Keyboard Model: @@ -2666,11 +2625,6 @@ L'instalador va colar y van perdese tolos cambeos. Page_UserSetup - - - Form - Formulariu - What is your name? @@ -2847,11 +2801,6 @@ L'instalador va colar y van perdese tolos cambeos. PartitionPage - - - Form - Formulariu - Storage de&vice: @@ -2961,72 +2910,72 @@ L'instalador va colar y van perdese tolos cambeos. Dempués: - + No EFI system partition configured Nun se configuró nenguna partición del sistema EFI - + EFI system partition configured incorrectly - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem. - + The filesystem must be mounted on <strong>%1</strong>. - + The filesystem must have type FAT32. - + The filesystem must be at least %1 MiB in size. - + The filesystem must have flag <strong>%1</strong> set. - + You can continue without setting up an EFI system partition but your system may fail to start. - + Option to use GPT on BIOS - + A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>%2</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. - + Boot partition not encrypted La partición d'arrinque nun ta cifrada - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. Configuróse una partición d'arrinque xunto con una partición raigañu cifrada pero la partición d'arrinque nun ta cifrada.<br/><br/>Hai problemes de seguranza con esta triba de configuración porque los ficheros importantes del sistema caltiénense nuna partición ensin cifrar.<br/>Podríes siguir si quixeres pero'l desbloquéu del sistema de ficheros va asoceder más sero nel aniciu del sistema.<br/>Pa cifrar la partición raigañu, volvi p'atrás y recreala esbillando <strong>Cifrar</strong> na ventana de creación de particiones. - + has at least one disk device available. tien polo menos un preséu disponible d'almacenamientu - + There are no partitions to install on. Nun hai particiones nes qu'instalar. @@ -3047,11 +2996,6 @@ L'instalador va colar y van perdese tolos cambeos. PlasmaLnfPage - - - Form - Formulariu - Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. @@ -3819,11 +3763,6 @@ Salida: TrackingPage - - - Form - Formulariu - Placeholder @@ -3985,11 +3924,6 @@ Salida: WelcomePage - - - Form - Formulariu - diff --git a/lang/calamares_az.ts b/lang/calamares_az.ts index 5ea52917f..eb4896d80 100644 --- a/lang/calamares_az.ts +++ b/lang/calamares_az.ts @@ -84,11 +84,6 @@ Calamares::DebugWindow - - - Form - Format - GlobalStorage @@ -552,11 +547,6 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. ChoicePage - - - Form - Format - Select storage de&vice: @@ -922,12 +912,12 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.Yalnız kiçik hərflərdən, saylardan, alt cizgidən və defisdən istifadə oluna bilər. - + Your passwords do not match! Şifrənizin təkrarı eyni deyil! - + OK! OLDU! @@ -1464,11 +1454,6 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. EncryptWidget - - - Form - Format - En&crypt system @@ -1574,11 +1559,6 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. FinishedPage - - - Form - Formatlamaq - &Restart now @@ -1929,11 +1909,6 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. LicensePage - - - Form - Format - <h1>License Agreement</h1> @@ -2089,33 +2064,27 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.LUKS düymə faylını ayarlamaq. - - + + No partitions are defined. Heç bir bölmə müəyyən edilməyib. - - - + + Encrypted rootfs setup error Kök fayl sisteminin şifrələnməsi xətası - + Root partition %1 is LUKS but no passphrase has been set. %1 Kök bölməsi LUKS-dur lakin, şifrə təyin olunmayıb. - + Could not create LUKS key file for root partition %1. %1 kök bölməsi üçün LUKS düymə faylı yaradılmadı. - - - Could not configure LUKS key file on partition %1. - %1 bölməsində LUKS düymə faylı tənzimlənə bilmədi. - MachineIdJob @@ -2601,18 +2570,13 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.Naməlum xəta - + Password is empty Şifrə böşdur PackageChooserPage - - - Form - Format - Product Name @@ -2654,11 +2618,6 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. Page_Keyboard - - - Form - Format - Keyboard Model: @@ -2672,11 +2631,6 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. Page_UserSetup - - - Form - Format - What is your name? @@ -2853,11 +2807,6 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. PartitionPage - - - Form - Format - Storage de&vice: @@ -2968,72 +2917,72 @@ Lütfən bir birinci disk bölümünü çıxarın və əvəzinə genişləndiril Sonra: - + No EFI system partition configured EFI sistemi bölməsi tənzimlənməyib - + EFI system partition configured incorrectly EFİ sistem bölməsi səhv yaradıldı - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem. EFİ fayl sistemi %1 başladılması üçün lazımdır.<br/> <br/> EFİ fayl sistemini quraşdırmaq üçün geri qayıdın və uyğun fayl sistemini seçin və ya yaradın. - + The filesystem must be mounted on <strong>%1</strong>. Fayl sistemi burada qoşulmalıdır: <strong>%1</strong>. - + The filesystem must have type FAT32. Fayl sistemi FAT32 olmalıdır. - + The filesystem must be at least %1 MiB in size. Fayl sisteminin ölçüsü ən az %1 MiB olmalıdır. - + The filesystem must have flag <strong>%1</strong> set. Fayl sisteminə <strong>%1</strong> bayrağı təyin olunmalıdır. - + You can continue without setting up an EFI system partition but your system may fail to start. Siz, EFİ sistem bölməsini ayarlamadan davam edə bilərsiniz, lakin bu sisteminizin işə düşə bilməməsinə səbəb ola bilər. - + Option to use GPT on BIOS BIOS-da GPT istifadəsi seçimi - + A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>%2</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. GPT bölmə cədvəli bütün sistemlər üçün yaxşıdır. Bu quraşdırıcı BIOS sistemləri üçün də belə bir quruluşu dəstəkləyir.<br/><br/>BİOS-da GPT bölmələr cədvəlini ayarlamaq üçün (əgər bu edilməyibsə) geriyə qayıdın və bölmələr cədvəlini GPT-yə qurun, sonra isə <strong>%2</strong> bayrağı seçilmiş 8 MB-lıq formatlanmamış bölmə yaradın.<br/><br/>8 MB-lıq formatlanmamış bölmə GPT ilə BİOS sistemində %1 başlatmaq üçün lazımdır. - + Boot partition not encrypted Ön yükləyici bölməsi çifrələnməyib - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. Şifrəli bir kök bölməsi ilə birlikdə ayrı bir ön yükləyici bölməsi qurulub, ancaq ön yükləyici bölməsi şifrələnməyib.<br/><br/>Bu cür quraşdırma ilə bağlı təhlükəsizlik problemləri olur, çünki vacib sistem sənədləri şifrəsiz bölmədə saxlanılır.<br/>İstəyirsinizsə davam edə bilərsiniz, lakin, fayl sisteminin kilidi, sistem başladıldıqdan daha sonra açılacaqdır.<br/>Yükləmə hissəsini şifrələmək üçün geri qayıdın və bölmə yaratma pəncərəsində <strong>Şifrələmə</strong> menyusunu seçərək onu yenidən yaradın. - + has at least one disk device available. ən az bir disk qurğusu mövcuddur. - + There are no partitions to install on. Quraşdırmaq üçün bölmə yoxdur. @@ -3054,11 +3003,6 @@ Lütfən bir birinci disk bölümünü çıxarın və əvəzinə genişləndiril PlasmaLnfPage - - - Form - Format - Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. @@ -3826,11 +3770,6 @@ Output: TrackingPage - - - Form - Format - Placeholder @@ -3992,11 +3931,6 @@ Output: WelcomePage - - - Form - Format - diff --git a/lang/calamares_az_AZ.ts b/lang/calamares_az_AZ.ts index c8fe41381..395adc7ce 100644 --- a/lang/calamares_az_AZ.ts +++ b/lang/calamares_az_AZ.ts @@ -84,11 +84,6 @@ Calamares::DebugWindow - - - Form - Format - GlobalStorage @@ -552,11 +547,6 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. ChoicePage - - - Form - Format - Select storage de&vice: @@ -922,12 +912,12 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.Yalnız kiçik hərflərdən, saylardan, alt cizgidən və defisdən istifadə oluna bilər. - + Your passwords do not match! Şifrənizin təkrarı eyni deyil! - + OK! OLDU! @@ -1464,11 +1454,6 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. EncryptWidget - - - Form - Format - En&crypt system @@ -1574,11 +1559,6 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. FinishedPage - - - Form - Formatlamaq - &Restart now @@ -1929,11 +1909,6 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. LicensePage - - - Form - Format - <h1>License Agreement</h1> @@ -2089,33 +2064,27 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.LUKS düymə faylını ayarlamaq. - - + + No partitions are defined. Heç bir bölmə müəyyən edilməyib. - - - + + Encrypted rootfs setup error Kök fayl sisteminin şifrələnməsi xətası - + Root partition %1 is LUKS but no passphrase has been set. %1 Kök bölməsi LUKS-dur lakin, şifrə təyin olunmayıb. - + Could not create LUKS key file for root partition %1. %1 kök bölməsi üçün LUKS düymə faylı yaradılmadı. - - - Could not configure LUKS key file on partition %1. - %1 bölməsində LUKS düymə faylı tənzimlənə bilmədi. - MachineIdJob @@ -2601,18 +2570,13 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.Naməlum xəta - + Password is empty Şifrə böşdur PackageChooserPage - - - Form - Format - Product Name @@ -2654,11 +2618,6 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. Page_Keyboard - - - Form - Format - Keyboard Model: @@ -2672,11 +2631,6 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. Page_UserSetup - - - Form - Format - What is your name? @@ -2853,11 +2807,6 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. PartitionPage - - - Form - Format - Storage de&vice: @@ -2968,72 +2917,72 @@ Lütfən bir birinci disk bölümünü çıxarın və əvəzinə genişləndiril Sonra: - + No EFI system partition configured EFI sistemi bölməsi tənzimlənməyib - + EFI system partition configured incorrectly EFİ sistem bölməsi səhv yaradıldı - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem. EFİ fayl sistemi %1 başladılması üçün lazımdır.<br/> <br/> EFİ fayl sistemini quraşdırmaq üçün geri qayıdın və uyğun fayl sistemini seçin və ya yaradın. - + The filesystem must be mounted on <strong>%1</strong>. Fayl sistemi burada qoşulmalıdır: <strong>%1</strong>. - + The filesystem must have type FAT32. Fayl sistemi FAT32 olmalıdır. - + The filesystem must be at least %1 MiB in size. Fayl sisteminin ölçüsü ən az %1 MiB olmalıdır. - + The filesystem must have flag <strong>%1</strong> set. Fayl sisteminə <strong>%1</strong> bayrağı təyin olunmalıdır. - + You can continue without setting up an EFI system partition but your system may fail to start. Siz, EFİ sistem bölməsini ayarlamadan davam edə bilərsiniz, lakin bu sisteminizin işə düşə bilməməsinə səbəb ola bilər. - + Option to use GPT on BIOS BIOS-da GPT istifadəsi seçimi - + A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>%2</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. GPT bölmə cədvəli bütün sistemlər üçün yaxşıdır. Bu quraşdırıcı BIOS sistemləri üçün də belə bir quruluşu dəstəkləyir.<br/><br/>BİOS-da GPT bölmələr cədvəlini ayarlamaq üçün (əgər bu edilməyibsə) geriyə qayıdın və bölmələr cədvəlini GPT-yə qurun, sonra isə <strong>%2</strong> bayrağı seçilmiş 8 MB-lıq formatlanmamış bölmə yaradın.<br/><br/>8 MB-lıq formatlanmamış bölmə GPT ilə BİOS sistemində %1 başlatmaq üçün lazımdır. - + Boot partition not encrypted Ön yükləyici bölməsi çifrələnməyib - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. Şifrəli bir kök bölməsi ilə birlikdə ayrı bir ön yükləyici bölməsi qurulub, ancaq ön yükləyici bölməsi şifrələnməyib.<br/><br/>Bu cür quraşdırma ilə bağlı təhlükəsizlik problemləri olur, çünki vacib sistem sənədləri şifrəsiz bölmədə saxlanılır.<br/>İstəyirsinizsə davam edə bilərsiniz, lakin, fayl sisteminin kilidi, sistem başladıldıqdan daha sonra açılacaqdır.<br/>Yükləmə hissəsini şifrələmək üçün geri qayıdın və bölmə yaratma pəncərəsində <strong>Şifrələmə</strong> menyusunu seçərək onu yenidən yaradın. - + has at least one disk device available. ən az bir disk qurğusu mövcuddur. - + There are no partitions to install on. Quraşdırmaq üçün bölmə yoxdur. @@ -3054,11 +3003,6 @@ Lütfən bir birinci disk bölümünü çıxarın və əvəzinə genişləndiril PlasmaLnfPage - - - Form - Format - Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. @@ -3826,11 +3770,6 @@ Output: TrackingPage - - - Form - Format - Placeholder @@ -3992,11 +3931,6 @@ Output: WelcomePage - - - Form - Format - diff --git a/lang/calamares_be.ts b/lang/calamares_be.ts index d849eef68..666ef7539 100644 --- a/lang/calamares_be.ts +++ b/lang/calamares_be.ts @@ -84,11 +84,6 @@ Calamares::DebugWindow - - - Form - Форма - GlobalStorage @@ -555,11 +550,6 @@ The installer will quit and all changes will be lost. ChoicePage - - - Form - Форма - Select storage de&vice: @@ -925,12 +915,12 @@ The installer will quit and all changes will be lost. Толькі літары, лічбы, знакі падкрэслівання, працяжнікі. - + Your passwords do not match! Вашыя паролі не супадаюць! - + OK! Добра! @@ -1467,11 +1457,6 @@ The installer will quit and all changes will be lost. EncryptWidget - - - Form - Форма - En&crypt system @@ -1577,11 +1562,6 @@ The installer will quit and all changes will be lost. FinishedPage - - - Form - Форма - &Restart now @@ -1932,11 +1912,6 @@ The installer will quit and all changes will be lost. LicensePage - - - Form - Форма - <h1>License Agreement</h1> @@ -2092,33 +2067,27 @@ The installer will quit and all changes will be lost. Наладжванне файла ключа LUKS. - - + + No partitions are defined. Раздзелаў не вызначана. - - - + + Encrypted rootfs setup error Не ўдалося зашыфраваць rootfs - + Root partition %1 is LUKS but no passphrase has been set. Каранёвы раздзел %1 зашыфраваны як LUKS, але парольная фраза не была вызначаная. - + Could not create LUKS key file for root partition %1. Не ўдалося стварыць файл ключа LUKS для каранёвага раздзела %1. - - - Could not configure LUKS key file on partition %1. - Не ўдалося наладзіць файл ключа LUKS на каранёвым раздзеле %1. - MachineIdJob @@ -2622,18 +2591,13 @@ The installer will quit and all changes will be lost. Невядомая памылка - + Password is empty Пароль пусты PackageChooserPage - - - Form - Форма - Product Name @@ -2675,11 +2639,6 @@ The installer will quit and all changes will be lost. Page_Keyboard - - - Form - Форма - Keyboard Model: @@ -2693,11 +2652,6 @@ The installer will quit and all changes will be lost. Page_UserSetup - - - Form - Форма - What is your name? @@ -2874,11 +2828,6 @@ The installer will quit and all changes will be lost. PartitionPage - - - Form - Форма - Storage de&vice: @@ -2988,72 +2937,72 @@ The installer will quit and all changes will be lost. Пасля: - + No EFI system partition configured Няма наладжанага сістэмнага раздзела EFI - + EFI system partition configured incorrectly Сістэмны раздзел EFI наладжаны некарэктна - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem. Для таго, каб пачаць %1, патрабуецца сістэмны раздзел EFI.<br/><br/> Каб наладзіць сістэмны раздзел EFI, вярніцеся назад, абярыце альбо стварыце файлавую сістэму. - + The filesystem must be mounted on <strong>%1</strong>. Файлавая сістэма павінна быць прымантаваная на <strong>%1</strong>. - + The filesystem must have type FAT32. Файлавая сістэма павінна быць тыпу FAT32. - + The filesystem must be at least %1 MiB in size. Файлавая сістэма павмнна мець памер прынамсі %1 МіБ. - + The filesystem must have flag <strong>%1</strong> set. Файлавая сістэма павінна мець сцяг <strong>%1</strong>. - + You can continue without setting up an EFI system partition but your system may fail to start. Вы можаце працягнуць без наладжвання сістэмнага раздзела EFI, але ваша сістэма можа не запусціцца. - + Option to use GPT on BIOS Параметр для выкарыстання GPT у BIOS - + A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>%2</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. Табліца раздзелаў GPT - найлепшы варыянт для ўсіх сістэм. Гэтая праграма ўсталявання таксама падтрымлівае гэты варыянт і для BIOS.<br/><br/>Каб наладзіць GPT для BIOS (калі гэта яшчэ не зроблена), вярніцеся назад і абярыце табліцу раздзелаў GPT, пасля стварыце нефарматаваны раздзел памерам 8 МБ са сцягам <strong>%2</strong>.<br/><br/>Гэты раздзел патрэбны для запуску %1 у BIOS з GPT. - + Boot partition not encrypted Загрузачны раздзел не зашыфраваны - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. Уключана шыфраванне каранёвага раздзела, але выкарыстаны асобны загрузачны раздзел без шыфравання.<br/><br/>Пры такой канфігурацыі могуць узнікнуць праблемы з бяспекай, бо важныя сістэмныя даныя будуць захоўвацца на раздзеле без шыфравання.<br/>Вы можаце працягнуць, але файлавая сістэма разблакуецца падчас запуску сістэмы.<br/>Каб уключыць шыфраванне загрузачнага раздзела, вярніцеся назад і стварыце яго нанова, адзначыўшы <strong>Шыфраваць</strong> у акне стварэння раздзела. - + has at least one disk device available. ёсць прынамсі адна даступная дыскавая прылада. - + There are no partitions to install on. Няма раздзелаў для ўсталявання. @@ -3074,11 +3023,6 @@ The installer will quit and all changes will be lost. PlasmaLnfPage - - - Form - Форма - Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. @@ -3846,11 +3790,6 @@ Output: TrackingPage - - - Form - Форма - Placeholder @@ -4012,11 +3951,6 @@ Output: WelcomePage - - - Form - Форма - diff --git a/lang/calamares_bg.ts b/lang/calamares_bg.ts index 4ab32bb60..f6cb7b6f6 100644 --- a/lang/calamares_bg.ts +++ b/lang/calamares_bg.ts @@ -84,11 +84,6 @@ Calamares::DebugWindow - - - Form - Форма - GlobalStorage @@ -552,11 +547,6 @@ The installer will quit and all changes will be lost. ChoicePage - - - Form - Форма - Select storage de&vice: @@ -922,12 +912,12 @@ The installer will quit and all changes will be lost. Разрешени са само букви, цифри, долна черта и тире. - + Your passwords do not match! Паролите Ви не съвпадат! - + OK! OK! @@ -1464,11 +1454,6 @@ The installer will quit and all changes will be lost. EncryptWidget - - - Form - Форма - En&crypt system @@ -1574,11 +1559,6 @@ The installer will quit and all changes will be lost. FinishedPage - - - Form - Форма - &Restart now @@ -1929,11 +1909,6 @@ The installer will quit and all changes will be lost. LicensePage - - - Form - Форма - <h1>License Agreement</h1> @@ -2089,33 +2064,27 @@ The installer will quit and all changes will be lost. Конфигуриране на ключов файл LUKS. - - + + No partitions are defined. Няма зададени дялове. - - - + + Encrypted rootfs setup error Грешка при настройване на криптирана rootfs - + Root partition %1 is LUKS but no passphrase has been set. Root дял %1 е LUKS, но не е зададена парола. - + Could not create LUKS key file for root partition %1. Не можа да се създаде ключов файл LUKS за root дял %1. - - - Could not configure LUKS key file on partition %1. - Неуспешно конфигуриране на ключов файл на LUKS на дял %1. - MachineIdJob @@ -2601,18 +2570,13 @@ The installer will quit and all changes will be lost. Неизвестна грешка - + Password is empty Паролата е празна PackageChooserPage - - - Form - Форма - Product Name @@ -2654,11 +2618,6 @@ The installer will quit and all changes will be lost. Page_Keyboard - - - Form - Форма - Keyboard Model: @@ -2672,11 +2631,6 @@ The installer will quit and all changes will be lost. Page_UserSetup - - - Form - Форма - What is your name? @@ -2853,11 +2807,6 @@ The installer will quit and all changes will be lost. PartitionPage - - - Form - Форма - Storage de&vice: @@ -2967,72 +2916,72 @@ The installer will quit and all changes will be lost. След: - + No EFI system partition configured Няма конфигуриран EFI системен дял - + EFI system partition configured incorrectly Системният дял EFI е конфигуриран неправилно - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem. За стартирането на %1 е необходим системен дял EFI.<br/><br/>За да конфигурирате EFI системен дял, върнете се назад и изберете или създайте подходяща файлова система. - + The filesystem must be mounted on <strong>%1</strong>. Файловата система трябва да бъде монтирана на <strong>%1 </strong>. - + The filesystem must have type FAT32. Файловата система трябва да бъде от тип FAT32. - + The filesystem must be at least %1 MiB in size. Файловата система трябва да е с размер поне %1 MiB. - + The filesystem must have flag <strong>%1</strong> set. Файловата система трябва да има флаг <strong>%1 </strong>. - + You can continue without setting up an EFI system partition but your system may fail to start. Можете да продължите, без да настроите EFI системен дял, но вашата системаможе да не успее да се стартира. - + Option to use GPT on BIOS Опция за използване на GPT на BIOS - + A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>%2</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. Таблица с дялове на GPT е най -добрият вариант за всички системи. Този инсталаторподдържа такава настройка и за BIOS системи. <br/><br/> За конфигуриране на GPT таблица с дяловете в BIOS (ако вече не сте го направили), върнете се назад и задайте таблица на дяловете на GPT, след което създайте 8 MB неформатиран дял сактивиран <strong>%2 </strong> флаг. <br/><br/> Необходим е 8 MB дял за стартиране на %1 на BIOS система с GPT. - + Boot partition not encrypted Липсва криптиране на дял за начално зареждане - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. Отделен дял за начално зареждане беше създаден заедно с криптиран root дял, но не беше криптиран. <br/><br/>При този вид настройка има проблеми със сигурността, тъй като важни системни файлове се съхраняват на некриптиран дял.<br/> Можете да продължите, ако желаете, но отключването на файловата система ще се случи по -късно по време на стартиране на системата. <br/> За да криптирате дялът заначално зареждане, върнете се назад и го създайте отново, избирайки<strong> Криптиране </strong> в прозореца за създаване на дяла. - + has at least one disk device available. има поне едно дисково устройство. - + There are no partitions to install on. Няма дялове, върху които да се извърши инсталирането. @@ -3053,11 +3002,6 @@ The installer will quit and all changes will be lost. PlasmaLnfPage - - - Form - Форма - Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. @@ -3825,11 +3769,6 @@ Output: TrackingPage - - - Form - Форма - Placeholder @@ -3991,11 +3930,6 @@ Output: WelcomePage - - - Form - Форма - diff --git a/lang/calamares_bn.ts b/lang/calamares_bn.ts index 7fc466185..0c9119d8b 100644 --- a/lang/calamares_bn.ts +++ b/lang/calamares_bn.ts @@ -84,11 +84,6 @@ Calamares::DebugWindow - - - Form - ফর্ম - GlobalStorage @@ -547,11 +542,6 @@ The installer will quit and all changes will be lost. ChoicePage - - - Form - ফর্ম - Select storage de&vice: @@ -917,12 +907,12 @@ The installer will quit and all changes will be lost. - + Your passwords do not match! আপনার পাসওয়ার্ড মেলে না! - + OK! @@ -1459,11 +1449,6 @@ The installer will quit and all changes will be lost. EncryptWidget - - - Form - ফর্ম - En&crypt system @@ -1569,11 +1554,6 @@ The installer will quit and all changes will be lost. FinishedPage - - - Form - ফর্ম - &Restart now @@ -1924,11 +1904,6 @@ The installer will quit and all changes will be lost. LicensePage - - - Form - ফর্ম - <h1>License Agreement</h1> @@ -2084,33 +2059,27 @@ The installer will quit and all changes will be lost. - - + + No partitions are defined. - - - + + Encrypted rootfs setup error - + Root partition %1 is LUKS but no passphrase has been set. - + Could not create LUKS key file for root partition %1. - - - Could not configure LUKS key file on partition %1. - - MachineIdJob @@ -2594,18 +2563,13 @@ The installer will quit and all changes will be lost. - + Password is empty PackageChooserPage - - - Form - ফর্ম - Product Name @@ -2647,11 +2611,6 @@ The installer will quit and all changes will be lost. Page_Keyboard - - - Form - ফর্ম - Keyboard Model: @@ -2665,11 +2624,6 @@ The installer will quit and all changes will be lost. Page_UserSetup - - - Form - ফর্ম - What is your name? @@ -2846,11 +2800,6 @@ The installer will quit and all changes will be lost. PartitionPage - - - Form - ফর্ম - Storage de&vice: @@ -2960,72 +2909,72 @@ The installer will quit and all changes will be lost. পরে: - + No EFI system partition configured - + EFI system partition configured incorrectly - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem. - + The filesystem must be mounted on <strong>%1</strong>. - + The filesystem must have type FAT32. - + The filesystem must be at least %1 MiB in size. - + The filesystem must have flag <strong>%1</strong> set. - + You can continue without setting up an EFI system partition but your system may fail to start. - + Option to use GPT on BIOS - + A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>%2</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. - + Boot partition not encrypted - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. - + has at least one disk device available. - + There are no partitions to install on. @@ -3046,11 +2995,6 @@ The installer will quit and all changes will be lost. PlasmaLnfPage - - - Form - ফর্ম - Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. @@ -3812,11 +3756,6 @@ Output: TrackingPage - - - Form - ফর্ম - Placeholder @@ -3978,11 +3917,6 @@ Output: WelcomePage - - - Form - ফর্ম - diff --git a/lang/calamares_bqi.ts b/lang/calamares_bqi.ts index b915d4347..d7b59307c 100644 --- a/lang/calamares_bqi.ts +++ b/lang/calamares_bqi.ts @@ -84,11 +84,6 @@ Calamares::DebugWindow - - - Form - - GlobalStorage @@ -546,11 +541,6 @@ The installer will quit and all changes will be lost. ChoicePage - - - Form - - Select storage de&vice: @@ -916,12 +906,12 @@ The installer will quit and all changes will be lost. - + Your passwords do not match! - + OK! @@ -1458,11 +1448,6 @@ The installer will quit and all changes will be lost. EncryptWidget - - - Form - - En&crypt system @@ -1568,11 +1553,6 @@ The installer will quit and all changes will be lost. FinishedPage - - - Form - - &Restart now @@ -1923,11 +1903,6 @@ The installer will quit and all changes will be lost. LicensePage - - - Form - - <h1>License Agreement</h1> @@ -2083,33 +2058,27 @@ The installer will quit and all changes will be lost. - - + + No partitions are defined. - - - + + Encrypted rootfs setup error - + Root partition %1 is LUKS but no passphrase has been set. - + Could not create LUKS key file for root partition %1. - - - Could not configure LUKS key file on partition %1. - - MachineIdJob @@ -2593,18 +2562,13 @@ The installer will quit and all changes will be lost. - + Password is empty PackageChooserPage - - - Form - - Product Name @@ -2646,11 +2610,6 @@ The installer will quit and all changes will be lost. Page_Keyboard - - - Form - - Keyboard Model: @@ -2664,11 +2623,6 @@ The installer will quit and all changes will be lost. Page_UserSetup - - - Form - - What is your name? @@ -2845,11 +2799,6 @@ The installer will quit and all changes will be lost. PartitionPage - - - Form - - Storage de&vice: @@ -2959,72 +2908,72 @@ The installer will quit and all changes will be lost. - + No EFI system partition configured - + EFI system partition configured incorrectly - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem. - + The filesystem must be mounted on <strong>%1</strong>. - + The filesystem must have type FAT32. - + The filesystem must be at least %1 MiB in size. - + The filesystem must have flag <strong>%1</strong> set. - + You can continue without setting up an EFI system partition but your system may fail to start. - + Option to use GPT on BIOS - + A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>%2</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. - + Boot partition not encrypted - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. - + has at least one disk device available. - + There are no partitions to install on. @@ -3045,11 +2994,6 @@ The installer will quit and all changes will be lost. PlasmaLnfPage - - - Form - - Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. @@ -3811,11 +3755,6 @@ Output: TrackingPage - - - Form - - Placeholder @@ -3977,11 +3916,6 @@ Output: WelcomePage - - - Form - - diff --git a/lang/calamares_ca.ts b/lang/calamares_ca.ts index 0cc7c9f2d..484fd57e6 100644 --- a/lang/calamares_ca.ts +++ b/lang/calamares_ca.ts @@ -84,11 +84,6 @@ Calamares::DebugWindow - - - Form - Formulari - GlobalStorage @@ -552,11 +547,6 @@ L'instal·lador es tancarà i tots els canvis es perdran. ChoicePage - - - Form - Formulari - Select storage de&vice: @@ -922,12 +912,12 @@ L'instal·lador es tancarà i tots els canvis es perdran. Només es permeten lletres, números, ratlles baixes i guions. - + Your passwords do not match! Les contrasenyes no coincideixen! - + OK! D'acord! @@ -1464,11 +1454,6 @@ L'instal·lador es tancarà i tots els canvis es perdran. EncryptWidget - - - Form - Formulari - En&crypt system @@ -1574,11 +1559,6 @@ L'instal·lador es tancarà i tots els canvis es perdran. FinishedPage - - - Form - Formulari - &Restart now @@ -1929,11 +1909,6 @@ L'instal·lador es tancarà i tots els canvis es perdran. LicensePage - - - Form - Formulari - <h1>License Agreement</h1> @@ -2089,33 +2064,27 @@ L'instal·lador es tancarà i tots els canvis es perdran. Es configura el fitxer de clau LUKS. - - + + No partitions are defined. No s'ha definit cap partició. - - - + + Encrypted rootfs setup error Error de configuració de rootfs encriptat. - + Root partition %1 is LUKS but no passphrase has been set. La partició d'arrel %1 és LUKS però no se n'ha establert cap contrasenya. - + Could not create LUKS key file for root partition %1. No s'ha pogut crear el fitxer de clau de LUKS per a la partició d'arrel %1. - - - Could not configure LUKS key file on partition %1. - No s'ha pogut configurar el fitxer de clau de LUKS a la partició %1. - MachineIdJob @@ -2601,18 +2570,13 @@ per desplaçar-s'hi i useu els botons +/- per fer ampliar-lo o reduir-lo, o bé Error desconegut - + Password is empty La contrasenya és buida. PackageChooserPage - - - Form - Formulari - Product Name @@ -2654,11 +2618,6 @@ per desplaçar-s'hi i useu els botons +/- per fer ampliar-lo o reduir-lo, o bé Page_Keyboard - - - Form - Formulari - Keyboard Model: @@ -2672,11 +2631,6 @@ per desplaçar-s'hi i useu els botons +/- per fer ampliar-lo o reduir-lo, o bé Page_UserSetup - - - Form - Formulari - What is your name? @@ -2853,11 +2807,6 @@ per desplaçar-s'hi i useu els botons +/- per fer ampliar-lo o reduir-lo, o bé PartitionPage - - - Form - Formulari - Storage de&vice: @@ -2967,72 +2916,72 @@ per desplaçar-s'hi i useu els botons +/- per fer ampliar-lo o reduir-lo, o bé Després: - + No EFI system partition configured No hi ha cap partició EFI de sistema configurada - + EFI system partition configured incorrectly Partició de sistema EFI configurada incorrectament - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem. Cal una partició de sistema EFI per iniciar %1. <br/><br/>Per configurar-ne una, torneu enrere i seleccioneu o creeu un sistema de fitxers adequat. - + The filesystem must be mounted on <strong>%1</strong>. El sistema de fitxers ha d'estar muntat a <strong>%1</strong>. - + The filesystem must have type FAT32. El sistema de fitxers ha de ser del tipus FAT32. - + The filesystem must be at least %1 MiB in size. El sistema de fitxers ha de tenir un mínim de %1 MiB. - + The filesystem must have flag <strong>%1</strong> set. El sistema de fitxers ha de tenir la bandera <strong>%1</strong> establerta. - + You can continue without setting up an EFI system partition but your system may fail to start. Podeu continuar sense configurar una partició del sistema EFI, però és possible que el sistema no s'iniciï. - + Option to use GPT on BIOS Opció per usar GPT amb BIOS - + A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>%2</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. La millor opció per a tots els sistemes és una taula de particions GPT. Aquest instal·lador també admet aquesta configuració per a sistemes BIOS.<br/><br/>Per configurar una taula de particions GPT en un sistema BIOS, (si no s'ha fet ja) torneu enrere i establiu la taula de particions a GPT, després creeu una partició sense formatar de 8 MB amb la bandera <strong>%2</strong> habilitada.<br/><br/>Cal una partició sense format de 8 MB per iniciar %1 en un sistema BIOS amb GPT. - + Boot partition not encrypted Partició d'arrencada sense encriptar - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. S'ha establert una partició d'arrencada separada conjuntament amb una partició d'arrel encriptada, però la partició d'arrencada no està encriptada.<br/><br/>Hi ha assumptes de seguretat amb aquest tipus de configuració, perquè hi ha fitxers del sistema importants en una partició no encriptada.<br/>Podeu continuar, si així ho desitgeu, però el desbloqueig del sistema de fitxers succeirà després, durant l'inici del sistema.<br/>Per encriptar la partició d'arrencada, torneu enrere i torneu-la a crear seleccionant <strong>Encripta</strong> a la finestra de creació de la partició. - + has at least one disk device available. tingui com a mínim un dispositiu de disc disponible. - + There are no partitions to install on. No hi ha particions per fer-hi una instal·lació. @@ -3053,11 +3002,6 @@ per desplaçar-s'hi i useu els botons +/- per fer ampliar-lo o reduir-lo, o bé PlasmaLnfPage - - - Form - Formulari - Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. @@ -3825,11 +3769,6 @@ La configuració pot continuar, però algunes característiques podrien estar in TrackingPage - - - Form - Formulari - Placeholder @@ -3991,11 +3930,6 @@ La configuració pot continuar, però algunes característiques podrien estar in WelcomePage - - - Form - Formulari - diff --git a/lang/calamares_ca@valencia.ts b/lang/calamares_ca@valencia.ts index deb76e363..60d175867 100644 --- a/lang/calamares_ca@valencia.ts +++ b/lang/calamares_ca@valencia.ts @@ -84,11 +84,6 @@ Calamares::DebugWindow - - - Form - Formulari - GlobalStorage @@ -548,11 +543,6 @@ L'instal·lador es tancarà i tots els canvis es perdran. ChoicePage - - - Form - Formulari - Select storage de&vice: @@ -918,12 +908,12 @@ L'instal·lador es tancarà i tots els canvis es perdran. Només es permeten lletres, números, ratlles baixes i guions. - + Your passwords do not match! Les contrasenyes no coincideixen. - + OK! @@ -1460,11 +1450,6 @@ L'instal·lador es tancarà i tots els canvis es perdran. EncryptWidget - - - Form - Formulari - En&crypt system @@ -1570,11 +1555,6 @@ L'instal·lador es tancarà i tots els canvis es perdran. FinishedPage - - - Form - Formulari - &Restart now @@ -1925,11 +1905,6 @@ L'instal·lador es tancarà i tots els canvis es perdran. LicensePage - - - Form - Formulari - <h1>License Agreement</h1> @@ -2085,33 +2060,27 @@ L'instal·lador es tancarà i tots els canvis es perdran. S'està configurant el fitxer de clau LUKS. - - + + No partitions are defined. No s'ha definit cap partició. - - - + + Encrypted rootfs setup error S'ha produït un error de configuració del rootfs encriptat. - + Root partition %1 is LUKS but no passphrase has been set. La partició d'arrel %1 és LUKS, però no se n'ha establit cap contrasenya. - + Could not create LUKS key file for root partition %1. No s'ha pogut crear el fitxer de clau de LUKS per a la partició d'arrel %1. - - - Could not configure LUKS key file on partition %1. - No s'ha pogut configurar el fitxer de clau de LUKS en la partició %1. - MachineIdJob @@ -2597,18 +2566,13 @@ per a desplaçar-s'hi i useu els botons +/- per a ampliar-lo o reduir-lo, o bé S'ha produït un error desconegut - + Password is empty La contrasenya està buida. PackageChooserPage - - - Form - Formulari - Product Name @@ -2650,11 +2614,6 @@ per a desplaçar-s'hi i useu els botons +/- per a ampliar-lo o reduir-lo, o bé Page_Keyboard - - - Form - Formulari - Keyboard Model: @@ -2668,11 +2627,6 @@ per a desplaçar-s'hi i useu els botons +/- per a ampliar-lo o reduir-lo, o bé Page_UserSetup - - - Form - Formulari - What is your name? @@ -2849,11 +2803,6 @@ per a desplaçar-s'hi i useu els botons +/- per a ampliar-lo o reduir-lo, o bé PartitionPage - - - Form - Formulari - Storage de&vice: @@ -2963,72 +2912,72 @@ per a desplaçar-s'hi i useu els botons +/- per a ampliar-lo o reduir-lo, o bé Després: - + No EFI system partition configured No hi ha cap partició EFI de sistema configurada - + EFI system partition configured incorrectly - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem. - + The filesystem must be mounted on <strong>%1</strong>. - + The filesystem must have type FAT32. - + The filesystem must be at least %1 MiB in size. - + The filesystem must have flag <strong>%1</strong> set. - + You can continue without setting up an EFI system partition but your system may fail to start. - + Option to use GPT on BIOS Opció per a usar GPT amb BIOS - + A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>%2</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. - + Boot partition not encrypted Partició d'arrancada sense encriptar - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. S'ha establit una partició d'arrancada separada conjuntament amb una partició d'arrel encriptada, però la partició d'arrancada no està encriptada.<br/><br/>Hi ha qüestions de seguretat amb aquest tipus de configuració, perquè hi ha fitxers del sistema importants en una partició no encriptada.<br/>Podeu continuar, si així ho desitgeu, però el desbloqueig del sistema de fitxers tindrà lloc després, durant l'inici del sistema.<br/>Per a encriptar la partició d'arrancada, torneu arrere i torneu-la a crear seleccionant <strong>Encripta</strong> en la finestra de creació de la partició. - + has at least one disk device available. té com a mínim un dispositiu de disc disponible. - + There are no partitions to install on. No hi ha particions per a fer-hi una instal·lació. @@ -3049,11 +2998,6 @@ per a desplaçar-s'hi i useu els botons +/- per a ampliar-lo o reduir-lo, o bé PlasmaLnfPage - - - Form - Formulari - Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. @@ -3821,11 +3765,6 @@ La configuració pot continuar, però és possible que algunes característiques TrackingPage - - - Form - Formulari - Placeholder @@ -3987,11 +3926,6 @@ La configuració pot continuar, però és possible que algunes característiques WelcomePage - - - Form - Formulari - diff --git a/lang/calamares_cs_CZ.ts b/lang/calamares_cs_CZ.ts index d5de8c02d..4b2d79b15 100644 --- a/lang/calamares_cs_CZ.ts +++ b/lang/calamares_cs_CZ.ts @@ -84,11 +84,6 @@ Calamares::DebugWindow - - - Form - Formulář - GlobalStorage @@ -556,11 +551,6 @@ Instalační program bude ukončen a všechny změny ztraceny. ChoicePage - - - Form - Formulář - Select storage de&vice: @@ -926,12 +916,12 @@ Instalační program bude ukončen a všechny změny ztraceny. Je možné použít pouze písmena, číslice, podtržítko a spojovník. - + Your passwords do not match! Zadání hesla se neshodují! - + OK! OK! @@ -1468,11 +1458,6 @@ Instalační program bude ukončen a všechny změny ztraceny. EncryptWidget - - - Form - Formulář - En&crypt system @@ -1578,11 +1563,6 @@ Instalační program bude ukončen a všechny změny ztraceny. FinishedPage - - - Form - Formulář - &Restart now @@ -1933,11 +1913,6 @@ Instalační program bude ukončen a všechny změny ztraceny. LicensePage - - - Form - Formulář - <h1>License Agreement</h1> @@ -2093,33 +2068,27 @@ Instalační program bude ukončen a všechny změny ztraceny. Nastavování souboru s klíčem pro LUKS šifrování. - - + + No partitions are defined. Nejsou definovány žádné oddíly. - - - + + Encrypted rootfs setup error Chyba nastavení šifrovaného kořenového oddílu - + Root partition %1 is LUKS but no passphrase has been set. Kořenový oddíl %1 je LUKS, ale nebyla nastavena žádná heslová fráze. - + Could not create LUKS key file for root partition %1. Nedaří se vytvořit LUKS klíč pro kořenový oddíl %1. - - - Could not configure LUKS key file on partition %1. - Nedaří se nastavit LUKS klíč pro oddíl %1. - MachineIdJob @@ -2623,18 +2592,13 @@ Instalační program bude ukončen a všechny změny ztraceny. Neznámá chyba - + Password is empty Heslo není vyplněné PackageChooserPage - - - Form - Formulář - Product Name @@ -2676,11 +2640,6 @@ Instalační program bude ukončen a všechny změny ztraceny. Page_Keyboard - - - Form - Formulář - Keyboard Model: @@ -2694,11 +2653,6 @@ Instalační program bude ukončen a všechny změny ztraceny. Page_UserSetup - - - Form - Formulář - What is your name? @@ -2875,11 +2829,6 @@ Instalační program bude ukončen a všechny změny ztraceny. PartitionPage - - - Form - Formulář - Storage de&vice: @@ -2989,72 +2938,72 @@ Instalační program bude ukončen a všechny změny ztraceny. Potom: - + No EFI system partition configured Není nastavený žádný EFI systémový oddíl - + EFI system partition configured incorrectly EFI systémový oddíl není nastaven správně - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem. Aby bylo možné spouštět %1, je zapotřebí EFI systémový oddíl.<br/><br/>Takový nastavíte tak, že se vrátíte zpět a vyberete nebo vytvoříte příhodný souborový systém. - + The filesystem must be mounted on <strong>%1</strong>. Je třeba, aby souborový systém byl připojený na <strong>%1</strong>. - + The filesystem must have type FAT32. Je třeba, aby souborový systém byl typu FAT32. - + The filesystem must be at least %1 MiB in size. Je třeba, aby souborový systém byl alespoň %1 MiB velký. - + The filesystem must have flag <strong>%1</strong> set. Je třeba, aby souborový systém měl nastavený příznak <strong>%1</strong>. - + You can continue without setting up an EFI system partition but your system may fail to start. Je možné pokračovat bez vytvoření EFI systémového oddílu, ale může se stát, že váš systém tím nenastartuje. - + Option to use GPT on BIOS Volba použít GPT i pro BIOS zavádění (MBR) - + A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>%2</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. Tabulka oddílů GPT je nejlepší volbou pro všechny systémy. Tento instalační program podporuje toto nastavení i pro systémy BIOS.<br/><br/>Chcete-li nakonfigurovat tabulku oddílů GPT v systému BIOS (pokud jste tak již neučinili), vraťte se a nastavte tabulku oddílů na GPT, dále vytvořte 8 MB nenaformátovaný oddíl <strong>%2</strong> s povoleným příznakem.<br/><br/>Neformátovaný oddíl o velikosti 8 MB je nutný ke spuštění %1 v systému BIOS s GPT. - + Boot partition not encrypted Zaváděcí oddíl není šifrován - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. Kromě šifrovaného kořenového oddílu byl vytvořen i nešifrovaný oddíl zavaděče.<br/><br/>To by mohl být bezpečnostní problém, protože na nešifrovaném oddílu jsou důležité soubory systému.<br/>Pokud chcete, můžete pokračovat, ale odemykání souborového systému bude probíhat později při startu systému.<br/>Pro zašifrování oddílu zavaděče se vraťte a vytvořte ho vybráním možnosti <strong>Šifrovat</strong> v okně při vytváření oddílu. - + has at least one disk device available. má k dispozici alespoň jedno zařízení pro ukládání dat. - + There are no partitions to install on. Nejsou zde žádné oddíly na které by se dalo nainstalovat. @@ -3075,11 +3024,6 @@ Instalační program bude ukončen a všechny změny ztraceny. PlasmaLnfPage - - - Form - Form - Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. @@ -3847,11 +3791,6 @@ Výstup: TrackingPage - - - Form - Form - Placeholder @@ -4013,11 +3952,6 @@ Výstup: WelcomePage - - - Form - Formulář - diff --git a/lang/calamares_da.ts b/lang/calamares_da.ts index 639930dbb..1e07eeed0 100644 --- a/lang/calamares_da.ts +++ b/lang/calamares_da.ts @@ -84,11 +84,6 @@ Calamares::DebugWindow - - - Form - Formular - GlobalStorage @@ -548,11 +543,6 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt. ChoicePage - - - Form - Formular - Select storage de&vice: @@ -918,12 +908,12 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.Det er kun tilladt at bruge bogstaver, tal, understregning og bindestreg. - + Your passwords do not match! Dine adgangskoder er ikke ens! - + OK! @@ -1460,11 +1450,6 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt. EncryptWidget - - - Form - Formular - En&crypt system @@ -1570,11 +1555,6 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt. FinishedPage - - - Form - Formular - &Restart now @@ -1925,11 +1905,6 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt. LicensePage - - - Form - Formular - <h1>License Agreement</h1> @@ -2085,33 +2060,27 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.Konfigurerer LUKS-nøglefil. - - + + No partitions are defined. Der er ikke defineret nogen partitioner. - - - + + Encrypted rootfs setup error Fejl ved opsætning af krypteret rootfs - + Root partition %1 is LUKS but no passphrase has been set. Rodpartitionen %1 er LUKS men der er ikke indstillet nogen adgangskode. - + Could not create LUKS key file for root partition %1. Kunne ikke oprette LUKS-nøglefil for rodpartitionen %1. - - - Could not configure LUKS key file on partition %1. - Kunne ikke konfigurere LUKS-nøglefil på partitionen %1. - MachineIdJob @@ -2597,18 +2566,13 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.Ukendt fejl - + Password is empty Adgangskoden er tom PackageChooserPage - - - Form - Formular - Product Name @@ -2650,11 +2614,6 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt. Page_Keyboard - - - Form - Formular - Keyboard Model: @@ -2668,11 +2627,6 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt. Page_UserSetup - - - Form - Formular - What is your name? @@ -2849,11 +2803,6 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt. PartitionPage - - - Form - Formular - Storage de&vice: @@ -2963,72 +2912,72 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.Efter: - + No EFI system partition configured Der er ikke konfigureret nogen EFI-systempartition - + EFI system partition configured incorrectly - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem. - + The filesystem must be mounted on <strong>%1</strong>. - + The filesystem must have type FAT32. - + The filesystem must be at least %1 MiB in size. - + The filesystem must have flag <strong>%1</strong> set. - + You can continue without setting up an EFI system partition but your system may fail to start. - + Option to use GPT on BIOS Valgmulighed til at bruge GPT på BIOS - + A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>%2</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. - + Boot partition not encrypted Bootpartition ikke krypteret - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. En separat bootpartition blev opsat sammen med en krypteret rodpartition, men bootpartitionen er ikke krypteret.<br/><br/>Der er sikkerhedsmæssige bekymringer med denne slags opsætning, da vigtige systemfiler er gemt på en ikke-krypteret partition.<br/>Du kan fortsætte hvis du vil, men oplåsning af filsystemet sker senere under systemets opstart.<br/>For at kryptere bootpartitionen skal du gå tilbage og oprette den igen, vælge <strong>Kryptér</strong> i partitionsoprettelsesvinduet. - + has at least one disk device available. har mindst én tilgængelig diskenhed. - + There are no partitions to install on. Der er ikke nogen partitioner at installere på. @@ -3049,11 +2998,6 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt. PlasmaLnfPage - - - Form - Formular - Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. @@ -3822,11 +3766,6 @@ setting TrackingPage - - - Form - Formular - Placeholder @@ -3988,11 +3927,6 @@ setting WelcomePage - - - Form - Formular - diff --git a/lang/calamares_de.ts b/lang/calamares_de.ts index b6bbfe9cb..f7a2caeb0 100644 --- a/lang/calamares_de.ts +++ b/lang/calamares_de.ts @@ -84,11 +84,6 @@ Calamares::DebugWindow - - - Form - Formular - GlobalStorage @@ -553,11 +548,6 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. ChoicePage - - - Form - Form - Select storage de&vice: @@ -923,12 +913,12 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. Es sind nur Buchstaben, Zahlen, Unter- und Bindestriche erlaubt. - + Your passwords do not match! Ihre Passwörter stimmen nicht überein! - + OK! OK! @@ -1465,11 +1455,6 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. EncryptWidget - - - Form - Formular - En&crypt system @@ -1575,11 +1560,6 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. FinishedPage - - - Form - Form - &Restart now @@ -1930,11 +1910,6 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. LicensePage - - - Form - Formular - <h1>License Agreement</h1> @@ -2090,33 +2065,27 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. Konfiguriere LUKS-Schlüsseldatei. - - + + No partitions are defined. Keine Partitionen definiert. - - - + + Encrypted rootfs setup error Fehler bei der Einrichtung der verschlüsselten Root-Partition - + Root partition %1 is LUKS but no passphrase has been set. Root-Partition %1 ist mit LUKS verschlüsselt, aber es wurde kein Passwort gesetzt. - + Could not create LUKS key file for root partition %1. Konnte die LUKS-Schlüsseldatei für die Root-Partition %1 nicht erstellen. - - - Could not configure LUKS key file on partition %1. - Die LUKS-Schlüsseldatei konnte nicht auf Partition %1 eingerichtet werden. - MachineIdJob @@ -2602,18 +2571,13 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. Unbekannter Fehler - + Password is empty Passwort nicht vergeben PackageChooserPage - - - Form - Formular - Product Name @@ -2655,11 +2619,6 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. Page_Keyboard - - - Form - Formular - Keyboard Model: @@ -2673,11 +2632,6 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. Page_UserSetup - - - Form - Formular - What is your name? @@ -2854,11 +2808,6 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. PartitionPage - - - Form - Form - Storage de&vice: @@ -2968,72 +2917,72 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. Nachher: - + No EFI system partition configured Keine EFI-Systempartition konfiguriert - + EFI system partition configured incorrectly EFI Systempartition falsch konfiguriert - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem. Eine EFI Systempartition ist notwendig, um %1 zu starten.<br/><br/>Um eine EFI Systempartition zu konfigurieren, gehen Sie zurück und wählen oder erstellen Sie ein geeignetes Dateisystem. - + The filesystem must be mounted on <strong>%1</strong>. Das Dateisystem muss eingehängt sein unter <strong>%1</strong>. - + The filesystem must have type FAT32. Das Dateisystem muss vom Typ FAT32 sein. - + The filesystem must be at least %1 MiB in size. Das Dateisystem muss mindestens %1 MiB groß sein. - + The filesystem must have flag <strong>%1</strong> set. Das Dateisystem muss die Markierung <strong>%1</strong> tragen. - + You can continue without setting up an EFI system partition but your system may fail to start. Sie können fortfahren, ohne eine EFI-Systempartition einzurichten, aber Ihr installiertes System wird möglicherweise nicht starten. - + Option to use GPT on BIOS Option zur Verwendung von GPT mit BIOS - + A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>%2</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. Eine Partitionstabelle vom Typ GPT ist die beste Option für alle Systeme. Dieses Installationsprogramm unterstützt solch ein Setup auch für BIOS-Systeme.<br/><br/>Um eine GPT-Partition für BIOS-Systeme zu konfigurieren, (wenn nicht bereits geschehen) gehen Sie zurück und setzen Sie die Partitionstabelle auf GPT, als nächstes erstellen Sie eine 8 MB große unformattierte Partition mit der <strong>%2</strong> Markierung aktiviert.<br/><br/>Eine unformattierte 8 MB Partition ist nötig, um %1 auf einem BIOS-System mit GPT zu starten. - + Boot partition not encrypted Bootpartition nicht verschlüsselt - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. Eine separate Bootpartition wurde zusammen mit einer verschlüsselten Rootpartition erstellt, die Bootpartition ist aber unverschlüsselt.<br/><br/> Dies ist sicherheitstechnisch nicht optimal, da wichtige Systemdateien auf der unverschlüsselten Bootpartition gespeichert werden.<br/>Wenn Sie wollen, können Sie fortfahren, aber das Entschlüsseln des Dateisystems wird erst später während des Systemstarts erfolgen.<br/>Um die Bootpartition zu verschlüsseln, gehen Sie zurück und erstellen Sie diese neu, indem Sie bei der Partitionierung <strong>Verschlüsseln</strong> wählen. - + has at least one disk device available. mindestens eine Festplatte zur Verfügung hat - + There are no partitions to install on. Keine Partitionen für die Installation verfügbar. @@ -3054,11 +3003,6 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. PlasmaLnfPage - - - Form - Formular - Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. @@ -3826,11 +3770,6 @@ Ausgabe: TrackingPage - - - Form - Formular - Placeholder @@ -3992,11 +3931,6 @@ Ausgabe: WelcomePage - - - Form - Form - diff --git a/lang/calamares_el.ts b/lang/calamares_el.ts index 17effb34c..04830a07c 100644 --- a/lang/calamares_el.ts +++ b/lang/calamares_el.ts @@ -84,11 +84,6 @@ Calamares::DebugWindow - - - Form - Τύπος - GlobalStorage @@ -547,11 +542,6 @@ The installer will quit and all changes will be lost. ChoicePage - - - Form - Τύπος - Select storage de&vice: @@ -917,12 +907,12 @@ The installer will quit and all changes will be lost. - + Your passwords do not match! Οι κωδικοί πρόσβασης δεν ταιριάζουν! - + OK! @@ -1459,11 +1449,6 @@ The installer will quit and all changes will be lost. EncryptWidget - - - Form - Τύπος - En&crypt system @@ -1569,11 +1554,6 @@ The installer will quit and all changes will be lost. FinishedPage - - - Form - Τύπος - &Restart now @@ -1924,11 +1904,6 @@ The installer will quit and all changes will be lost. LicensePage - - - Form - Τύπος - <h1>License Agreement</h1> @@ -2084,33 +2059,27 @@ The installer will quit and all changes will be lost. - - + + No partitions are defined. - - - + + Encrypted rootfs setup error - + Root partition %1 is LUKS but no passphrase has been set. - + Could not create LUKS key file for root partition %1. - - - Could not configure LUKS key file on partition %1. - - MachineIdJob @@ -2594,18 +2563,13 @@ The installer will quit and all changes will be lost. - + Password is empty PackageChooserPage - - - Form - Τύπος - Product Name @@ -2647,11 +2611,6 @@ The installer will quit and all changes will be lost. Page_Keyboard - - - Form - Τύπος - Keyboard Model: @@ -2665,11 +2624,6 @@ The installer will quit and all changes will be lost. Page_UserSetup - - - Form - Τύπος - What is your name? @@ -2846,11 +2800,6 @@ The installer will quit and all changes will be lost. PartitionPage - - - Form - Τύπος - Storage de&vice: @@ -2960,72 +2909,72 @@ The installer will quit and all changes will be lost. Μετά: - + No EFI system partition configured - + EFI system partition configured incorrectly - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem. - + The filesystem must be mounted on <strong>%1</strong>. - + The filesystem must have type FAT32. - + The filesystem must be at least %1 MiB in size. - + The filesystem must have flag <strong>%1</strong> set. - + You can continue without setting up an EFI system partition but your system may fail to start. - + Option to use GPT on BIOS - + A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>%2</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. - + Boot partition not encrypted - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. - + has at least one disk device available. - + There are no partitions to install on. @@ -3046,11 +2995,6 @@ The installer will quit and all changes will be lost. PlasmaLnfPage - - - Form - Τύπος - Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. @@ -3812,11 +3756,6 @@ Output: TrackingPage - - - Form - Τύπος - Placeholder @@ -3978,11 +3917,6 @@ Output: WelcomePage - - - Form - Τύπος - diff --git a/lang/calamares_en.ts b/lang/calamares_en.ts index 2ae50108d..cd51a3dff 100644 --- a/lang/calamares_en.ts +++ b/lang/calamares_en.ts @@ -10,11 +10,16 @@ - Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://app.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://app.transifex.com/calamares/calamares/">Calamares translators team</a>. - + + <a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + + + Copyright %1-%2 %3 &lt;%4&gt;<br/> Copyright year-year Name <email-address> Copyright %1-%2 %3 &lt;%4&gt;<br/> @@ -31,17 +36,17 @@ BootInfoWidget - + The <strong>boot environment</strong> of this system.<br><br>Older x86 systems only support <strong>BIOS</strong>.<br>Modern systems usually use <strong>EFI</strong>, but may also show up as BIOS if started in compatibility mode. The <strong>boot environment</strong> of this system.<br><br>Older x86 systems only support <strong>BIOS</strong>.<br>Modern systems usually use <strong>EFI</strong>, but may also show up as BIOS if started in compatibility mode. - + This system was started with an <strong>EFI</strong> boot environment.<br><br>To configure startup from an EFI environment, this installer must deploy a boot loader application, like <strong>GRUB</strong> or <strong>systemd-boot</strong> on an <strong>EFI System Partition</strong>. This is automatic, unless you choose manual partitioning, in which case you must choose it or create it on your own. This system was started with an <strong>EFI</strong> boot environment.<br><br>To configure startup from an EFI environment, this installer must deploy a boot loader application, like <strong>GRUB</strong> or <strong>systemd-boot</strong> on an <strong>EFI System Partition</strong>. This is automatic, unless you choose manual partitioning, in which case you must choose it or create it on your own. - + This system was started with a <strong>BIOS</strong> boot environment.<br><br>To configure startup from a BIOS environment, this installer must install a boot loader, like <strong>GRUB</strong>, either at the beginning of a partition or on the <strong>Master Boot Record</strong> near the beginning of the partition table (preferred). This is automatic, unless you choose manual partitioning, in which case you must set it up on your own. This system was started with a <strong>BIOS</strong> boot environment.<br><br>To configure startup from a BIOS environment, this installer must install a boot loader, like <strong>GRUB</strong>, either at the beginning of a partition or on the <strong>Master Boot Record</strong> near the beginning of the partition table (preferred). This is automatic, unless you choose manual partitioning, in which case you must set it up on your own. @@ -165,12 +170,12 @@ - + Set up Set up - + Install Install @@ -207,17 +212,17 @@ Calamares::ProcessJob - + Run command '%1' in target system. Run command '%1' in target system. - + Run command '%1'. Run command '%1'. - + Running command %1 %2 Running command %1 %2 @@ -258,17 +263,17 @@ Calamares::QmlViewStep - + Loading ... Loading ... - + QML Step <i>%1</i>. QML Step <i>%1</i>. - + Loading failed. Loading failed. @@ -276,12 +281,12 @@ Calamares::RequirementsChecker - + Requirements checking for module '%1' is complete. - + Waiting for %n module(s). Waiting for %n module. @@ -289,7 +294,7 @@ - + (%n second(s)) (%n second) @@ -297,7 +302,7 @@ - + System-requirements checking is complete. System-requirements checking is complete. @@ -305,17 +310,17 @@ Calamares::ViewManager - + Setup Failed Setup Failed - + Installation Failed Installation Failed - + Error Error @@ -335,17 +340,17 @@ &Close - + Install Log Paste URL Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. The upload was unsuccessful. No web-paste was done. - + Install log posted to %1 @@ -358,124 +363,124 @@ Link copied to clipboard Link copied to clipboard - + Calamares Initialization Failed Calamares Initialization Failed - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. - + <br/>The following modules could not be loaded: <br/>The following modules could not be loaded: - + Continue with setup? Continue with setup? - + Continue with installation? Continue with installation? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> - + &Set up now &Set up now - + &Install now &Install now - + Go &back Go &back - + &Set up &Set up - + &Install &Install - + Setup is complete. Close the setup program. Setup is complete. Close the setup program. - + The installation is complete. Close the installer. The installation is complete. Close the installer. - + Cancel setup without changing the system. Cancel setup without changing the system. - + Cancel installation without changing the system. Cancel installation without changing the system. - + &Next &Next - + &Back &Back - + &Done &Done - + &Cancel &Cancel - + Cancel setup? Cancel setup? - + Cancel installation? Cancel installation? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Do you really want to cancel the current install process? @@ -485,22 +490,22 @@ The installer will quit and all changes will be lost. CalamaresPython::Helper - + Unknown exception type Unknown exception type - + unparseable Python error unparseable Python error - + unparseable Python traceback unparseable Python traceback - + Unfetchable Python error. Unfetchable Python error. @@ -508,12 +513,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program %1 Setup Program - + %1 Installer %1 Installer @@ -548,149 +553,149 @@ The installer will quit and all changes will be lost. ChoicePage - + Select storage de&vice: Select storage de&vice: - - - - + + + + Current: Current: - + After: After: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. - + Reuse %1 as home partition for %2. Reuse %1 as home partition for %2. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> - + %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. - + Boot loader location: Boot loader location: - + <strong>Select a partition to install on</strong> <strong>Select a partition to install on</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - + The EFI system partition at %1 will be used for starting %2. The EFI system partition at %1 will be used for starting %2. - + EFI system partition: EFI system partition: - + This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. - - - - + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. <strong>Replace a partition</strong><br/>Replaces a partition with %1. - + This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - + This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - + This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - + This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> - + This storage device has one of its partitions <strong>mounted</strong>. This storage device has one of its partitions <strong>mounted</strong>. - + This storage device is a part of an <strong>inactive RAID</strong> device. This storage device is a part of an <strong>inactive RAID</strong> device. - + No Swap No Swap - + Reuse Swap Reuse Swap - + Swap (no Hibernate) Swap (no Hibernate) - + Swap (with Hibernate) Swap (with Hibernate) - + Swap to file Swap to file @@ -759,12 +764,12 @@ The installer will quit and all changes will be lost. CommandList - + Could not run command. Could not run command. - + The commands use variables that are not defined. Missing variables are: %1. @@ -772,12 +777,12 @@ The installer will quit and all changes will be lost. Config - + Set keyboard model to %1.<br/> Set keyboard model to %1.<br/> - + Set keyboard layout to %1/%2. Set keyboard layout to %1/%2. @@ -787,12 +792,12 @@ The installer will quit and all changes will be lost. Set timezone to %1/%2. - + The system language will be set to %1. The system language will be set to %1. - + The numbers and dates locale will be set to %1. The numbers and dates locale will be set to %1. @@ -817,7 +822,7 @@ The installer will quit and all changes will be lost. Network Installation. (Disabled: No package list) - + Package selection Package selection @@ -827,47 +832,47 @@ The installer will quit and all changes will be lost. Network Installation. (Disabled: Unable to fetch package lists, check your network connection) - + This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. - + This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. - + This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. - + This program will ask you some questions and set up %2 on your computer. This program will ask you some questions and set up %2 on your computer. - + <h1>Welcome to the Calamares setup program for %1</h1> <h1>Welcome to the Calamares setup program for %1</h1> - + <h1>Welcome to %1 setup</h1> <h1>Welcome to %1 setup</h1> - + <h1>Welcome to the Calamares installer for %1</h1> <h1>Welcome to the Calamares installer for %1</h1> - + <h1>Welcome to the %1 installer</h1> <h1>Welcome to the %1 installer</h1> @@ -912,52 +917,52 @@ The installer will quit and all changes will be lost. Only letters, numbers, underscore and hyphen are allowed. - + Your passwords do not match! Your passwords do not match! - + OK! OK! - + Setup Failed Setup Failed - + Installation Failed Installation Failed - + The setup of %1 did not complete successfully. The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. The installation of %1 did not complete successfully. - + Setup Complete Setup Complete - + Installation Complete Installation Complete - + The setup of %1 is complete. The setup of %1 is complete. - + The installation of %1 is complete. The installation of %1 is complete. @@ -972,17 +977,17 @@ The installer will quit and all changes will be lost. Please pick a product from the list. The selected product will be installed. - + Packages Packages - + Install option: <strong>%1</strong> Install option: <strong>%1</strong> - + None None @@ -1005,7 +1010,7 @@ The installer will quit and all changes will be lost. ContextualProcessJob - + Contextual Processes Job Contextual Processes Job @@ -1106,43 +1111,43 @@ The installer will quit and all changes will be lost. CreatePartitionJob - + Create new %1MiB partition on %3 (%2) with entries %4. Create new %1MiB partition on %3 (%2) with entries %4. - + Create new %1MiB partition on %3 (%2). Create new %1MiB partition on %3 (%2). - + Create new %2MiB partition on %4 (%3) with file system %1. Create new %2MiB partition on %4 (%3) with file system %1. - + Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>. Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>. - + Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2). Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2). - + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. - - + + Creating new %1 partition on %2. Creating new %1 partition on %2. - + The installer failed to create partition on disk '%1'. The installer failed to create partition on disk '%1'. @@ -1188,12 +1193,12 @@ The installer will quit and all changes will be lost. Create new <strong>%1</strong> partition table on <strong>%2</strong> (%3). - + Creating new %1 partition table on %2. Creating new %1 partition table on %2. - + The installer failed to create a partition table on %1. The installer failed to create a partition table on %1. @@ -1201,33 +1206,33 @@ The installer will quit and all changes will be lost. CreateUserJob - + Create user %1 Create user %1 - + Create user <strong>%1</strong>. Create user <strong>%1</strong>. - + Preserving home directory Preserving home directory - - + + Creating user %1 Creating user %1 - + Configuring user %1 Configuring user %1 - + Setting file permissions Setting file permissions @@ -1290,17 +1295,17 @@ The installer will quit and all changes will be lost. Delete partition %1. - + Delete partition <strong>%1</strong>. Delete partition <strong>%1</strong>. - + Deleting partition %1. Deleting partition %1. - + The installer failed to delete partition %1. The installer failed to delete partition %1. @@ -1308,32 +1313,32 @@ The installer will quit and all changes will be lost. DeviceInfoWidget - + This device has a <strong>%1</strong> partition table. This device has a <strong>%1</strong> partition table. - + This is a <strong>loop</strong> device.<br><br>It is a pseudo-device with no partition table that makes a file accessible as a block device. This kind of setup usually only contains a single filesystem. This is a <strong>loop</strong> device.<br><br>It is a pseudo-device with no partition table that makes a file accessible as a block device. This kind of setup usually only contains a single filesystem. - + This installer <strong>cannot detect a partition table</strong> on the selected storage device.<br><br>The device either has no partition table, or the partition table is corrupted or of an unknown type.<br>This installer can create a new partition table for you, either automatically, or through the manual partitioning page. This installer <strong>cannot detect a partition table</strong> on the selected storage device.<br><br>The device either has no partition table, or the partition table is corrupted or of an unknown type.<br>This installer can create a new partition table for you, either automatically, or through the manual partitioning page. - + <br><br>This is the recommended partition table type for modern systems which start from an <strong>EFI</strong> boot environment. <br><br>This is the recommended partition table type for modern systems which start from an <strong>EFI</strong> boot environment. - + <br><br>This partition table type is only advisable on older systems which start from a <strong>BIOS</strong> boot environment. GPT is recommended in most other cases.<br><br><strong>Warning:</strong> the MBR partition table is an obsolete MS-DOS era standard.<br>Only 4 <em>primary</em> partitions may be created, and of those 4, one can be an <em>extended</em> partition, which may in turn contain many <em>logical</em> partitions. <br><br>This partition table type is only advisable on older systems which start from a <strong>BIOS</strong> boot environment. GPT is recommended in most other cases.<br><br><strong>Warning:</strong> the MBR partition table is an obsolete MS-DOS era standard.<br>Only 4 <em>primary</em> partitions may be created, and of those 4, one can be an <em>extended</em> partition, which may in turn contain many <em>logical</em> partitions. - + The type of <strong>partition table</strong> on the selected storage device.<br><br>The only way to change the partition table type is to erase and recreate the partition table from scratch, which destroys all data on the storage device.<br>This installer will keep the current partition table unless you explicitly choose otherwise.<br>If unsure, on modern systems GPT is preferred. The type of <strong>partition table</strong> on the selected storage device.<br><br>The only way to change the partition table type is to erase and recreate the partition table from scratch, which destroys all data on the storage device.<br>This installer will keep the current partition table unless you explicitly choose otherwise.<br>If unsure, on modern systems GPT is preferred. @@ -1374,7 +1379,7 @@ The installer will quit and all changes will be lost. DummyCppJob - + Dummy C++ Job Dummy C++ Job @@ -1475,13 +1480,13 @@ The installer will quit and all changes will be lost. Confirm passphrase - - + + Please enter the same passphrase in both boxes. Please enter the same passphrase in both boxes. - + Password must be a minimum of %1 characters @@ -1502,57 +1507,57 @@ The installer will quit and all changes will be lost. FillGlobalStorageJob - + Set partition information Set partition information - + Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em> Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em> - + Install %1 on <strong>new</strong> %2 system partition. Install %1 on <strong>new</strong> %2 system partition. - + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. - + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3. Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3. - + Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>. Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>. - + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>. Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>. - + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4. Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4. - + Install %2 on %3 system partition <strong>%1</strong>. Install %2 on %3 system partition <strong>%1</strong>. - + Install boot loader on <strong>%1</strong>. Install boot loader on <strong>%1</strong>. - + Setting up mount points. Setting up mount points. @@ -1619,23 +1624,23 @@ The installer will quit and all changes will be lost. Format partition %1 (file system: %2, size: %3 MiB) on %4. - + Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>. Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>. - + %1 (%2) partition label %1 (device path %2) %1 (%2) - + Formatting partition %1 with file system %2. Formatting partition %1 with file system %2. - + The installer failed to format partition %1 on disk '%2'. The installer failed to format partition %1 on disk '%2'. @@ -1643,127 +1648,127 @@ The installer will quit and all changes will be lost. GeneralRequirements - + Please ensure the system has at least %1 GiB available drive space. - + Available drive space is all of the hard disks and SSDs connected to the system. - + There is not enough drive space. At least %1 GiB is required. There is not enough drive space. At least %1 GiB is required. - + has at least %1 GiB working memory has at least %1 GiB working memory - + The system does not have enough working memory. At least %1 GiB is required. The system does not have enough working memory. At least %1 GiB is required. - + is plugged in to a power source is plugged in to a power source - + The system is not plugged in to a power source. The system is not plugged in to a power source. - + is connected to the Internet is connected to the Internet - + The system is not connected to the Internet. The system is not connected to the Internet. - + is running the installer as an administrator (root) is running the installer as an administrator (root) - + The setup program is not running with administrator rights. The setup program is not running with administrator rights. - + The installer is not running with administrator rights. The installer is not running with administrator rights. - + has a screen large enough to show the whole installer has a screen large enough to show the whole installer - + The screen is too small to display the setup program. The screen is too small to display the setup program. - + The screen is too small to display the installer. The screen is too small to display the installer. - + is always false - + The computer says no. - + is always false (slowly) - + The computer says no (slowly). - + is always true - + The computer says yes. - + is always true (slowly) - + The computer says yes (slowly). - + is checked three times. - + The snark has not been checked three times. The (some mythological beast) has not been checked three times. @@ -1772,7 +1777,7 @@ The installer will quit and all changes will be lost. HostInfoJob - + Collecting information about your machine. Collecting information about your machine. @@ -1806,7 +1811,7 @@ The installer will quit and all changes will be lost. InitcpioJob - + Creating initramfs with mkinitcpio. Creating initramfs with mkinitcpio. @@ -1814,7 +1819,7 @@ The installer will quit and all changes will be lost. InitramfsJob - + Creating initramfs. Creating initramfs. @@ -1822,17 +1827,17 @@ The installer will quit and all changes will be lost. InteractiveTerminalPage - + Konsole not installed Konsole not installed - + Please install KDE Konsole and try again! Please install KDE Konsole and try again! - + Executing script: &nbsp;<code>%1</code> Executing script: &nbsp;<code>%1</code> @@ -1840,7 +1845,7 @@ The installer will quit and all changes will be lost. InteractiveTerminalViewStep - + Script Script @@ -1856,7 +1861,7 @@ The installer will quit and all changes will be lost. KeyboardViewStep - + Keyboard Keyboard @@ -1887,22 +1892,22 @@ The installer will quit and all changes will be lost. LOSHJob - + Configuring encrypted swap. Configuring encrypted swap. - + No target system available. No target system available. - + No rootMountPoint is set. No rootMountPoint is set. - + No configFilePath is set. No configFilePath is set. @@ -1915,32 +1920,32 @@ The installer will quit and all changes will be lost. <h1>License Agreement</h1> - + I accept the terms and conditions above. I accept the terms and conditions above. - + Please review the End User License Agreements (EULAs). Please review the End User License Agreements (EULAs). - + This setup procedure will install proprietary software that is subject to licensing terms. This setup procedure will install proprietary software that is subject to licensing terms. - + If you do not agree with the terms, the setup procedure cannot continue. If you do not agree with the terms, the setup procedure cannot continue. - + This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience. This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience. - + If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead. If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead. @@ -1948,7 +1953,7 @@ The installer will quit and all changes will be lost. LicenseViewStep - + License License @@ -2043,7 +2048,7 @@ The installer will quit and all changes will be lost. LocaleTests - + Quit Quit @@ -2051,7 +2056,7 @@ The installer will quit and all changes will be lost. LocaleViewStep - + Location Location @@ -2089,17 +2094,17 @@ The installer will quit and all changes will be lost. MachineIdJob - + Generate machine-id. Generate machine-id. - + Configuration Error Configuration Error - + No root mount point is set for MachineId. No root mount point is set for MachineId. @@ -2260,12 +2265,12 @@ The installer will quit and all changes will be lost. OEMViewStep - + OEM Configuration OEM Configuration - + Set the OEM Batch Identifier to <code>%1</code>. Set the OEM Batch Identifier to <code>%1</code>. @@ -2303,77 +2308,77 @@ The installer will quit and all changes will be lost. PWQ - + Password is too short Password is too short - + Password is too long Password is too long - + Password is too weak Password is too weak - + Memory allocation error when setting '%1' Memory allocation error when setting '%1' - + Memory allocation error Memory allocation error - + The password is the same as the old one The password is the same as the old one - + The password is a palindrome The password is a palindrome - + The password differs with case changes only The password differs with case changes only - + The password is too similar to the old one The password is too similar to the old one - + The password contains the user name in some form The password contains the user name in some form - + The password contains words from the real name of the user in some form The password contains words from the real name of the user in some form - + The password contains forbidden words in some form The password contains forbidden words in some form - + The password contains too few digits The password contains too few digits - + The password contains too few uppercase letters The password contains too few uppercase letters - + The password contains fewer than %n lowercase letters The password contains fewer than %n lowercase letters @@ -2381,37 +2386,37 @@ The installer will quit and all changes will be lost. - + The password contains too few lowercase letters The password contains too few lowercase letters - + The password contains too few non-alphanumeric characters The password contains too few non-alphanumeric characters - + The password is too short The password is too short - + The password does not contain enough character classes The password does not contain enough character classes - + The password contains too many same characters consecutively The password contains too many same characters consecutively - + The password contains too many characters of the same class consecutively The password contains too many characters of the same class consecutively - + The password contains fewer than %n digits The password contains fewer than %n digits @@ -2419,7 +2424,7 @@ The installer will quit and all changes will be lost. - + The password contains fewer than %n uppercase letters The password contains fewer than %n uppercase letters @@ -2427,7 +2432,7 @@ The installer will quit and all changes will be lost. - + The password contains fewer than %n non-alphanumeric characters The password contains fewer than %n non-alphanumeric characters @@ -2435,7 +2440,7 @@ The installer will quit and all changes will be lost. - + The password is shorter than %n characters The password is shorter than %n characters @@ -2443,12 +2448,12 @@ The installer will quit and all changes will be lost. - + The password is a rotated version of the previous one The password is a rotated version of the previous one - + The password contains fewer than %n character classes The password contains fewer than %n character classes @@ -2456,7 +2461,7 @@ The installer will quit and all changes will be lost. - + The password contains more than %n same characters consecutively The password contains more than %n same characters consecutively @@ -2464,7 +2469,7 @@ The installer will quit and all changes will be lost. - + The password contains more than %n characters of the same class consecutively The password contains more than %n characters of the same class consecutively @@ -2472,7 +2477,7 @@ The installer will quit and all changes will be lost. - + The password contains monotonic sequence longer than %n characters The password contains monotonic sequence longer than %n characters @@ -2480,97 +2485,97 @@ The installer will quit and all changes will be lost. - + The password contains too long of a monotonic character sequence The password contains too long of a monotonic character sequence - + No password supplied No password supplied - + Cannot obtain random numbers from the RNG device Cannot obtain random numbers from the RNG device - + Password generation failed - required entropy too low for settings Password generation failed - required entropy too low for settings - + The password fails the dictionary check - %1 The password fails the dictionary check - %1 - + The password fails the dictionary check The password fails the dictionary check - + Unknown setting - %1 Unknown setting - %1 - + Unknown setting Unknown setting - + Bad integer value of setting - %1 Bad integer value of setting - %1 - + Bad integer value Bad integer value - + Setting %1 is not of integer type Setting %1 is not of integer type - + Setting is not of integer type Setting is not of integer type - + Setting %1 is not of string type Setting %1 is not of string type - + Setting is not of string type Setting is not of string type - + Opening the configuration file failed Opening the configuration file failed - + The configuration file is malformed The configuration file is malformed - + Fatal failure Fatal failure - + Unknown error Unknown error - + Password is empty Password is empty @@ -2606,12 +2611,12 @@ The installer will quit and all changes will be lost. PackageModel - + Name Name - + Description Description @@ -2624,10 +2629,15 @@ The installer will quit and all changes will be lost. Keyboard Model: - + Type here to test your keyboard Type here to test your keyboard + + + Keyboard Switch: + + Page_UserSetup @@ -2724,42 +2734,42 @@ The installer will quit and all changes will be lost. PartitionLabelsView - + Root Root - + Home Home - + Boot Boot - + EFI system EFI system - + Swap Swap - + New partition for %1 New partition for %1 - + New partition New partition - + %1 %2 size[number] filesystem[name] %1 %2 @@ -2886,102 +2896,102 @@ The installer will quit and all changes will be lost. Gathering system information... - + Partitions Partitions - + Unsafe partition actions are enabled. Unsafe partition actions are enabled. - + Partitioning is configured to <b>always</b> fail. Partitioning is configured to <b>always</b> fail. - + No partitions will be changed. No partitions will be changed. - + Current: Current: - + After: After: - + No EFI system partition configured No EFI system partition configured - + EFI system partition configured incorrectly EFI system partition configured incorrectly - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem. An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem. - + The filesystem must be mounted on <strong>%1</strong>. The filesystem must be mounted on <strong>%1</strong>. - + The filesystem must have type FAT32. The filesystem must have type FAT32. - + The filesystem must be at least %1 MiB in size. The filesystem must be at least %1 MiB in size. - + The filesystem must have flag <strong>%1</strong> set. The filesystem must have flag <strong>%1</strong> set. - + You can continue without setting up an EFI system partition but your system may fail to start. You can continue without setting up an EFI system partition but your system may fail to start. - + Option to use GPT on BIOS Option to use GPT on BIOS - + A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>%2</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>%2</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. - + Boot partition not encrypted Boot partition not encrypted - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. - + has at least one disk device available. has at least one disk device available. - + There are no partitions to install on. There are no partitions to install on. @@ -3024,17 +3034,17 @@ The installer will quit and all changes will be lost. PreserveFiles - + Saving files for later ... Saving files for later ... - + No files configured to save for later. No files configured to save for later. - + Not all of the configured files could be preserved. Not all of the configured files could be preserved. @@ -3042,14 +3052,14 @@ The installer will quit and all changes will be lost. ProcessResult - + There was no output from the command. There was no output from the command. - + Output: @@ -3058,52 +3068,52 @@ Output: - + External command crashed. External command crashed. - + Command <i>%1</i> crashed. Command <i>%1</i> crashed. - + External command failed to start. External command failed to start. - + Command <i>%1</i> failed to start. Command <i>%1</i> failed to start. - + Internal error when starting command. Internal error when starting command. - + Bad parameters for process job call. Bad parameters for process job call. - + External command failed to finish. External command failed to finish. - + Command <i>%1</i> failed to finish in %2 seconds. Command <i>%1</i> failed to finish in %2 seconds. - + External command finished with errors. External command finished with errors. - + Command <i>%1</i> finished with exit code %2. Command <i>%1</i> finished with exit code %2. @@ -3111,7 +3121,7 @@ Output: QObject - + %1 (%2) %1 (%2) @@ -3136,8 +3146,8 @@ Output: swap - - + + Default Default @@ -3155,12 +3165,12 @@ Output: Path <pre>%1</pre> must be an absolute path. - + Directory not found Directory not found - + Could not create new random file <pre>%1</pre>. Could not create new random file <pre>%1</pre>. @@ -3181,7 +3191,7 @@ Output: (no mount point) - + Unpartitioned space or unknown partition table Unpartitioned space or unknown partition table @@ -3199,7 +3209,7 @@ Output: RemoveUserJob - + Remove live user from target system Remove live user from target system @@ -3243,68 +3253,68 @@ Output: ResizeFSJob - + Resize Filesystem Job Resize Filesystem Job - + Invalid configuration Invalid configuration - + The file-system resize job has an invalid configuration and will not run. The file-system resize job has an invalid configuration and will not run. - + KPMCore not Available KPMCore not Available - + Calamares cannot start KPMCore for the file-system resize job. Calamares cannot start KPMCore for the file-system resize job. - - - - - + + + + + Resize Failed Resize Failed - + The filesystem %1 could not be found in this system, and cannot be resized. The filesystem %1 could not be found in this system, and cannot be resized. - + The device %1 could not be found in this system, and cannot be resized. The device %1 could not be found in this system, and cannot be resized. - - + + The filesystem %1 cannot be resized. The filesystem %1 cannot be resized. - - + + The device %1 cannot be resized. The device %1 cannot be resized. - + The filesystem %1 must be resized, but cannot. The filesystem %1 must be resized, but cannot. - + The device %1 must be resized, but cannot The device %1 must be resized, but cannot @@ -3317,17 +3327,17 @@ Output: Resize partition %1. - + Resize <strong>%2MiB</strong> partition <strong>%1</strong> to <strong>%3MiB</strong>. Resize <strong>%2MiB</strong> partition <strong>%1</strong> to <strong>%3MiB</strong>. - + Resizing %2MiB partition %1 to %3MiB. Resizing %2MiB partition %1 to %3MiB. - + The installer failed to resize partition %1 on disk '%2'. The installer failed to resize partition %1 on disk '%2'. @@ -3388,24 +3398,24 @@ Output: Set hostname %1 - + Set hostname <strong>%1</strong>. Set hostname <strong>%1</strong>. - + Setting hostname %1. Setting hostname %1. - - + + Internal Error Internal Error - - + + Cannot write hostname to target system Cannot write hostname to target system @@ -3413,29 +3423,29 @@ Output: SetKeyboardLayoutJob - + Set keyboard model to %1, layout to %2-%3 Set keyboard model to %1, layout to %2-%3 - + Failed to write keyboard configuration for the virtual console. Failed to write keyboard configuration for the virtual console. - - - + + + Failed to write to %1 Failed to write to %1 - + Failed to write keyboard configuration for X11. Failed to write keyboard configuration for X11. - + Failed to write keyboard configuration to existing /etc/default directory. Failed to write keyboard configuration to existing /etc/default directory. @@ -3443,82 +3453,82 @@ Output: SetPartFlagsJob - + Set flags on partition %1. Set flags on partition %1. - + Set flags on %1MiB %2 partition. Set flags on %1MiB %2 partition. - + Set flags on new partition. Set flags on new partition. - + Clear flags on partition <strong>%1</strong>. Clear flags on partition <strong>%1</strong>. - + Clear flags on %1MiB <strong>%2</strong> partition. Clear flags on %1MiB <strong>%2</strong> partition. - + Clear flags on new partition. Clear flags on new partition. - + Flag partition <strong>%1</strong> as <strong>%2</strong>. Flag partition <strong>%1</strong> as <strong>%2</strong>. - + Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>. Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>. - + Flag new partition as <strong>%1</strong>. Flag new partition as <strong>%1</strong>. - + Clearing flags on partition <strong>%1</strong>. Clearing flags on partition <strong>%1</strong>. - + Clearing flags on %1MiB <strong>%2</strong> partition. Clearing flags on %1MiB <strong>%2</strong> partition. - + Clearing flags on new partition. Clearing flags on new partition. - + Setting flags <strong>%2</strong> on partition <strong>%1</strong>. Setting flags <strong>%2</strong> on partition <strong>%1</strong>. - + Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition. Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition. - + Setting flags <strong>%1</strong> on new partition. Setting flags <strong>%1</strong> on new partition. - + The installer failed to set flags on partition %1. The installer failed to set flags on partition %1. @@ -3526,42 +3536,38 @@ Output: SetPasswordJob - + Set password for user %1 Set password for user %1 - + Setting password for user %1. Setting password for user %1. - + Bad destination system path. Bad destination system path. - + rootMountPoint is %1 rootMountPoint is %1 - + Cannot disable root account. Cannot disable root account. - - passwd terminated with error code %1. - passwd terminated with error code %1. - - - + Cannot set password for user %1. Cannot set password for user %1. - + + usermod terminated with error code %1. usermod terminated with error code %1. @@ -3569,37 +3575,37 @@ Output: SetTimezoneJob - + Set timezone to %1/%2 Set timezone to %1/%2 - + Cannot access selected timezone path. Cannot access selected timezone path. - + Bad path: %1 Bad path: %1 - + Cannot set timezone. Cannot set timezone. - + Link creation failed, target: %1; link name: %2 Link creation failed, target: %1; link name: %2 - + Cannot set timezone, Cannot set timezone, - + Cannot open /etc/timezone for writing Cannot open /etc/timezone for writing @@ -3607,18 +3613,18 @@ Output: SetupGroupsJob - + Preparing groups. Preparing groups. - - + + Could not create groups in target system Could not create groups in target system - + These groups are missing in the target system: %1 These groups are missing in the target system: %1 @@ -3631,12 +3637,12 @@ Output: Configure <pre>sudo</pre> users. - + Cannot chmod sudoers file. Cannot chmod sudoers file. - + Cannot create sudoers file for writing. Cannot create sudoers file for writing. @@ -3644,7 +3650,7 @@ Output: ShellProcessJob - + Shell Processes Job Shell Processes Job @@ -3689,22 +3695,22 @@ Output: TrackingInstallJob - + Installation feedback Installation feedback - + Sending installation feedback. Sending installation feedback. - + Internal error in install-tracking. Internal error in install-tracking. - + HTTP request timed out. HTTP request timed out. @@ -3712,28 +3718,28 @@ Output: TrackingKUserFeedbackJob - + KDE user feedback KDE user feedback - + Configuring KDE user feedback. Configuring KDE user feedback. - - + + Error in KDE user feedback configuration. Error in KDE user feedback configuration. - + Could not configure KDE user feedback correctly, script error %1. Could not configure KDE user feedback correctly, script error %1. - + Could not configure KDE user feedback correctly, Calamares error %1. Could not configure KDE user feedback correctly, Calamares error %1. @@ -3741,28 +3747,28 @@ Output: TrackingMachineUpdateManagerJob - + Machine feedback Machine feedback - + Configuring machine feedback. Configuring machine feedback. - - + + Error in machine feedback configuration. Error in machine feedback configuration. - + Could not configure machine feedback correctly, script error %1. Could not configure machine feedback correctly, script error %1. - + Could not configure machine feedback correctly, Calamares error %1. Could not configure machine feedback correctly, Calamares error %1. @@ -3821,12 +3827,12 @@ Output: Unmount file systems. - + No target system available. No target system available. - + No rootMountPoint is set. No rootMountPoint is set. @@ -3834,12 +3840,12 @@ Output: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> @@ -3982,12 +3988,12 @@ Output: %1 support - + About %1 setup About %1 setup - + About %1 installer About %1 installer @@ -4011,7 +4017,7 @@ Output: ZfsJob - + Create ZFS pools and datasets Create ZFS pools and datasets @@ -4056,23 +4062,23 @@ Output: calamares-sidebar - + About About - + Debug Debug - + Show information about Calamares - + Show debug information diff --git a/lang/calamares_en_GB.ts b/lang/calamares_en_GB.ts index b28324e38..756d018b8 100644 --- a/lang/calamares_en_GB.ts +++ b/lang/calamares_en_GB.ts @@ -84,11 +84,6 @@ Calamares::DebugWindow - - - Form - Form - GlobalStorage @@ -547,11 +542,6 @@ The installer will quit and all changes will be lost. ChoicePage - - - Form - Form - Select storage de&vice: @@ -917,12 +907,12 @@ The installer will quit and all changes will be lost. - + Your passwords do not match! Your passwords do not match! - + OK! @@ -1459,11 +1449,6 @@ The installer will quit and all changes will be lost. EncryptWidget - - - Form - Form - En&crypt system @@ -1569,11 +1554,6 @@ The installer will quit and all changes will be lost. FinishedPage - - - Form - Form - &Restart now @@ -1924,11 +1904,6 @@ The installer will quit and all changes will be lost. LicensePage - - - Form - Form - <h1>License Agreement</h1> @@ -2084,33 +2059,27 @@ The installer will quit and all changes will be lost. - - + + No partitions are defined. - - - + + Encrypted rootfs setup error - + Root partition %1 is LUKS but no passphrase has been set. - + Could not create LUKS key file for root partition %1. - - - Could not configure LUKS key file on partition %1. - - MachineIdJob @@ -2594,18 +2563,13 @@ The installer will quit and all changes will be lost. Unknown error - + Password is empty PackageChooserPage - - - Form - Form - Product Name @@ -2647,11 +2611,6 @@ The installer will quit and all changes will be lost. Page_Keyboard - - - Form - Form - Keyboard Model: @@ -2665,11 +2624,6 @@ The installer will quit and all changes will be lost. Page_UserSetup - - - Form - Form - What is your name? @@ -2846,11 +2800,6 @@ The installer will quit and all changes will be lost. PartitionPage - - - Form - Form - Storage de&vice: @@ -2960,72 +2909,72 @@ The installer will quit and all changes will be lost. After: - + No EFI system partition configured No EFI system partition configured - + EFI system partition configured incorrectly - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem. - + The filesystem must be mounted on <strong>%1</strong>. - + The filesystem must have type FAT32. - + The filesystem must be at least %1 MiB in size. - + The filesystem must have flag <strong>%1</strong> set. - + You can continue without setting up an EFI system partition but your system may fail to start. - + Option to use GPT on BIOS - + A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>%2</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. - + Boot partition not encrypted Boot partition not encrypted - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. - + has at least one disk device available. - + There are no partitions to install on. @@ -3046,11 +2995,6 @@ The installer will quit and all changes will be lost. PlasmaLnfPage - - - Form - Form - Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. @@ -3815,11 +3759,6 @@ Output: TrackingPage - - - Form - Form - Placeholder @@ -3981,11 +3920,6 @@ Output: WelcomePage - - - Form - Form - diff --git a/lang/calamares_eo.ts b/lang/calamares_eo.ts index 959f2e55b..ca4ee4ed0 100644 --- a/lang/calamares_eo.ts +++ b/lang/calamares_eo.ts @@ -84,11 +84,6 @@ Calamares::DebugWindow - - - Form - Formularo - GlobalStorage @@ -551,11 +546,6 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos. ChoicePage - - - Form - Formularo - Select storage de&vice: @@ -921,12 +911,12 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos. - + Your passwords do not match! - + OK! @@ -1463,11 +1453,6 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos. EncryptWidget - - - Form - Formularo - En&crypt system @@ -1573,11 +1558,6 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos. FinishedPage - - - Form - Formularo - &Restart now @@ -1928,11 +1908,6 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos. LicensePage - - - Form - Formularo - <h1>License Agreement</h1> @@ -2088,33 +2063,27 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos. - - + + No partitions are defined. - - - + + Encrypted rootfs setup error - + Root partition %1 is LUKS but no passphrase has been set. - + Could not create LUKS key file for root partition %1. - - - Could not configure LUKS key file on partition %1. - - MachineIdJob @@ -2598,18 +2567,13 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos. - + Password is empty PackageChooserPage - - - Form - Formularo - Product Name @@ -2651,11 +2615,6 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos. Page_Keyboard - - - Form - Formularo - Keyboard Model: @@ -2669,11 +2628,6 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos. Page_UserSetup - - - Form - Formularo - What is your name? @@ -2850,11 +2804,6 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos. PartitionPage - - - Form - Formularo - Storage de&vice: @@ -2964,72 +2913,72 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos. Poste: - + No EFI system partition configured - + EFI system partition configured incorrectly - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem. - + The filesystem must be mounted on <strong>%1</strong>. - + The filesystem must have type FAT32. - + The filesystem must be at least %1 MiB in size. - + The filesystem must have flag <strong>%1</strong> set. - + You can continue without setting up an EFI system partition but your system may fail to start. - + Option to use GPT on BIOS - + A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>%2</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. - + Boot partition not encrypted - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. - + has at least one disk device available. - + There are no partitions to install on. @@ -3050,11 +2999,6 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos. PlasmaLnfPage - - - Form - Formularo - Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. @@ -3816,11 +3760,6 @@ Output: TrackingPage - - - Form - Formularo - Placeholder @@ -3982,11 +3921,6 @@ Output: WelcomePage - - - Form - Formularo - diff --git a/lang/calamares_es.ts b/lang/calamares_es.ts index fa0e7cd4d..294a8dbf6 100644 --- a/lang/calamares_es.ts +++ b/lang/calamares_es.ts @@ -11,7 +11,7 @@ Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://app.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - Gracias al <a href="https://calamares.io/team/">Equipo de Calamares</a> y al <a href="https://app.transifex.com/calamares/calamares/">Equipo de traductores de Calamares</a>. <br/><br/>El desarrollo de <a href="https://calamares.io/">Calamares</a> está patrocinado por <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberando Software. + Gracias al <a href="https://calamares.io/team/">equipo de Calamares</a> y al <a href="https://app.transifex.com/calamares/calamares/">equipo de traductores de Calamares</a>. <br/><br/>El desarrollo de <a href="https://calamares.io/">Calamares</a> está patrocinado por <br/><a href="http://www.blue-systems.com/">Blue Systems</a>: liberando software. @@ -33,7 +33,7 @@ The <strong>boot environment</strong> of this system.<br><br>Older x86 systems only support <strong>BIOS</strong>.<br>Modern systems usually use <strong>EFI</strong>, but may also show up as BIOS if started in compatibility mode. - El <strong>entorno de arranque<strong> de este sistema.<br><br>Los sistemas x86 más antiguos solo funcionan con <strong>BIOS</strong>, mientras que los sistemas modernos suelen usan <strong>EFI</strong>, pero también pueden aparece como BIOS si se inician en el modo de retrocompatibilidad. + El <strong>entorno de arranque<strong> de este sistema.<br><br>Los sistemas x86 más antiguos solo tienen <strong>BIOS</strong>, mientras que los más modernos suelen tener <strong>EFI</strong>, aunque también pueden aparecer como BIOS si se inician en el modo de retrocompatibilidad. @@ -84,20 +84,15 @@ Calamares::DebugWindow - - - Form - Formulario - GlobalStorage - Almacenamiento Global + GlobalStorage JobQueue - Cola de trabajo + JobQueue @@ -283,7 +278,7 @@ Requirements checking for module '%1' is complete. - Se completó la verificación de requisitos para el módulo '%1'. + Se han terminado de comprobar los requisitos para el módulo «%1». @@ -291,7 +286,7 @@ Esperando %n módulo. Esperando %n módulos. - Esperando %n módulos. + Esperando a que terminen %n módulos. @@ -554,11 +549,6 @@ El instalador se cerrará y todos tus cambios se perderán. ChoicePage - - - Form - Formulario - Select storage de&vice: @@ -778,7 +768,7 @@ El instalador se cerrará y todos tus cambios se perderán. The commands use variables that are not defined. Missing variables are: %1. - Los comandos usan variables que no están definidas. Las variables que faltan son: %1. + Las órdenes utilizan variables sin definir. Las variables que faltan son: %1. @@ -841,12 +831,12 @@ El instalador se cerrará y todos tus cambios se perderán. This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. - Esta computadora no cumple con los requisitos mínimos para configurar %1. <br/>La instalación no puede continuar. + Este equipo no cumple con los requisitos mínimos para configurar %1.<br/>La instalación no puede continuar. This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. - Esta computadora no cumple con los requisitos mínimos para instalar %1. <br/>La instalación no puede continuar. + Este equipo no cumple con los requisitos mínimos para instalar %1. <br/>La instalación no puede continuar. @@ -924,12 +914,12 @@ El instalador se cerrará y todos tus cambios se perderán. Solo se permiten letras, números, guiones bajos y normales. - + Your passwords do not match! Parece que las contraseñas no coinciden. - + OK! Entendido @@ -1456,21 +1446,16 @@ El instalador se cerrará y todos tus cambios se perderán. Passphrase for existing partition - Frase de contraseña para la partición existente + Contraseña de cifrado para la partición existente Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition. - La partición %1 no se pudo descifrar con la frase de contraseña proporcionada. Edite la partición nuevamente y proporcione la frase de contraseña correcta o elimine y cree una nueva partición cifrada. + La partición %1 no se ha podido descifrar con la contraseña de cifrado proporcionada. Vuelve a editar la partición y escribe la contraseña correcta o elimina y recrea la partición cifrada. EncryptWidget - - - Form - Formulario - En&crypt system @@ -1500,7 +1485,7 @@ El instalador se cerrará y todos tus cambios se perderán. Password must be a minimum of %1 characters - La contraseña debe tener un mínimo de %1 caracteres + La contraseña debe tener un mínimo de %1 letras @@ -1576,11 +1561,6 @@ El instalador se cerrará y todos tus cambios se perderán. FinishedPage - - - Form - Formulario - &Restart now @@ -1667,12 +1647,12 @@ El instalador se cerrará y todos tus cambios se perderán. Please ensure the system has at least %1 GiB available drive space. - Asegúrese de que el sistema tenga al menos %1 GiB de espacio disponible en el disco. + Asegúrate de que el sistema tenga al menos %1 GiB de espacio disponible en disco. Available drive space is all of the hard disks and SSDs connected to the system. - El espacio disponible en el disco son todos los discos duros y SSDs conectados al sistema. + El espacio disponible es la suma de todos los discos duros y SSDs conectados al sistema. @@ -1747,7 +1727,7 @@ El instalador se cerrará y todos tus cambios se perderán. The computer says no. - La computadora dice que no. + El equipo dice que no. @@ -1757,7 +1737,7 @@ El instalador se cerrará y todos tus cambios se perderán. The computer says no (slowly). - La computadora dice que no (lentamente). + El equipo dice que no (lentamente). @@ -1767,7 +1747,7 @@ El instalador se cerrará y todos tus cambios se perderán. The computer says yes. - La computadora dice que si. + El equipo dice que sí. @@ -1777,7 +1757,7 @@ El instalador se cerrará y todos tus cambios se perderán. The computer says yes (slowly). - La computadora dice que sí (lentamente). + El equipo dice que sí (lentamente). @@ -1788,7 +1768,7 @@ El instalador se cerrará y todos tus cambios se perderán. The snark has not been checked three times. The (some mythological beast) has not been checked three times. - + No se ha verificado la existencia del Snark por triplicado. @@ -1931,11 +1911,6 @@ El instalador se cerrará y todos tus cambios se perderán. LicensePage - - - Form - Formulario - <h1>License Agreement</h1> @@ -2091,33 +2066,27 @@ El instalador se cerrará y todos tus cambios se perderán. Configurando archivo de claves LUKS. - - + + No partitions are defined. Se ha definido ninguna partición. - - - + + Encrypted rootfs setup error Se ha producido un error del «rootfs» cifrado - + Root partition %1 is LUKS but no passphrase has been set. - La partición root %1 es LUKS pero no se ha establecido ninguna frase de contraseña. + La partición raíz («root») %1 es de tipo LUKS pero no se ha proporcionado ninguna contraseña de cifrado. - + Could not create LUKS key file for root partition %1. No se pudo crear el archivo de clave LUKS para la partición root %1. - - - Could not configure LUKS key file on partition %1. - No se pudo configurar el archivo de clave LUKS para la partición root %1. - MachineIdJob @@ -2202,7 +2171,7 @@ El instalador se cerrará y todos tus cambios se perderán. Login label for netinstall module, choose login manager - Iniciar sesion + Inicio de sesión @@ -2612,18 +2581,13 @@ El instalador se cerrará y todos tus cambios se perderán. Error desconocido - + Password is empty La contraseña está vacía. PackageChooserPage - - - Form - Formulario - Product Name @@ -2665,11 +2629,6 @@ El instalador se cerrará y todos tus cambios se perderán. Page_Keyboard - - - Form - Formulario - Keyboard Model: @@ -2683,11 +2642,6 @@ El instalador se cerrará y todos tus cambios se perderán. Page_UserSetup - - - Form - Formulario - What is your name? @@ -2864,11 +2818,6 @@ El instalador se cerrará y todos tus cambios se perderán. PartitionPage - - - Form - Formulario - Storage de&vice: @@ -2978,72 +2927,72 @@ El instalador se cerrará y todos tus cambios se perderán. Después: - + No EFI system partition configured No hay una partición del sistema EFI configurada - + EFI system partition configured incorrectly La partición del sistema EFI no se ha configurado bien - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem. Se necesita una partición EFI para arrancar %1.<br/><br/>Para establecer una partición EFI vuelve atrás y selecciona o crea un sistema de archivos adecuado. - + The filesystem must be mounted on <strong>%1</strong>. El sistema de archivos debe estar montado en <strong>%1</strong>. - + The filesystem must have type FAT32. El sistema de archivos debe ser de tipo FAT32. - + The filesystem must be at least %1 MiB in size. El sistema de archivos debe tener al menos %1 MiB de tamaño. - + The filesystem must have flag <strong>%1</strong> set. El sistema de archivos debe tener establecido el indicador <strong>%1.</strong> - + You can continue without setting up an EFI system partition but your system may fail to start. Puedes seguir con la instalación sin haber establecido una partición del sistema EFI, pero puede que el sistema no arranque. - + Option to use GPT on BIOS Opción para usar GPT en BIOS - + A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>%2</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. Una tabla de particiones GPT es lo preferible en casi todos los casos. Este instalador también la admite para los sistemas más antiguos basados en arranque por BIOS.<br/><br/>Para configurar una partición GPT en BIOS, (si aún no lo has hecho) vuelve atrás y configura la tabla de particiones como GPT, luego crea una partición sin formato de 8 MB con el indicador <strong>bios_grub</strong> marcado.<br/><br/>Se necesita una partición de 8 MB sin formatear para arrancar %1 en un sistema BIOS con GPT. - + Boot partition not encrypted Partición de arranque sin cifrar - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. Se estableció una partición de arranque aparte junto con una partición raíz cifrada, pero la partición de arranque no está cifrada.<br/><br/>Hay consideraciones de seguridad con esta clase de instalación, porque los ficheros de sistema importantes se mantienen en una partición no cifrada.<br/>Puede continuar si lo desea, pero el desbloqueo del sistema de ficheros ocurrirá más tarde durante el arranque del sistema.<br/>Para cifrar la partición de arranque, retroceda y vuelva a crearla, seleccionando <strong>Cifrar</strong> en la ventana de creación de la partición. - + has at least one disk device available. tiene al menos un dispositivo de disco disponible. - + There are no partitions to install on. No hay particiones donde instalar. @@ -3064,11 +3013,6 @@ El instalador se cerrará y todos tus cambios se perderán. PlasmaLnfPage - - - Form - Formulario - Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. @@ -3431,7 +3375,7 @@ Información de salida: Checking requirements again in a few seconds ... - Comprobando requisitos de nuevo en unos segundos... + Volviendo a comprobar los requisitos, un momento... @@ -3836,11 +3780,6 @@ Información de salida: TrackingPage - - - Form - Formulario - Placeholder @@ -4002,11 +3941,6 @@ Información de salida: WelcomePage - - - Form - Formulario - @@ -4141,12 +4075,12 @@ Información de salida: Debug - Depurar + Depuración Show information about Calamares - Mostrar información acerca de Calamares + Más información sobre Calamares @@ -4222,12 +4156,12 @@ Información de salida: <b>Keyboard Model:&nbsp;&nbsp;</b> - <b>Modelo de Teclado:&nbsp;&nbsp;</b> + <b>Modelo del teclado:&nbsp;&nbsp;</b> Layout - Distribución + Distribución del teclado @@ -4253,7 +4187,7 @@ Información de salida: <h3>Languages</h3> </br> The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>. <h3>Idiomas</h3></br> - La configuración regional del sistema afecta el idioma y el juego de caracteres para algunos elementos de la interfaz de usuario de la línea de comandos. La configuración actual es <strong>%1</strong>. + La configuración regional del sistema afecta al idioma y al juego de caracteres para algunos elementos del terminal. La configuración actual es <strong>%1</strong>. diff --git a/lang/calamares_es_MX.ts b/lang/calamares_es_MX.ts index eb69db160..24ff8a8d0 100644 --- a/lang/calamares_es_MX.ts +++ b/lang/calamares_es_MX.ts @@ -84,11 +84,6 @@ Calamares::DebugWindow - - - Form - Formulario - GlobalStorage @@ -550,11 +545,6 @@ El instalador terminará y se perderán todos los cambios. ChoicePage - - - Form - Formulario - Select storage de&vice: @@ -921,12 +911,12 @@ El instalador terminará y se perderán todos los cambios. - + Your passwords do not match! Las contraseñas no coinciden! - + OK! @@ -1463,11 +1453,6 @@ El instalador terminará y se perderán todos los cambios. EncryptWidget - - - Form - Formulario - En&crypt system @@ -1573,11 +1558,6 @@ El instalador terminará y se perderán todos los cambios. FinishedPage - - - Form - Formulario - &Restart now @@ -1928,11 +1908,6 @@ El instalador terminará y se perderán todos los cambios. LicensePage - - - Form - Formulario - <h1>License Agreement</h1> @@ -2088,33 +2063,27 @@ El instalador terminará y se perderán todos los cambios. - - + + No partitions are defined. - - - + + Encrypted rootfs setup error - + Root partition %1 is LUKS but no passphrase has been set. - + Could not create LUKS key file for root partition %1. - - - Could not configure LUKS key file on partition %1. - - MachineIdJob @@ -2607,18 +2576,13 @@ El instalador terminará y se perderán todos los cambios. Error desconocido - + Password is empty PackageChooserPage - - - Form - Formulario - Product Name @@ -2660,11 +2624,6 @@ El instalador terminará y se perderán todos los cambios. Page_Keyboard - - - Form - Formulario - Keyboard Model: @@ -2678,11 +2637,6 @@ El instalador terminará y se perderán todos los cambios. Page_UserSetup - - - Form - Formulario - What is your name? @@ -2859,11 +2813,6 @@ El instalador terminará y se perderán todos los cambios. PartitionPage - - - Form - Formulario - Storage de&vice: @@ -2973,72 +2922,72 @@ El instalador terminará y se perderán todos los cambios. Después: - + No EFI system partition configured Sistema de partición EFI no configurada - + EFI system partition configured incorrectly - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem. - + The filesystem must be mounted on <strong>%1</strong>. - + The filesystem must have type FAT32. - + The filesystem must be at least %1 MiB in size. - + The filesystem must have flag <strong>%1</strong> set. - + You can continue without setting up an EFI system partition but your system may fail to start. - + Option to use GPT on BIOS - + A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>%2</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. - + Boot partition not encrypted Partición de arranque no encriptada - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. Se creó una partición de arranque separada junto con una partición raíz cifrada, pero la partición de arranque no está encriptada.<br/><br/> Existen problemas de seguridad con este tipo de configuración, ya que los archivos importantes del sistema se guardan en una partición no encriptada. <br/>Puede continuar si lo desea, pero el desbloqueo del sistema de archivos ocurrirá más tarde durante el inicio del sistema. <br/>Para encriptar la partición de arranque, retroceda y vuelva a crearla, seleccionando <strong>Encriptar</strong> en la ventana de creación de la partición. - + has at least one disk device available. - + There are no partitions to install on. @@ -3059,11 +3008,6 @@ El instalador terminará y se perderán todos los cambios. PlasmaLnfPage - - - Form - Formulario - Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. @@ -3828,11 +3772,6 @@ Salida TrackingPage - - - Form - Formulario - Placeholder @@ -3994,11 +3933,6 @@ Salida WelcomePage - - - Form - Formulario - diff --git a/lang/calamares_es_PR.ts b/lang/calamares_es_PR.ts index e8156e684..dc7952cf3 100644 --- a/lang/calamares_es_PR.ts +++ b/lang/calamares_es_PR.ts @@ -84,11 +84,6 @@ Calamares::DebugWindow - - - Form - Formulario - GlobalStorage @@ -548,11 +543,6 @@ The installer will quit and all changes will be lost. ChoicePage - - - Form - Formulario - Select storage de&vice: @@ -918,12 +908,12 @@ The installer will quit and all changes will be lost. - + Your passwords do not match! - + OK! @@ -1460,11 +1450,6 @@ The installer will quit and all changes will be lost. EncryptWidget - - - Form - Formulario - En&crypt system @@ -1570,11 +1555,6 @@ The installer will quit and all changes will be lost. FinishedPage - - - Form - Formulario - &Restart now @@ -1925,11 +1905,6 @@ The installer will quit and all changes will be lost. LicensePage - - - Form - Formulario - <h1>License Agreement</h1> @@ -2085,33 +2060,27 @@ The installer will quit and all changes will be lost. - - + + No partitions are defined. - - - + + Encrypted rootfs setup error - + Root partition %1 is LUKS but no passphrase has been set. - + Could not create LUKS key file for root partition %1. - - - Could not configure LUKS key file on partition %1. - - MachineIdJob @@ -2604,18 +2573,13 @@ The installer will quit and all changes will be lost. - + Password is empty PackageChooserPage - - - Form - Formulario - Product Name @@ -2657,11 +2621,6 @@ The installer will quit and all changes will be lost. Page_Keyboard - - - Form - Formulario - Keyboard Model: @@ -2675,11 +2634,6 @@ The installer will quit and all changes will be lost. Page_UserSetup - - - Form - Formulario - What is your name? @@ -2856,11 +2810,6 @@ The installer will quit and all changes will be lost. PartitionPage - - - Form - Formulario - Storage de&vice: @@ -2970,72 +2919,72 @@ The installer will quit and all changes will be lost. - + No EFI system partition configured - + EFI system partition configured incorrectly - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem. - + The filesystem must be mounted on <strong>%1</strong>. - + The filesystem must have type FAT32. - + The filesystem must be at least %1 MiB in size. - + The filesystem must have flag <strong>%1</strong> set. - + You can continue without setting up an EFI system partition but your system may fail to start. - + Option to use GPT on BIOS - + A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>%2</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. - + Boot partition not encrypted - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. - + has at least one disk device available. - + There are no partitions to install on. @@ -3056,11 +3005,6 @@ The installer will quit and all changes will be lost. PlasmaLnfPage - - - Form - Formulario - Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. @@ -3822,11 +3766,6 @@ Output: TrackingPage - - - Form - Formulario - Placeholder @@ -3988,11 +3927,6 @@ Output: WelcomePage - - - Form - Formulario - diff --git a/lang/calamares_et.ts b/lang/calamares_et.ts index 16df3a5f2..dd0abf109 100644 --- a/lang/calamares_et.ts +++ b/lang/calamares_et.ts @@ -84,11 +84,6 @@ Calamares::DebugWindow - - - Form - Form - GlobalStorage @@ -547,11 +542,6 @@ Paigaldaja sulgub ning kõik muutused kaovad. ChoicePage - - - Form - Form - Select storage de&vice: @@ -917,12 +907,12 @@ Paigaldaja sulgub ning kõik muutused kaovad. - + Your passwords do not match! Sinu paroolid ei ühti! - + OK! @@ -1459,11 +1449,6 @@ Paigaldaja sulgub ning kõik muutused kaovad. EncryptWidget - - - Form - Form - En&crypt system @@ -1569,11 +1554,6 @@ Paigaldaja sulgub ning kõik muutused kaovad. FinishedPage - - - Form - Form - &Restart now @@ -1924,11 +1904,6 @@ Paigaldaja sulgub ning kõik muutused kaovad. LicensePage - - - Form - Form - <h1>License Agreement</h1> @@ -2084,33 +2059,27 @@ Paigaldaja sulgub ning kõik muutused kaovad. - - + + No partitions are defined. - - - + + Encrypted rootfs setup error - + Root partition %1 is LUKS but no passphrase has been set. - + Could not create LUKS key file for root partition %1. - - - Could not configure LUKS key file on partition %1. - - MachineIdJob @@ -2594,18 +2563,13 @@ Paigaldaja sulgub ning kõik muutused kaovad. Tundmatu viga - + Password is empty PackageChooserPage - - - Form - Form - Product Name @@ -2647,11 +2611,6 @@ Paigaldaja sulgub ning kõik muutused kaovad. Page_Keyboard - - - Form - Form - Keyboard Model: @@ -2665,11 +2624,6 @@ Paigaldaja sulgub ning kõik muutused kaovad. Page_UserSetup - - - Form - Form - What is your name? @@ -2846,11 +2800,6 @@ Paigaldaja sulgub ning kõik muutused kaovad. PartitionPage - - - Form - Form - Storage de&vice: @@ -2960,72 +2909,72 @@ Paigaldaja sulgub ning kõik muutused kaovad. Pärast: - + No EFI system partition configured EFI süsteemipartitsiooni pole seadistatud - + EFI system partition configured incorrectly - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem. - + The filesystem must be mounted on <strong>%1</strong>. - + The filesystem must have type FAT32. - + The filesystem must be at least %1 MiB in size. - + The filesystem must have flag <strong>%1</strong> set. - + You can continue without setting up an EFI system partition but your system may fail to start. - + Option to use GPT on BIOS - + A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>%2</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. - + Boot partition not encrypted Käivituspartitsioon pole krüptitud - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. Eraldi käivituspartitsioon seadistati koos krüptitud juurpartitsiooniga, aga käivituspartitsioon ise ei ole krüptitud.<br/><br/>Selle seadistusega kaasnevad turvaprobleemid, sest tähtsad süsteemifailid hoitakse krüptimata partitsioonil.<br/>Sa võid soovi korral jätkata, aga failisüsteemi lukust lahti tegemine toimub hiljem süsteemi käivitusel.<br/>Et krüpteerida käivituspartisiooni, mine tagasi ja taasloo see, valides <strong>Krüpteeri</strong> partitsiooni loomise aknas. - + has at least one disk device available. - + There are no partitions to install on. @@ -3046,11 +2995,6 @@ Paigaldaja sulgub ning kõik muutused kaovad. PlasmaLnfPage - - - Form - Form - Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. @@ -3815,11 +3759,6 @@ Väljund: TrackingPage - - - Form - Form - Placeholder @@ -3981,11 +3920,6 @@ Väljund: WelcomePage - - - Form - Form - diff --git a/lang/calamares_eu.ts b/lang/calamares_eu.ts index 17048c839..b6114c2da 100644 --- a/lang/calamares_eu.ts +++ b/lang/calamares_eu.ts @@ -84,11 +84,6 @@ Calamares::DebugWindow - - - Form - Formulario - GlobalStorage @@ -547,11 +542,6 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira. ChoicePage - - - Form - Formulario - Select storage de&vice: @@ -917,12 +907,12 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira. - + Your passwords do not match! Pasahitzak ez datoz bat! - + OK! @@ -1459,11 +1449,6 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira. EncryptWidget - - - Form - Formulario - En&crypt system @@ -1569,11 +1554,6 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira. FinishedPage - - - Form - Formulario - &Restart now @@ -1924,11 +1904,6 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira. LicensePage - - - Form - Formulario - <h1>License Agreement</h1> @@ -2084,33 +2059,27 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira. - - + + No partitions are defined. - - - + + Encrypted rootfs setup error - + Root partition %1 is LUKS but no passphrase has been set. - + Could not create LUKS key file for root partition %1. - - - Could not configure LUKS key file on partition %1. - - MachineIdJob @@ -2594,18 +2563,13 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira. Hutsegite ezezaguna - + Password is empty PackageChooserPage - - - Form - Formulario - Product Name @@ -2647,11 +2611,6 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira. Page_Keyboard - - - Form - Formulario - Keyboard Model: @@ -2665,11 +2624,6 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira. Page_UserSetup - - - Form - Formulario - What is your name? @@ -2846,11 +2800,6 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira. PartitionPage - - - Form - Formulario - Storage de&vice: @@ -2960,72 +2909,72 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira. Ondoren: - + No EFI system partition configured - + EFI system partition configured incorrectly - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem. - + The filesystem must be mounted on <strong>%1</strong>. - + The filesystem must have type FAT32. - + The filesystem must be at least %1 MiB in size. - + The filesystem must have flag <strong>%1</strong> set. - + You can continue without setting up an EFI system partition but your system may fail to start. - + Option to use GPT on BIOS - + A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>%2</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. - + Boot partition not encrypted - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. - + has at least one disk device available. - + There are no partitions to install on. @@ -3046,11 +2995,6 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira. PlasmaLnfPage - - - Form - Formulario - Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. @@ -3814,11 +3758,6 @@ Irteera: TrackingPage - - - Form - Formulario - Placeholder @@ -3980,11 +3919,6 @@ Irteera: WelcomePage - - - Form - Formulario - diff --git a/lang/calamares_fa.ts b/lang/calamares_fa.ts index 5f39e6c0b..be5022fdd 100644 --- a/lang/calamares_fa.ts +++ b/lang/calamares_fa.ts @@ -84,11 +84,6 @@ Calamares::DebugWindow - - - Form - فرم - GlobalStorage @@ -552,11 +547,6 @@ The installer will quit and all changes will be lost. ChoicePage - - - Form - فرم - Select storage de&vice: @@ -922,12 +912,12 @@ The installer will quit and all changes will be lost. فقط حروف ، اعداد ، زیر خط و خط خط مجاز است. - + Your passwords do not match! گذرواژه‌هایتان مطابق نیستند! - + OK! باشه! @@ -1464,11 +1454,6 @@ The installer will quit and all changes will be lost. EncryptWidget - - - Form - فرم - En&crypt system @@ -1574,11 +1559,6 @@ The installer will quit and all changes will be lost. FinishedPage - - - Form - فرم - &Restart now @@ -1929,11 +1909,6 @@ The installer will quit and all changes will be lost. LicensePage - - - Form - فرم - <h1>License Agreement</h1> @@ -2089,33 +2064,27 @@ The installer will quit and all changes will be lost. پیکربندی پروندهٔ کلید LUKS. - - + + No partitions are defined. هیچ افرازی تعریف نشده - - - + + Encrypted rootfs setup error خطای برپاسازی rootfs رمزشده - + Root partition %1 is LUKS but no passphrase has been set. افراز روت %1 یک LUKS است، ولی هیچ گذرواژه ای تنظیم نشده است. - + Could not create LUKS key file for root partition %1. نمیتوان پرونده کلید LUKS را برای افراز روت %1 ایجاد کرد. - - - Could not configure LUKS key file on partition %1. - نمیتوان پرونده کلید LUKS را برای افراز روت %1 تنظیم کرد. - MachineIdJob @@ -2599,18 +2568,13 @@ The installer will quit and all changes will be lost. خطای ناشناخته - + Password is empty گذرواژه خالی است PackageChooserPage - - - Form - فرم - Product Name @@ -2652,11 +2616,6 @@ The installer will quit and all changes will be lost. Page_Keyboard - - - Form - فرم - Keyboard Model: @@ -2670,11 +2629,6 @@ The installer will quit and all changes will be lost. Page_UserSetup - - - Form - فرم - What is your name? @@ -2851,11 +2805,6 @@ The installer will quit and all changes will be lost. PartitionPage - - - Form - فرم - Storage de&vice: @@ -2965,72 +2914,72 @@ The installer will quit and all changes will be lost. بعد از: - + No EFI system partition configured هیچ پارتیشن سیستم EFI پیکربندی نشده است - + EFI system partition configured incorrectly افراز سامانه EFI به نادرستی تنظیم شده است - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem. یک افراز سامانه EFI نیازمندست که از %1 شروع شود.<br/><br/>برای تنظیم یک افراز سامانه EFI، به عقب بازگشته و یک سامانه پرونده مناسب انتخاب یا ایجاد کنید. - + The filesystem must be mounted on <strong>%1</strong>. سامانه پرونده باید روی <strong>%1</strong> سوارشده باشد. - + The filesystem must have type FAT32. سامانه پرونده باید دارای نوع FAT32 باشد. - + The filesystem must be at least %1 MiB in size. سامانه پرونده حداقل باید دارای %1مبی‌بایت حجم باشد. - + The filesystem must have flag <strong>%1</strong> set. سامانه پرونده باید پرچم <strong>%1</strong> را دارا باشد. - + You can continue without setting up an EFI system partition but your system may fail to start. شما میتوانید بدون برپاکردن افراز سامانه EFI ادامه دهید ولی ممکن است سامانه برای شروع با مشکل مواجه شود. - + Option to use GPT on BIOS گزینه ای برای استفاده از GPT در BIOS - + A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>%2</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. - + Boot partition not encrypted پارتیشن بوت رمزشده نیست - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. یک پارتیشن بوت جداگانه همراه با یک پارتیشن ریشه ای رمزگذاری شده راه اندازی شده است ، اما پارتیشن بوت رمزگذاری نشده است. با این نوع تنظیمات مشکلات امنیتی وجود دارد ، زیرا پرونده های مهم سیستم در یک پارتیشن رمزگذاری نشده نگهداری می شوند. در صورت تمایل می توانید ادامه دهید ، اما باز کردن قفل سیستم فایل بعداً در هنگام راه اندازی سیستم اتفاق می افتد. برای رمزگذاری پارتیشن بوت ، به عقب برگردید و آن را دوباره ایجاد کنید ، رمزگذاری را در پنجره ایجاد پارتیشن انتخاب کنید. - + has at least one disk device available. حداقل یک دستگاه دیسک در دسترس دارد. - + There are no partitions to install on. هیچ پارتیشنی برای نصب وجود ندارد @@ -3051,11 +3000,6 @@ The installer will quit and all changes will be lost. PlasmaLnfPage - - - Form - فرم - Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. @@ -3820,11 +3764,6 @@ Output: TrackingPage - - - Form - فرم - Placeholder @@ -3986,11 +3925,6 @@ Output: WelcomePage - - - Form - فرم - diff --git a/lang/calamares_fi_FI.ts b/lang/calamares_fi_FI.ts index 863b1a44b..a8eaed57b 100644 --- a/lang/calamares_fi_FI.ts +++ b/lang/calamares_fi_FI.ts @@ -84,11 +84,6 @@ Calamares::DebugWindow - - - Form - Lomake - GlobalStorage @@ -552,11 +547,6 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat. ChoicePage - - - Form - Lomake - Select storage de&vice: @@ -925,12 +915,12 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä.Vain kirjaimet, numerot, alaviivat ja tavuviivat ovat sallittuja. - + Your passwords do not match! Salasanasi eivät täsmää! - + OK! OK! @@ -1467,11 +1457,6 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä. EncryptWidget - - - Form - Lomake - En&crypt system @@ -1577,11 +1562,6 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä. FinishedPage - - - Form - Lomake - &Restart now @@ -1932,11 +1912,6 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä. LicensePage - - - Form - Lomake - <h1>License Agreement</h1> @@ -2092,33 +2067,27 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä.LUKS-avaintiedoston määrittäminen. - - + + No partitions are defined. Osioita ei ole määritelty. - - - + + Encrypted rootfs setup error Salattu rootfs asennusvirhe - + Root partition %1 is LUKS but no passphrase has been set. Juuriosio %1 on LUKS, mutta salasanaa ei ole asetettu. - + Could not create LUKS key file for root partition %1. LUKS-avaintiedostoa ei voitu luoda juuriosioon %1. - - - Could not configure LUKS key file on partition %1. - LUKS-avaintiedostoa ei voi määrittää osiossa %1. - MachineIdJob @@ -2604,18 +2573,13 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä.Tuntematon virhe - + Password is empty Salasana on tyhjä PackageChooserPage - - - Form - Lomake - Product Name @@ -2657,11 +2621,6 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä. Page_Keyboard - - - Form - Lomake - Keyboard Model: @@ -2675,11 +2634,6 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä. Page_UserSetup - - - Form - Lomake - What is your name? @@ -2856,11 +2810,6 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä. PartitionPage - - - Form - Lomake - Storage de&vice: @@ -2970,72 +2919,72 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä.Jälkeen: - + No EFI system partition configured EFI-järjestelmäosiota ei ole määritetty - + EFI system partition configured incorrectly EFI-järjestelmäosio on määritetty väärin - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem. EFI-järjestelmäosio on vaatimus käynnistääksesi %1.<br/><br/>Palaa jos haluat määrittää EFI-järjestelmäosion, valitse tai luo sopiva tiedostojärjestelmä. - + The filesystem must be mounted on <strong>%1</strong>. Tiedostojärjestelmä on asennettava <strong>%1</strong>. - + The filesystem must have type FAT32. Tiedostojärjestelmän on oltava tyyppiä FAT32. - + The filesystem must be at least %1 MiB in size. Tiedostojärjestelmän on oltava kooltaan vähintään %1 MiB. - + The filesystem must have flag <strong>%1</strong> set. Tiedostojärjestelmässä on oltava <strong>%1</strong> lippu. - + You can continue without setting up an EFI system partition but your system may fail to start. Voit jatkaa ilman EFI-järjestelmäosion määrittämistä, mutta järjestelmä ei ehkä käynnisty. - + Option to use GPT on BIOS BIOS:ssa mahdollisuus käyttää GPT:tä - + A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>%2</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. GPT-osiotaulukko on paras vaihtoehto kaikille järjestelmille. Kuitenkin asennusohjelma tukee myös BIOS-järjestelmää.<br/><br/>Jos haluat määrittää GPT-osiotaulukon BIOS:ssa (jos et ole jo tehnyt) niin palaa takaisin ja aseta osiotaulukkoksi GPT. Luo seuraavaksi 8 Mt alustamaton osio <strong>%2</strong> lipulla käyttöön.<br/><br/>Alustamaton 8 Mt tarvitaan %1 käynnistämiseen BIOS-järjestelmässä, jossa on GPT. - + Boot partition not encrypted Käynnistysosiota ei ole salattu - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. Erillinen käynnistysosio perustettiin yhdessä salatun juuriosion kanssa, mutta käynnistysosio ei ole salattu.<br/><br/>Tällaisissa asetuksissa on tietoturvaongelmia, koska tärkeät järjestelmätiedostot pidetään salaamattomassa osiossa.<br/>Voit jatkaa, jos haluat, mutta tiedostojärjestelmän lukituksen avaaminen tapahtuu myöhemmin järjestelmän käynnistyksen aikana.<br/>Käynnistysosion salaamiseksi siirry takaisin ja luo se uudelleen valitsemalla <strong>Salaa</strong> osion luominen -ikkunassa. - + has at least one disk device available. on vähintään yksi asema käytettävissä. - + There are no partitions to install on. Asennettavia osioita ei ole. @@ -3056,11 +3005,6 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä. PlasmaLnfPage - - - Form - Lomake - Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. @@ -3828,11 +3772,6 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä.</ TrackingPage - - - Form - Lomake - Placeholder @@ -3994,11 +3933,6 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä.</ WelcomePage - - - Form - Lomake - diff --git a/lang/calamares_fr.ts b/lang/calamares_fr.ts index 0fcd70991..1a12c150f 100644 --- a/lang/calamares_fr.ts +++ b/lang/calamares_fr.ts @@ -84,11 +84,6 @@ Calamares::DebugWindow - - - Form - Formulaire - GlobalStorage @@ -288,19 +283,19 @@ Waiting for %n module(s). - - - - + + En attente d'un module. + En attente de beaucoup de modules. + En attente de %n modules. (%n second(s)) - - - - + + (%n seconde) + (plusieurs secondes) + (%n secondes) @@ -554,11 +549,6 @@ L'installateur se fermera et les changements seront perdus. ChoicePage - - - Form - Formulaire - Select storage de&vice: @@ -778,7 +768,7 @@ L'installateur se fermera et les changements seront perdus. The commands use variables that are not defined. Missing variables are: %1. - + Les commandes utilisent des variables qui ne sont pas définies. Variables manquantes : %1. @@ -841,12 +831,12 @@ L'installateur se fermera et les changements seront perdus. This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. - + Cet ordinateur ne satisfait pas les conditions requises pour installer %1.<br/>Le paramétrage ne peut pas continuer. This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. - + Cet ordinateur ne satisfait pas les conditions requises pour installer %1.<br/>L'installation ne peut pas continuer. @@ -924,12 +914,12 @@ L'installateur se fermera et les changements seront perdus. Seuls les lettres, nombres, underscores et tirets sont autorisés. - + Your passwords do not match! Vos mots de passe ne correspondent pas ! - + OK! OK! @@ -1466,11 +1456,6 @@ L'installateur se fermera et les changements seront perdus. EncryptWidget - - - Form - Formulaire - En&crypt system @@ -1576,11 +1561,6 @@ L'installateur se fermera et les changements seront perdus. FinishedPage - - - Form - Formulaire - &Restart now @@ -1667,12 +1647,12 @@ L'installateur se fermera et les changements seront perdus. Please ensure the system has at least %1 GiB available drive space. - + Veuillez vous assurer que le système a au moins %1 Gio d'espace disque disponible. Available drive space is all of the hard disks and SSDs connected to the system. - + L’espace disque disponible correspond à tous les disques durs et SSD connectés au système. @@ -1742,53 +1722,53 @@ L'installateur se fermera et les changements seront perdus. is always false - + est toujours faux The computer says no. - + L'ordinateur dit non. is always false (slowly) - + est toujours faux (lentement) The computer says no (slowly). - + L'ordinateur dit non (lentement). is always true - + est toujours vrai The computer says yes. - + L'ordinateur dit oui. is always true (slowly) - + est toujours vrai (lentement) The computer says yes (slowly). - + L'ordinateur dit oui (lentement). is checked three times. - + est vérifié trois fois. The snark has not been checked three times. The (some mythological beast) has not been checked three times. - + Le bruit (snark) n’a pas été vérifié trois fois. @@ -1931,11 +1911,6 @@ L'installateur se fermera et les changements seront perdus. LicensePage - - - Form - Formulaire - <h1>License Agreement</h1> @@ -2091,33 +2066,27 @@ L'installateur se fermera et les changements seront perdus. Configuration de la clé de fichier LUKS. - - + + No partitions are defined. Aucune partition n'est définie. - - - + + Encrypted rootfs setup error Erreur du chiffrement du setup rootfs - + Root partition %1 is LUKS but no passphrase has been set. La partition racine %1 est LUKS mais aucune phrase secrète n'a été configurée. - + Could not create LUKS key file for root partition %1. Impossible de créer le fichier de clé LUKS pour la partition racine %1. - - - Could not configure LUKS key file on partition %1. - La clé LUKS n'a pas pu être configurée sur la partition %1. - MachineIdJob @@ -2612,18 +2581,13 @@ L'installateur se fermera et les changements seront perdus. Erreur inconnue - + Password is empty Le mot de passe est vide PackageChooserPage - - - Form - Formulaire - Product Name @@ -2665,11 +2629,6 @@ L'installateur se fermera et les changements seront perdus. Page_Keyboard - - - Form - Formulaire - Keyboard Model: @@ -2683,11 +2642,6 @@ L'installateur se fermera et les changements seront perdus. Page_UserSetup - - - Form - Formulaire - What is your name? @@ -2864,11 +2818,6 @@ L'installateur se fermera et les changements seront perdus. PartitionPage - - - Form - Formulaire - Storage de&vice: @@ -2978,72 +2927,72 @@ L'installateur se fermera et les changements seront perdus. Après : - + No EFI system partition configured Aucune partition système EFI configurée - + EFI system partition configured incorrectly Partition système EFI mal configurée - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem. Une partition système EFI est nécessaire pour démarrer %1.<br/><br/>Pour configurer une partition système EFI, revenir en arrière et sélectionner ou créer un système de fichiers approprié. - + The filesystem must be mounted on <strong>%1</strong>. Le système de fichiers doit être monté sur <strong>%1</strong>. - + The filesystem must have type FAT32. Le système de fichiers doit avoir le type FAT32. - + The filesystem must be at least %1 MiB in size. Le système de fichiers doit avoir une taille d'au moins %1 Mio. - + The filesystem must have flag <strong>%1</strong> set. Le système de fichiers doit avoir l'indicateur <strong>%1</strong> défini. - + You can continue without setting up an EFI system partition but your system may fail to start. Vous pouvez continuer sans configurer de partition système EFI, mais votre système risque de ne pas démarrer. - + Option to use GPT on BIOS Option pour utiliser GPT sur le BIOS - + A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>%2</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. Une table de partition GPT est la meilleure option pour tous les systèmes. Ce programme d'installation prend également en charge une telle configuration pour les systèmes BIOS. <br/><br/>Pour configurer une table de partition GPT sur le BIOS, (si ce n'est déjà fait), revenir en arrière et définir la table de partition sur GPT, puis créer une partition non formatée de 8 Mo avec l'indicateur <strong>%2</strong> activé.<br/><br/>Une partition non formatée de 8 Mo est nécessaire pour démarrer %1 sur un système BIOS avec GPT. - + Boot partition not encrypted Partition d'amorçage non chiffrée. - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. Une partition d'amorçage distincte a été configurée avec une partition racine chiffrée, mais la partition d'amorçage n'est pas chiffrée. <br/> <br/> Il y a des problèmes de sécurité avec ce type d'installation, car des fichiers système importants sont conservés sur une partition non chiffrée <br/> Vous pouvez continuer si vous le souhaitez, mais le déverrouillage du système de fichiers se produira plus tard au démarrage du système. <br/> Pour chiffrer la partition d'amorçage, revenez en arrière et recréez-la, en sélectionnant <strong> Chiffrer </ strong> dans la partition Fenêtre de création. - + has at least one disk device available. a au moins un disque disponible. - + There are no partitions to install on. Il n'y a pas de partition pour l'installation @@ -3064,11 +3013,6 @@ L'installateur se fermera et les changements seront perdus. PlasmaLnfPage - - - Form - Formulaire - Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. @@ -3432,7 +3376,7 @@ Sortie Checking requirements again in a few seconds ... - + Vérifie à nouveau les exigences dans quelques secondes ... @@ -3837,11 +3781,6 @@ Sortie TrackingPage - - - Form - Formulaire - Placeholder @@ -4003,11 +3942,6 @@ Sortie WelcomePage - - - Form - Formulaire - @@ -4222,17 +4156,17 @@ Sortie <b>Keyboard Model:&nbsp;&nbsp;</b> - + <b>Modèle de clavier :&nbsp;&nbsp;</b> Layout - + Disposition Variant - + Variante diff --git a/lang/calamares_fur.ts b/lang/calamares_fur.ts index de6aa5807..a5653c330 100644 --- a/lang/calamares_fur.ts +++ b/lang/calamares_fur.ts @@ -84,11 +84,6 @@ Calamares::DebugWindow - - - Form - Formulari - GlobalStorage @@ -552,11 +547,6 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.< ChoicePage - - - Form - Formulari - Select storage de&vice: @@ -922,12 +912,12 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.< A son ametûts dome i numars, lis letaris, lis liniutis bassis e i tratuts. - + Your passwords do not match! Lis passwords no corispuindin! - + OK! Va ben! @@ -1464,11 +1454,6 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.< EncryptWidget - - - Form - Formulari - En&crypt system @@ -1574,11 +1559,6 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.< FinishedPage - - - Form - Formulari - &Restart now @@ -1929,11 +1909,6 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.< LicensePage - - - Form - Formulari - <h1>License Agreement</h1> @@ -2089,33 +2064,27 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.< Daûr a configurâ dal file clâf di LUKS. - - + + No partitions are defined. No je stade definide nissune partizion. - - - + + Encrypted rootfs setup error Erôr te configurazion di rootfs cifrât - + Root partition %1 is LUKS but no passphrase has been set. La partizion lidrîs (root) %1 e je LUKS ma no je stade stabilide nissune frase di acès. - + Could not create LUKS key file for root partition %1. Impussibil creâ il file clâf di LUKS pe partizion lidrîs (root) %1. - - - Could not configure LUKS key file on partition %1. - No si è rivâts a configurâ il file clâf di LUKS su la partizion %1. - MachineIdJob @@ -2601,18 +2570,13 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.< Erôr no cognossût - + Password is empty Password vueide PackageChooserPage - - - Form - Formulari - Product Name @@ -2654,11 +2618,6 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.< Page_Keyboard - - - Form - Formulari - Keyboard Model: @@ -2672,11 +2631,6 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.< Page_UserSetup - - - Form - Formulari - What is your name? @@ -2853,11 +2807,6 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.< PartitionPage - - - Form - Formulari - Storage de&vice: @@ -2967,72 +2916,72 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.< Dopo: - + No EFI system partition configured Nissune partizion di sisteme EFI configurade - + EFI system partition configured incorrectly La partizion di sisteme EFI no je stade configurade ben - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem. Une partizion di sisteme EFI e je necessarie par inviâ %1. <br/><br/>Par configurâ une partizion di sisteme EFI, torne indaûr e selezione o cree un filesystem adat. - + The filesystem must be mounted on <strong>%1</strong>. Al è necessari che il filesystem al sedi montât su <strong>%1</strong>. - + The filesystem must have type FAT32. Al è necessari che il filesystem al sedi di gjenar FAT32. - + The filesystem must be at least %1 MiB in size. Al è necessari che il filesystem al sedi grant almancul %1 MiB. - + The filesystem must have flag <strong>%1</strong> set. Il filesystem al à di vê ativade la opzion <strong>%1</strong>. - + You can continue without setting up an EFI system partition but your system may fail to start. Tu puedis continuâ cence configurâ une partizion di sisteme EFI ma al è pussibil che il to sisteme nol rivi a inviâsi. - + Option to use GPT on BIOS Opzion par doprâ GPT su BIOS - + A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>%2</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. Une tabele des partizions GPT e je la miôr sielte par ducj i sistemis. Chest instaladôr al supuarte chê configurazion ancje pai sistemis BIOS. <br/><br/>Par configurâ une tabele des partizions GPT su BIOS, (se nol è za stât fat) torne indaûr e configure la tabele des partizions a GPT, dopo cree une partizion no formatade di 8 MB cu la opzion <strong>%2</strong> ativade.<br/><br/>Une partizion no formatade di 8 MB e je necessarie par inviâ %1 suntun sisteme BIOS cun GPT. - + Boot partition not encrypted Partizion di inviament no cifrade - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. E je stade configurade une partizion di inviament separade adun cuntune partizion lidrîs cifrade, ma la partizion di inviament no je cifrade.<br/><br/> A esistin problemis di sigurece cun chest gjenar di configurazion, par vie che i file di sisteme impuartants a vegnin tignûts intune partizion no cifrade.<br/>Tu puedis continuâ se tu lu desideris, ma il sbloc dal filesystem al sucedarà plui indenant tal inviament dal sisteme.<br/>Par cifrâ la partizion di inviament, torne indaûr e torne creile, selezionant <strong>Cifrâ</strong> tal barcon di creazion de partizion. - + has at least one disk device available. al à almancul une unitât disc disponibil. - + There are no partitions to install on. No son partizions dulà lâ a instalâ. @@ -3053,11 +3002,6 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.< PlasmaLnfPage - - - Form - Formulari - Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. @@ -3825,11 +3769,6 @@ Output: TrackingPage - - - Form - Formulari - Placeholder @@ -3991,11 +3930,6 @@ Output: WelcomePage - - - Form - Formulari - diff --git a/lang/calamares_gl.ts b/lang/calamares_gl.ts index 3266a8348..fad222923 100644 --- a/lang/calamares_gl.ts +++ b/lang/calamares_gl.ts @@ -85,11 +85,6 @@ Calamares::DebugWindow - - - Form - Formulario - GlobalStorage @@ -548,11 +543,6 @@ O instalador pecharase e perderanse todos os cambios. ChoicePage - - - Form - Formulario - Select storage de&vice: @@ -918,12 +908,12 @@ O instalador pecharase e perderanse todos os cambios. - + Your passwords do not match! Os contrasinais non coinciden! - + OK! @@ -1460,11 +1450,6 @@ O instalador pecharase e perderanse todos os cambios. EncryptWidget - - - Form - Formulario - En&crypt system @@ -1570,11 +1555,6 @@ O instalador pecharase e perderanse todos os cambios. FinishedPage - - - Form - Formulario - &Restart now @@ -1925,11 +1905,6 @@ O instalador pecharase e perderanse todos os cambios. LicensePage - - - Form - Formulario - <h1>License Agreement</h1> @@ -2085,33 +2060,27 @@ O instalador pecharase e perderanse todos os cambios. - - + + No partitions are defined. - - - + + Encrypted rootfs setup error - + Root partition %1 is LUKS but no passphrase has been set. - + Could not create LUKS key file for root partition %1. - - - Could not configure LUKS key file on partition %1. - - MachineIdJob @@ -2595,18 +2564,13 @@ O instalador pecharase e perderanse todos os cambios. Erro descoñecido - + Password is empty PackageChooserPage - - - Form - Formulario - Product Name @@ -2648,11 +2612,6 @@ O instalador pecharase e perderanse todos os cambios. Page_Keyboard - - - Form - Formulario - Keyboard Model: @@ -2666,11 +2625,6 @@ O instalador pecharase e perderanse todos os cambios. Page_UserSetup - - - Form - Formulario - What is your name? @@ -2847,11 +2801,6 @@ O instalador pecharase e perderanse todos os cambios. PartitionPage - - - Form - Formulario - Storage de&vice: @@ -2961,72 +2910,72 @@ O instalador pecharase e perderanse todos os cambios. Despois: - + No EFI system partition configured Non hai ningunha partición de sistema EFI configurada - + EFI system partition configured incorrectly - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem. - + The filesystem must be mounted on <strong>%1</strong>. - + The filesystem must have type FAT32. - + The filesystem must be at least %1 MiB in size. - + The filesystem must have flag <strong>%1</strong> set. - + You can continue without setting up an EFI system partition but your system may fail to start. - + Option to use GPT on BIOS - + A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>%2</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. - + Boot partition not encrypted A partición de arranque non está cifrada - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. Configurouse unha partición de arranque separada xunto cunha partición raíz cifrada, mais a partición raíz non está cifrada.<br/><br/>Con este tipo de configuración preocupa a seguranza porque nunha partición sen cifrar grávanse ficheiros de sistema importantes.<br/>Pode continuar, se así o desexa, mais o desbloqueo do sistema de ficheiros producirase máis tarde durante o arranque do sistema.<br/>Para cifrar unha partición raíz volva atrás e créea de novo, seleccionando <strong>Cifrar</strong> na xanela de creación de particións. - + has at least one disk device available. - + There are no partitions to install on. @@ -3047,11 +2996,6 @@ O instalador pecharase e perderanse todos os cambios. PlasmaLnfPage - - - Form - Formulario - Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. @@ -3816,11 +3760,6 @@ Saída: TrackingPage - - - Form - Formulario - Placeholder @@ -3982,11 +3921,6 @@ Saída: WelcomePage - - - Form - Formulario - diff --git a/lang/calamares_gu.ts b/lang/calamares_gu.ts index 34d19a446..f3c72dd73 100644 --- a/lang/calamares_gu.ts +++ b/lang/calamares_gu.ts @@ -84,11 +84,6 @@ Calamares::DebugWindow - - - Form - - GlobalStorage @@ -546,11 +541,6 @@ The installer will quit and all changes will be lost. ChoicePage - - - Form - - Select storage de&vice: @@ -916,12 +906,12 @@ The installer will quit and all changes will be lost. - + Your passwords do not match! - + OK! @@ -1458,11 +1448,6 @@ The installer will quit and all changes will be lost. EncryptWidget - - - Form - - En&crypt system @@ -1568,11 +1553,6 @@ The installer will quit and all changes will be lost. FinishedPage - - - Form - - &Restart now @@ -1923,11 +1903,6 @@ The installer will quit and all changes will be lost. LicensePage - - - Form - - <h1>License Agreement</h1> @@ -2083,33 +2058,27 @@ The installer will quit and all changes will be lost. - - + + No partitions are defined. - - - + + Encrypted rootfs setup error - + Root partition %1 is LUKS but no passphrase has been set. - + Could not create LUKS key file for root partition %1. - - - Could not configure LUKS key file on partition %1. - - MachineIdJob @@ -2593,18 +2562,13 @@ The installer will quit and all changes will be lost. - + Password is empty PackageChooserPage - - - Form - - Product Name @@ -2646,11 +2610,6 @@ The installer will quit and all changes will be lost. Page_Keyboard - - - Form - - Keyboard Model: @@ -2664,11 +2623,6 @@ The installer will quit and all changes will be lost. Page_UserSetup - - - Form - - What is your name? @@ -2845,11 +2799,6 @@ The installer will quit and all changes will be lost. PartitionPage - - - Form - - Storage de&vice: @@ -2959,72 +2908,72 @@ The installer will quit and all changes will be lost. - + No EFI system partition configured - + EFI system partition configured incorrectly - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem. - + The filesystem must be mounted on <strong>%1</strong>. - + The filesystem must have type FAT32. - + The filesystem must be at least %1 MiB in size. - + The filesystem must have flag <strong>%1</strong> set. - + You can continue without setting up an EFI system partition but your system may fail to start. - + Option to use GPT on BIOS - + A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>%2</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. - + Boot partition not encrypted - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. - + has at least one disk device available. - + There are no partitions to install on. @@ -3045,11 +2994,6 @@ The installer will quit and all changes will be lost. PlasmaLnfPage - - - Form - - Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. @@ -3811,11 +3755,6 @@ Output: TrackingPage - - - Form - - Placeholder @@ -3977,11 +3916,6 @@ Output: WelcomePage - - - Form - - diff --git a/lang/calamares_he.ts b/lang/calamares_he.ts index 69c5dc8ae..58f96d880 100644 --- a/lang/calamares_he.ts +++ b/lang/calamares_he.ts @@ -84,11 +84,6 @@ Calamares::DebugWindow - - - Form - Form - GlobalStorage @@ -556,11 +551,6 @@ The installer will quit and all changes will be lost. ChoicePage - - - Form - Form - Select storage de&vice: @@ -926,12 +916,12 @@ The installer will quit and all changes will be lost. מותר להשתמש רק באותיות, ספרות, קווים תחתיים ומינוסים. - + Your passwords do not match! הסיסמאות לא תואמות! - + OK! בסדר! @@ -1468,11 +1458,6 @@ The installer will quit and all changes will be lost. EncryptWidget - - - Form - Form - En&crypt system @@ -1578,11 +1563,6 @@ The installer will quit and all changes will be lost. FinishedPage - - - Form - Form - &Restart now @@ -1933,11 +1913,6 @@ The installer will quit and all changes will be lost. LicensePage - - - Form - Form - <h1>License Agreement</h1> @@ -2093,33 +2068,27 @@ The installer will quit and all changes will be lost. קובץ מפתח ה־LUKS מוגדר. - - + + No partitions are defined. לא הוגדרו מחיצות. - - - + + Encrypted rootfs setup error שגיאת התקנת מחיצת שורש מוצפנת - + Root partition %1 is LUKS but no passphrase has been set. מחיצת השורש %1 היא LUKS אבל לא הוגדרה מילת צופן. - + Could not create LUKS key file for root partition %1. לא ניתן ליצור קובץ מפתח LUKS למחיצת השורש %1. - - - Could not configure LUKS key file on partition %1. - לא ניתן להגדיר קובץ מפתח LUKS למחיצה %1. - MachineIdJob @@ -2623,18 +2592,13 @@ The installer will quit and all changes will be lost. שגיאה לא ידועה - + Password is empty שדה הסיסמה ריק PackageChooserPage - - - Form - Form - Product Name @@ -2676,11 +2640,6 @@ The installer will quit and all changes will be lost. Page_Keyboard - - - Form - Form - Keyboard Model: @@ -2694,11 +2653,6 @@ The installer will quit and all changes will be lost. Page_UserSetup - - - Form - Form - What is your name? @@ -2875,11 +2829,6 @@ The installer will quit and all changes will be lost. PartitionPage - - - Form - Form - Storage de&vice: @@ -2989,72 +2938,72 @@ The installer will quit and all changes will be lost. לאחר: - + No EFI system partition configured לא הוגדרה מחיצת מערכת EFI - + EFI system partition configured incorrectly מחיצת המערכת EFI לא הוגדרה נכון - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem. מחיצת מערכת EFI נחוצה להפעלת %1. <br/><br/>כדי להפעיל מחיצת מערכת EFI, יש לחזור ולבחור או ליצור מערכת קבצים מתאימה. - + The filesystem must be mounted on <strong>%1</strong>. יש לעגן את מערכת הקבצים ב־<strong>%1</strong> - + The filesystem must have type FAT32. מערכת הקבצים חייבת להיות מסוג FAT32. - + The filesystem must be at least %1 MiB in size. גודל מערכת הקבצים חייב להיות לפחות ‎%1 MIB. - + The filesystem must have flag <strong>%1</strong> set. למערכת הקבצים חייב להיות מוגדר הדגלון <strong>%1</strong>. - + You can continue without setting up an EFI system partition but your system may fail to start. ניתן להמשיך ללא הקמת מחיצת מערכת EFI אך המערכת שלך לא תצליח להיטען. - + Option to use GPT on BIOS אפשרות להשתמש ב־GPT או ב־BIOS - + A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>%2</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. טבלת מחיצות GPT היא האפשרות הטובה ביותר לכל המערכות. תוכנית התקנה זאת תומכת בהקמה שכזאת גם עבור מערכות BIOS.<br/><br/>כדי להגדיר טבלת מחיצות GPT על BIOS, (אם זה טרם בוצע) יש לחזור ולהגדיר את טבלת המחיצות ל־GPT, לאחר מכן ליצור מחיצה בלתי מפורמטת בגודל 8 מ״ב עם הדגלון <strong>%2</strong> פעיל.<br/><br/>מחיצה בלתי מפורמטת בגודל 8 מ״ב נחוצה להפעלת %1 על מערכת BIOS עם GPT. - + Boot partition not encrypted מחיצת האתחול (Boot) אינה מוצפנת - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. מחיצת אתחול, boot, נפרדת הוגדרה יחד עם מחיצת מערכת ההפעלה, root, מוצפנת, אך מחיצת האתחול לא הוצפנה.<br/><br/> ישנן השלכות בטיחותיות עם התצורה שהוגדרה, מכיוון שקובצי מערכת חשובים נשמרים על מחיצה לא מוצפנת.<br/>ניתן להמשיך אם זהו רצונך, אך שחרור מערכת הקבצים יתרחש מאוחר יותר כחלק מהאתחול.<br/>בכדי להצפין את מחיצת האתחול, יש לחזור וליצור אותה מחדש, על ידי בחירה ב <strong>הצפנה</strong> בחלונית יצירת המחיצה. - + has at least one disk device available. יש לפחות התקן כונן אחד זמין. - + There are no partitions to install on. אין מחיצות להתקין עליהן. @@ -3075,11 +3024,6 @@ The installer will quit and all changes will be lost. PlasmaLnfPage - - - Form - Form - Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. @@ -3847,11 +3791,6 @@ Output: TrackingPage - - - Form - Form - Placeholder @@ -4013,11 +3952,6 @@ Output: WelcomePage - - - Form - Form - diff --git a/lang/calamares_hi.ts b/lang/calamares_hi.ts index 7a5637a91..d90cd7c0a 100644 --- a/lang/calamares_hi.ts +++ b/lang/calamares_hi.ts @@ -84,11 +84,6 @@ Calamares::DebugWindow - - - Form - रूप - GlobalStorage @@ -552,11 +547,6 @@ The installer will quit and all changes will be lost. ChoicePage - - - Form - रूप - Select storage de&vice: @@ -922,12 +912,12 @@ The installer will quit and all changes will be lost. केवल अक्षर, अंक, अंडरस्कोर(_) व हाइफ़न(-) ही स्वीकार्य हैं। - + Your passwords do not match! आपके कूटशब्द मेल नहीं खाते! - + OK! ठीक है! @@ -1464,11 +1454,6 @@ The installer will quit and all changes will be lost. EncryptWidget - - - Form - रूप - En&crypt system @@ -1574,11 +1559,6 @@ The installer will quit and all changes will be lost. FinishedPage - - - Form - रूप - &Restart now @@ -1929,11 +1909,6 @@ The installer will quit and all changes will be lost. LicensePage - - - Form - रूप - <h1>License Agreement</h1> @@ -2089,33 +2064,27 @@ The installer will quit and all changes will be lost. LUKS कुंजी फ़ाइल विन्यस्त करना। - - + + No partitions are defined. कोई विभाजन परिभाषित नहीं है। - - - + + Encrypted rootfs setup error एन्क्रिप्टेड रुट फ़ाइल सिस्टम सेटअप करने में त्रुटि - + Root partition %1 is LUKS but no passphrase has been set. रुट विभाजन %1, LUKS है परंतु कोई कूटशब्द सेट नहीं है। - + Could not create LUKS key file for root partition %1. रुट विभाजन %1 हेतु LUKS कुंजी फ़ाइल बनाई नहीं जा सकी। - - - Could not configure LUKS key file on partition %1. - विभाजन %1 हेतु LUKS कुंजी फ़ाइल विन्यस्त नहीं हो सकी। - MachineIdJob @@ -2601,18 +2570,13 @@ The installer will quit and all changes will be lost. अज्ञात त्रुटि - + Password is empty कूटशब्द रिक्त है PackageChooserPage - - - Form - रूप - Product Name @@ -2654,11 +2618,6 @@ The installer will quit and all changes will be lost. Page_Keyboard - - - Form - रूप - Keyboard Model: @@ -2672,11 +2631,6 @@ The installer will quit and all changes will be lost. Page_UserSetup - - - Form - रूप - What is your name? @@ -2853,11 +2807,6 @@ The installer will quit and all changes will be lost. PartitionPage - - - Form - रूप - Storage de&vice: @@ -2967,72 +2916,72 @@ The installer will quit and all changes will be lost. बाद में: - + No EFI system partition configured कोई EFI सिस्टम विभाजन विन्यस्त नहीं है - + EFI system partition configured incorrectly EFI सिस्टम विभाजन उचित रूप से विन्यस्त नहीं है - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem. %1 आरंभ करने हेतु EFI सिस्टम विभाजन आवश्यक है। <br/><br/> EFI सिस्टम विभाजन विन्यस्त करने हेतु, वापस जाएँ व एक उपयुक्त फाइल सिस्टम चुनें या बनाएँ। - + The filesystem must be mounted on <strong>%1</strong>. फाइल सिस्टम का <strong>%1</strong> पर माउंट होना आवश्यक है। - + The filesystem must have type FAT32. फाइल सिस्टम का प्रकार FAT32 होना आवश्यक है। - + The filesystem must be at least %1 MiB in size. फाइल सिस्टम का आकार कम-से-कम %1 एमबी होना आवश्यक है। - + The filesystem must have flag <strong>%1</strong> set. फाइल सिस्टम पर <strong>%1</strong> फ्लैग सेट होना आवश्यक है। - + You can continue without setting up an EFI system partition but your system may fail to start. आप बिना EFI सिस्टम विभाजन सेट करें भी प्रक्रिया जारी रख सकते हैं परन्तु सम्भवतः ऐसा करने से आपका सिस्टम आरंभ नहीं होगा। - + Option to use GPT on BIOS BIOS पर GPT उपयोग करने के लिए विकल्प - + A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>%2</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. GPT विभाजन तालिका सभी सिस्टम हेतु सबसे उत्तम विकल्प है। यह इंस्टॉलर BIOS सिस्टम के सेटअप को भी समर्थन करता है। <br/><br/>BIOS पर GPT विभाजन तालिका को विन्यस्त करने हेतु, (यदि अब तक नहीं करा है) वापस जाकर विभाजन तालिका GPT पर सेट करें, फिर एक 8 MB का बिना फॉर्मेट हुआ विभाजन बनाएँ जिस पर <strong>%2</strong> का फ्लैग हो।<br/><br/>यह बिना फॉर्मेट हुआ 8 MB का विभाजन %1 को BIOS सिस्टम पर GPT के साथ आरंभ करने हेतु आवश्यक है। - + Boot partition not encrypted बूट विभाजन एन्क्रिप्टेड नहीं है - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. एन्क्रिप्टेड रुट विभाजन के साथ एक अलग बूट विभाजन भी सेट किया गया था, पर बूट विभाजन एन्क्रिप्टेड नहीं था।<br/><br/> इस तरह का सेटअप सुरक्षित नहीं होता क्योंकि सिस्टम फ़ाइल एन्क्रिप्टेड विभाजन पर होती हैं।<br/>आप चाहे तो जारी रख सकते है, पर फिर फ़ाइल सिस्टम बाद में सिस्टम स्टार्टअप के दौरान अनलॉक होगा।<br/> विभाजन को एन्क्रिप्ट करने के लिए वापस जाकर उसे दोबारा बनाएँ व विभाजन निर्माण विंडो में<strong>एन्क्रिप्ट</strong> चुनें। - + has at least one disk device available. कम-से-कम एक डिस्क डिवाइस उपलब्ध हो। - + There are no partitions to install on. इंस्टॉल हेतु कोई विभाजन नहीं हैं। @@ -3053,11 +3002,6 @@ The installer will quit and all changes will be lost. PlasmaLnfPage - - - Form - रूप - Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. @@ -3825,11 +3769,6 @@ Output: TrackingPage - - - Form - रूप - Placeholder @@ -3991,11 +3930,6 @@ Output: WelcomePage - - - Form - रूप - diff --git a/lang/calamares_hr.ts b/lang/calamares_hr.ts index bc6e9cdbc..46e3a0d4c 100644 --- a/lang/calamares_hr.ts +++ b/lang/calamares_hr.ts @@ -84,11 +84,6 @@ Calamares::DebugWindow - - - Form - Oblik - GlobalStorage @@ -554,11 +549,6 @@ Instalacijski program će izaći i sve promjene će biti izgubljene. ChoicePage - - - Form - Oblik - Select storage de&vice: @@ -924,12 +914,12 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.Dopuštena su samo slova, brojevi, donja crta i crtica. - + Your passwords do not match! Lozinke se ne podudaraju! - + OK! OK! @@ -1466,11 +1456,6 @@ Instalacijski program će izaći i sve promjene će biti izgubljene. EncryptWidget - - - Form - Oblik - En&crypt system @@ -1576,11 +1561,6 @@ Instalacijski program će izaći i sve promjene će biti izgubljene. FinishedPage - - - Form - Oblik - &Restart now @@ -1931,11 +1911,6 @@ Instalacijski program će izaći i sve promjene će biti izgubljene. LicensePage - - - Form - Oblik - <h1>License Agreement</h1> @@ -2091,33 +2066,27 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.Konfiguriranje LUKS ključne datoteke. - - + + No partitions are defined. Nema definiranih particija. - - - + + Encrypted rootfs setup error Pogreška postavljanja šifriranog rootfs-a - + Root partition %1 is LUKS but no passphrase has been set. Root particija %1 je LUKS, ali nije postavljena zaporka. - + Could not create LUKS key file for root partition %1. Nije moguće kreirati LUKS ključnu datoteku za root particiju %1. - - - Could not configure LUKS key file on partition %1. - Nije moguće konfigurirati datoteku LUKS ključevima na particiji %1. - MachineIdJob @@ -2612,18 +2581,13 @@ te korištenjem tipki +/- ili skrolanjem miša za zumiranje. Nepoznata greška - + Password is empty Lozinka je prazna PackageChooserPage - - - Form - Oblik - Product Name @@ -2665,11 +2629,6 @@ te korištenjem tipki +/- ili skrolanjem miša za zumiranje. Page_Keyboard - - - Form - Oblik - Keyboard Model: @@ -2683,11 +2642,6 @@ te korištenjem tipki +/- ili skrolanjem miša za zumiranje. Page_UserSetup - - - Form - Oblik - What is your name? @@ -2864,11 +2818,6 @@ te korištenjem tipki +/- ili skrolanjem miša za zumiranje. PartitionPage - - - Form - Oblik - Storage de&vice: @@ -2978,72 +2927,72 @@ te korištenjem tipki +/- ili skrolanjem miša za zumiranje. Poslije: - + No EFI system partition configured EFI particija nije konfigurirana - + EFI system partition configured incorrectly EFI particija nije ispravno konfigurirana - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem. Za pokretanje %1 potrebna je EFI particija. <br/><br/>Za konfiguriranje EFI sistemske particije, vratite se i odaberite ili kreirajte odgovarajući datotečni sustav. - + The filesystem must be mounted on <strong>%1</strong>. Datotečni sustav mora biti montiran na <strong>%1</strong>. - + The filesystem must have type FAT32. Datotečni sustav mora biti FAT32. - + The filesystem must be at least %1 MiB in size. Datotečni sustav mora biti veličine od najmanje %1 MiB. - + The filesystem must have flag <strong>%1</strong> set. Datotečni sustav mora imati postavljenu oznaku <strong>%1</strong>. - + You can continue without setting up an EFI system partition but your system may fail to start. Možete nastaviti bez postavljanja EFI particije, ali vaš se sustav možda neće pokrenuti. - + Option to use GPT on BIOS Mogućnost korištenja GPT-a na BIOS-u - + A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>%2</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. GPT tablica particija je najbolja opcija za sve sustave. Ovaj instalacijski program podržava takvo postavljanje i za BIOS sustave. <br/><br/>Da biste konfigurirali GPT particijsku tablicu za BIOS sustave, (ako to već nije učinjeno) vratite se natrag i postavite particijsku tablicu na GPT, a zatim stvorite neformatiranu particiju od 8 MB s omogućenom oznakom <strong>%2</strong>. <br/><br/>Neformirana particija od 8 MB potrebna je za pokretanje %1 na BIOS sustavu s GPT-om. - + Boot partition not encrypted Boot particija nije kriptirana - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. Odvojena boot particija je postavljena zajedno s kriptiranom root particijom, ali boot particija nije kriptirana.<br/><br/>Zabrinuti smo za vašu sigurnost jer su važne datoteke sustava na nekriptiranoj particiji.<br/>Možete nastaviti ako želite, ali datotečni sustav će se otključati kasnije tijekom pokretanja sustava.<br/>Da bi ste kriptirali boot particiju, vratite se natrag i napravite ju, odabirom opcije <strong>Kriptiraj</strong> u prozoru za stvaranje prarticije. - + has at least one disk device available. ima barem jedan disk dostupan. - + There are no partitions to install on. Ne postoje particije na koje bi se instalirao sustav. @@ -3064,11 +3013,6 @@ te korištenjem tipki +/- ili skrolanjem miša za zumiranje. PlasmaLnfPage - - - Form - Oblik - Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. @@ -3836,11 +3780,6 @@ Postavljanje se može nastaviti, ali neke će značajke možda biti onemogućene TrackingPage - - - Form - Oblik - Placeholder @@ -4002,11 +3941,6 @@ Postavljanje se može nastaviti, ali neke će značajke možda biti onemogućene WelcomePage - - - Form - Oblik - diff --git a/lang/calamares_hu.ts b/lang/calamares_hu.ts index 3a5f6c3ba..4efe3ec52 100644 --- a/lang/calamares_hu.ts +++ b/lang/calamares_hu.ts @@ -84,11 +84,6 @@ Calamares::DebugWindow - - - Form - Adatlap - GlobalStorage @@ -548,11 +543,6 @@ Minden változtatás elveszik, ha kilépsz a telepítőből. ChoicePage - - - Form - Adatlap - Select storage de&vice: @@ -918,12 +908,12 @@ Minden változtatás elveszik, ha kilépsz a telepítőből. - + Your passwords do not match! A két jelszó nem egyezik! - + OK! @@ -1460,11 +1450,6 @@ Minden változtatás elveszik, ha kilépsz a telepítőből. EncryptWidget - - - Form - Adatlap - En&crypt system @@ -1570,11 +1555,6 @@ Minden változtatás elveszik, ha kilépsz a telepítőből. FinishedPage - - - Form - Adatlap - &Restart now @@ -1925,11 +1905,6 @@ Minden változtatás elveszik, ha kilépsz a telepítőből. LicensePage - - - Form - Adatlap - <h1>License Agreement</h1> @@ -2085,33 +2060,27 @@ Minden változtatás elveszik, ha kilépsz a telepítőből. LUKS kulcs fájl konfigurálása. - - + + No partitions are defined. Nincsenek partíciók definiálva. - - - + + Encrypted rootfs setup error Titkosított rootfs telepítési hiba - + Root partition %1 is LUKS but no passphrase has been set. A %1 root partíció LUKS de beállítva nincs kulcs. - + Could not create LUKS key file for root partition %1. Nem sikerült létrehozni a LUKS kulcs fájlt a %1 root partícióhoz - - - Could not configure LUKS key file on partition %1. - - MachineIdJob @@ -2595,18 +2564,13 @@ Minden változtatás elveszik, ha kilépsz a telepítőből. Ismeretlen hiba - + Password is empty PackageChooserPage - - - Form - Adatlap - Product Name @@ -2648,11 +2612,6 @@ Minden változtatás elveszik, ha kilépsz a telepítőből. Page_Keyboard - - - Form - Adatlap - Keyboard Model: @@ -2666,11 +2625,6 @@ Minden változtatás elveszik, ha kilépsz a telepítőből. Page_UserSetup - - - Form - Adatlap - What is your name? @@ -2847,11 +2801,6 @@ Minden változtatás elveszik, ha kilépsz a telepítőből. PartitionPage - - - Form - Adatlap - Storage de&vice: @@ -2961,72 +2910,72 @@ Minden változtatás elveszik, ha kilépsz a telepítőből. Utána: - + No EFI system partition configured Nincs EFI rendszer partíció beállítva - + EFI system partition configured incorrectly - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem. - + The filesystem must be mounted on <strong>%1</strong>. - + The filesystem must have type FAT32. - + The filesystem must be at least %1 MiB in size. - + The filesystem must have flag <strong>%1</strong> set. - + You can continue without setting up an EFI system partition but your system may fail to start. - + Option to use GPT on BIOS - + A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>%2</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. - + Boot partition not encrypted Indító partíció nincs titkosítva - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. Egy külön indító partíció lett beállítva egy titkosított root partícióval, de az indító partíció nincs titkosítva.br/><br/>Biztonsági aggályok merülnek fel ilyen beállítás mellet, mert fontos fájlok nem titkosított partíción vannak tárolva. <br/>Ha szeretnéd, folytathatod így, de a fájlrendszer zárolása meg fog történni az indítás után. <br/> Az indító partíció titkosításához lépj vissza és az újra létrehozáskor válaszd a <strong>Titkosít</strong> opciót. - + has at least one disk device available. legalább egy lemez eszköz elérhető. - + There are no partitions to install on. @@ -3047,11 +2996,6 @@ Minden változtatás elveszik, ha kilépsz a telepítőből. PlasmaLnfPage - - - Form - Adatlap - Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. @@ -3817,11 +3761,6 @@ Calamares hiba %1. TrackingPage - - - Form - Adatlap - Placeholder @@ -3983,11 +3922,6 @@ Calamares hiba %1. WelcomePage - - - Form - Adatlap - diff --git a/lang/calamares_id.ts b/lang/calamares_id.ts index 2f64c8958..c9b7c0f80 100644 --- a/lang/calamares_id.ts +++ b/lang/calamares_id.ts @@ -84,11 +84,6 @@ Calamares::DebugWindow - - - Form - Isian - GlobalStorage @@ -545,11 +540,6 @@ Instalasi akan ditutup dan semua perubahan akan hilang. ChoicePage - - - Form - Isian - Select storage de&vice: @@ -916,12 +906,12 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.Hanya huruf, angka, garis bawah, dan tanda penghubung yang diperbolehkan. - + Your passwords do not match! Sandi Anda tidak sama! - + OK! @@ -1458,11 +1448,6 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan. EncryptWidget - - - Form - Formulir - En&crypt system @@ -1568,11 +1553,6 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan. FinishedPage - - - Form - Formulir - &Restart now @@ -1923,11 +1903,6 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan. LicensePage - - - Form - Isian - <h1>License Agreement</h1> @@ -2083,33 +2058,27 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.Mengkonfigurasi file kunci LUKS - - + + No partitions are defined. Tidak ada partisi yang didefinisikan. - - - + + Encrypted rootfs setup error Kesalahan penyiapan rootfs yang terenkripsi - + Root partition %1 is LUKS but no passphrase has been set. Partisi root %1 merupakan LUKS tetapi frasa sandi tidak ditetapkan - + Could not create LUKS key file for root partition %1. Tidak dapat membuat file kunci LUKS untuk partisi root %1 - - - Could not configure LUKS key file on partition %1. - Tidak dapat mengkonfigurasi file kunci LUKS pada partisi %1 - MachineIdJob @@ -2584,18 +2553,13 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.Ada kesalahan yang tidak diketahui - + Password is empty PackageChooserPage - - - Form - Formulir - Product Name @@ -2637,11 +2601,6 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan. Page_Keyboard - - - Form - Isian - Keyboard Model: @@ -2655,11 +2614,6 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan. Page_UserSetup - - - Form - Isian - What is your name? @@ -2836,11 +2790,6 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan. PartitionPage - - - Form - Isian - Storage de&vice: @@ -2950,72 +2899,72 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.Sesudah: - + No EFI system partition configured Tiada partisi sistem EFI terkonfigurasi - + EFI system partition configured incorrectly - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem. - + The filesystem must be mounted on <strong>%1</strong>. - + The filesystem must have type FAT32. - + The filesystem must be at least %1 MiB in size. - + The filesystem must have flag <strong>%1</strong> set. - + You can continue without setting up an EFI system partition but your system may fail to start. - + Option to use GPT on BIOS - + A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>%2</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. - + Boot partition not encrypted Partisi boot tidak dienkripsi - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. Sebuah partisi tersendiri telah terset bersama dengan sebuah partisi root terenkripsi, tapi partisi boot tidak terenkripsi.<br/><br/>Ada kekhawatiran keamanan dengan jenis setup ini, karena file sistem penting tetap pada partisi tak terenkripsi.<br/>Kamu bisa melanjutkan jika kamu menghendaki, tapi filesystem unlocking akan terjadi nanti selama memulai sistem.<br/>Untuk mengenkripsi partisi boot, pergi mundur dan menciptakannya ulang, memilih <strong>Encrypt</strong> di jendela penciptaan partisi. - + has at least one disk device available. - + There are no partitions to install on. @@ -3036,11 +2985,6 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan. PlasmaLnfPage - - - Form - Formulir - Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. @@ -3805,11 +3749,6 @@ Keluaran: TrackingPage - - - Form - Formulir - Placeholder @@ -3971,11 +3910,6 @@ Keluaran: WelcomePage - - - Form - Isian - diff --git a/lang/calamares_ie.ts b/lang/calamares_ie.ts index 05de30748..1d7986e40 100644 --- a/lang/calamares_ie.ts +++ b/lang/calamares_ie.ts @@ -84,11 +84,6 @@ Calamares::DebugWindow - - - Form - Redimensionar un gruppe de tomes - GlobalStorage @@ -546,11 +541,6 @@ The installer will quit and all changes will be lost. ChoicePage - - - Form - Redimensionar un gruppe de tomes - Select storage de&vice: @@ -916,12 +906,12 @@ The installer will quit and all changes will be lost. - + Your passwords do not match! - + OK! @@ -1458,11 +1448,6 @@ The installer will quit and all changes will be lost. EncryptWidget - - - Form - Redimensionar un gruppe de tomes - En&crypt system @@ -1568,11 +1553,6 @@ The installer will quit and all changes will be lost. FinishedPage - - - Form - Redimensionar un gruppe de tomes - &Restart now @@ -1923,11 +1903,6 @@ The installer will quit and all changes will be lost. LicensePage - - - Form - Redimensionar un gruppe de tomes - <h1>License Agreement</h1> @@ -2083,33 +2058,27 @@ The installer will quit and all changes will be lost. - - + + No partitions are defined. Null partition es definit. - - - + + Encrypted rootfs setup error - + Root partition %1 is LUKS but no passphrase has been set. - + Could not create LUKS key file for root partition %1. - - - Could not configure LUKS key file on partition %1. - - MachineIdJob @@ -2593,18 +2562,13 @@ The installer will quit and all changes will be lost. Ínconosset errore - + Password is empty Li contrasigne es vacui PackageChooserPage - - - Form - Redimensionar un gruppe de tomes - Product Name @@ -2646,11 +2610,6 @@ The installer will quit and all changes will be lost. Page_Keyboard - - - Form - Redimensionar un gruppe de tomes - Keyboard Model: @@ -2664,11 +2623,6 @@ The installer will quit and all changes will be lost. Page_UserSetup - - - Form - Redimensionar un gruppe de tomes - What is your name? @@ -2845,11 +2799,6 @@ The installer will quit and all changes will be lost. PartitionPage - - - Form - Redimensionar un gruppe de tomes - Storage de&vice: @@ -2959,72 +2908,72 @@ The installer will quit and all changes will be lost. Pos: - + No EFI system partition configured Null partition del sistema EFI es configurat - + EFI system partition configured incorrectly - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem. - + The filesystem must be mounted on <strong>%1</strong>. - + The filesystem must have type FAT32. - + The filesystem must be at least %1 MiB in size. - + The filesystem must have flag <strong>%1</strong> set. - + You can continue without setting up an EFI system partition but your system may fail to start. - + Option to use GPT on BIOS - + A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>%2</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. - + Boot partition not encrypted - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. - + has at least one disk device available. - + There are no partitions to install on. Ne existe disponibil partitiones por installation. @@ -3045,11 +2994,6 @@ The installer will quit and all changes will be lost. PlasmaLnfPage - - - Form - Redimensionar un gruppe de tomes - Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. @@ -3811,11 +3755,6 @@ Output: TrackingPage - - - Form - Redimensionar un gruppe de tomes - Placeholder @@ -3977,11 +3916,6 @@ Output: WelcomePage - - - Form - Redimensionar un gruppe de tomes - diff --git a/lang/calamares_is.ts b/lang/calamares_is.ts index 0376ac947..a4baee69b 100644 --- a/lang/calamares_is.ts +++ b/lang/calamares_is.ts @@ -84,11 +84,6 @@ Calamares::DebugWindow - - - Form - Innfyllingarform - GlobalStorage @@ -552,11 +547,6 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. ChoicePage - - - Form - Innfyllingarform - Select storage de&vice: @@ -922,12 +912,12 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. Má einungis innihalda bókstafi, tölustafi, undirstrik og bandstrik. - + Your passwords do not match! Lykilorðin þín stemma ekki! - + OK! Í lagi! @@ -1464,11 +1454,6 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. EncryptWidget - - - Form - Innfyllingarform - En&crypt system @@ -1574,11 +1559,6 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. FinishedPage - - - Form - Innfyllingarform - &Restart now @@ -1929,11 +1909,6 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. LicensePage - - - Form - Innfyllingarform - <h1>License Agreement</h1> @@ -2089,33 +2064,27 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. Stilli LUKS-lykilskrá. - - + + No partitions are defined. Engar disksneiðar eru skilgreindar. - - - + + Encrypted rootfs setup error Villa í uppsetningu dulritunar rootfs - + Root partition %1 is LUKS but no passphrase has been set. Rótardisksneiðin %1 er LUKS en engin lykilsetning hefur verið stillt. - + Could not create LUKS key file for root partition %1. Gat ekki búið til LUKS-lykilskrá fyrir rótardisksneiðina %1. - - - Could not configure LUKS key file on partition %1. - Gat ekki stillt LUKS-lykilskrá á disksneiðinni %1. - MachineIdJob @@ -2601,18 +2570,13 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. Óþekkt villa - + Password is empty Lykilorðið er tómt PackageChooserPage - - - Form - Innfyllingarform - Product Name @@ -2654,11 +2618,6 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. Page_Keyboard - - - Form - Innfyllingarform - Keyboard Model: @@ -2672,11 +2631,6 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. Page_UserSetup - - - Form - Innfyllingarform - What is your name? @@ -2853,11 +2807,6 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. PartitionPage - - - Form - Innfyllingarform - Storage de&vice: @@ -2967,72 +2916,72 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. Á eftir: - + No EFI system partition configured Engin EFI-kerfisdisksneið stillt - + EFI system partition configured incorrectly EFI-kerfisdisksneið er rangt stillt - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem. EFI-kerfisdisksneið er nauðsynleg til að ræsa %1.<br/><br/>Til að setja upp EFI-kerfisdisksneið skaltu fara til baka og velja eða útbúa hentugt skráakerfi. - + The filesystem must be mounted on <strong>%1</strong>. Skráakerfið verður að tengjast á <strong>%1</strong>. - + The filesystem must have type FAT32. Skráakerfið verður að vera af tegundinni FAT32. - + The filesystem must be at least %1 MiB in size. Skráakerfið verður að vera að minnsta kosti%1 MiB. - + The filesystem must have flag <strong>%1</strong> set. Skráakerfið verður að hafa flaggið <strong>%1</strong> stillt. - + You can continue without setting up an EFI system partition but your system may fail to start. Þú getur haldið áfram án þess að setja upp EFI-kerfisdisksneið, en þá er ekki víst að kerfið þitt ræsist. - + Option to use GPT on BIOS Valkostur um að nota GPT í BIOS - + A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>%2</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. GPT-disksneiðatafla er besti kosturinn fyrir öll kerfi. Þetta uppsetningarforrit styður einnig slíka uppsetningu fyrir BIOS-kerfi.<br/><br/>Til að stilla GPT-disksneiðatöflu á BIOS, (ef það hefur ekki þegar verið gert) skaltu fara til baka og stilla disksneiðatöfluna á GPT, síðan að útbúa 8 MB óforsniðna disksneið með <strong>%2</strong> flagginu virku.<br/><br/>Óforsniðin 8 MB disksneið er nauðsynleg til að ræsa %1 á BIOS-kerfi með GPT. - + Boot partition not encrypted Ræsidisksneið er ekki dulrituð - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. Sérstök ræsidisksneið (boot partition) var sett upp ásamt dulritaðri rótardisksneið, en ræsidisksneiðin er hinsvegar ekki dulrituð.<br/><br/>Ákveðin öryggisáhætta felst í slíkri uppsetningu, þar sem mikilvægar kerfisskrár eru þá á ódulritaðri disksneið.<br/>Þú getur haldið áfram ef þér sýnist svo, en aflæsing skráakerfis mun eiga sér stað síðar í ræsingu kerfisins.<br/>Til að dulrita ræsidisksneiðina skaltu fara til baka og búa hana til aftur, manst þá að velja <strong>Dulrita</strong> í glugganum þar sem disksneiðin er útbúin. - + has at least one disk device available. hafi að minnsta kosti eitt diskæki til taks. - + There are no partitions to install on. Það eru engar disksneiðar til að setja upp á. @@ -3053,11 +3002,6 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. PlasmaLnfPage - - - Form - Innfyllingarform - Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. @@ -3825,11 +3769,6 @@ Frálag: TrackingPage - - - Form - Innfyllingarform - Placeholder @@ -3991,11 +3930,6 @@ Frálag: WelcomePage - - - Form - Innfyllingarform - diff --git a/lang/calamares_it_IT.ts b/lang/calamares_it_IT.ts index 9808490aa..4d985c92f 100644 --- a/lang/calamares_it_IT.ts +++ b/lang/calamares_it_IT.ts @@ -11,7 +11,7 @@ Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://app.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - + Grazie alla <a href="https://calamares.io/team/">squadra di Calamares</a> e alla <a href="https://app.transifex.com/calamares/calamares/">squadra dei traduttori di Calamares</a>. Lo sviluppo di <br/><br/><a href="https://calamares.io/">Calamares</a>è sponsorizzato da<br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. @@ -25,7 +25,7 @@ Manage auto-mount settings - Gestisci le impostazioni di mount automatico + Gestisci le impostazioni di montaggio automatico @@ -84,11 +84,6 @@ Calamares::DebugWindow - - - Form - Modulo - GlobalStorage @@ -167,7 +162,7 @@ %p% Progress percentage indicator: %p is where the number 0..100 is placed - + %p% @@ -283,24 +278,24 @@ Requirements checking for module '%1' is complete. - + Il controllo dei requisiti per il modulo '%1' è completo. Waiting for %n module(s). - - - - + + In attesa di %n modulo. + In attesa di %n moduli. + In attesa di %n moduli. (%n second(s)) - - - - + + (%n secondo) + (%n secondi) + (%n secondi) @@ -529,12 +524,12 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse Set filesystem label on %1. - Imposta l'etichetta del filesystem a %1. + Imposta l'etichetta del file system a %1. Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>. - Imposta l'etichetta del filesystem <strong>%1</strong> sulla partizione <strong>%2</strong>. + Imposta l'etichetta del file system <strong>%1</strong> alla partizione <strong>%2</strong>. @@ -553,11 +548,6 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse ChoicePage - - - Form - Modulo - Select storage de&vice: @@ -579,7 +569,7 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. - <strong>Partizionamento manuale</strong><br/>Si possono creare o ridimensionare le partizioni manualmente. + <strong>Partizionamento manuale</strong><br/>Puoi creare o ridimensionare manualmente le partizioni. @@ -673,13 +663,12 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse This storage device has one of its partitions <strong>mounted</strong>. - questo dispositivo di memoria ha una delle sue partizioni <strong>montata</strong> + Questo dispositivo di memorizzazione ha una delle sue partizioni <strong>montata</strong> This storage device is a part of an <strong>inactive RAID</strong> device. -   -questo dispositivo di memoria è una parte di un dispositivo di <strong>RAID inattivo</strong> + Questo dispositivo di memoria è una parte di un dispositivo di <strong>RAID inattivo</strong> @@ -778,7 +767,7 @@ questo dispositivo di memoria è una parte di un dispositivo di <strong>RA The commands use variables that are not defined. Missing variables are: %1. - + I comandi usano delle variabili che non sono definite. Le variabili mancanti sono: %1. @@ -841,12 +830,12 @@ questo dispositivo di memoria è una parte di un dispositivo di <strong>RA This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. - + Questo computer non soddisfa i requisiti minimi per l'installazione di %1.<br/>L'installazione non può continuare. This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. - + Questo computer non soddisfa i requisiti minimi per l'installazione di %1.<br/>L'installazione non può continuare. @@ -866,22 +855,22 @@ questo dispositivo di memoria è una parte di un dispositivo di <strong>RA <h1>Welcome to the Calamares setup program for %1</h1> - Benvenuto nel programma di installazione Calamares di %1 + <h1>Benvenuto nel programma di installazione Calamares di %1</h1> <h1>Welcome to %1 setup</h1> - Benvenuto nell'installazione di %1 + <h1>Benvenuto nell'installazione di %1</h1> <h1>Welcome to the Calamares installer for %1</h1> - Benvenuto nel programma di installazione Calamares di %1 + <h1>Benvenuto nel programma di installazione Calamares di %1</h1> <h1>Welcome to the %1 installer</h1> - Benvenuto nel programma di installazione di %1 + <h1>Benvenuto nel programma di installazione di %1</h1> @@ -896,7 +885,7 @@ questo dispositivo di memoria è una parte di un dispositivo di <strong>RA Your username must start with a lowercase letter or underscore. - Il tuo username deve iniziare con una lettera minuscola o un trattino basso. + Il nome utente deve iniziare con una lettera minuscola o con un trattino basso. @@ -906,12 +895,12 @@ questo dispositivo di memoria è una parte di un dispositivo di <strong>RA Your hostname is too short. - Hostname è troppo corto. + Il nome host è troppo corto. Your hostname is too long. - Hostname è troppo lungo. + Il nome host è troppo lungo. @@ -924,19 +913,19 @@ questo dispositivo di memoria è una parte di un dispositivo di <strong>RA Solo lettere, numeri, trattini e trattini bassi sono permessi. - + Your passwords do not match! Le password non corrispondono! - + OK! OK! Setup Failed - Installazione fallita + Installazione non riuscita @@ -966,17 +955,17 @@ questo dispositivo di memoria è una parte di un dispositivo di <strong>RA The setup of %1 is complete. - L'installazione di %1 è completa + L'installazione di %1 è completa. The installation of %1 is complete. - L'installazione di %1 è completata. + L'installazione di %1 è completa. Package Selection - Selezione del Pacchetto + Selezione del pacchetto @@ -1077,7 +1066,7 @@ questo dispositivo di memoria è una parte di un dispositivo di <strong>RA Label for the filesystem - Etichetta per il filesystem + Etichetta per il file system @@ -1231,17 +1220,17 @@ questo dispositivo di memoria è una parte di un dispositivo di <strong>RA Creating user %1 - Creazione utente %1. + Creazione dell'utente %1. Configuring user %1 - Configurazione utente %1 + Configurazione dell'utente %1 Setting file permissions - Impostazione permessi file + Impostazione dei permessi sui file @@ -1446,7 +1435,7 @@ questo dispositivo di memoria è una parte di un dispositivo di <strong>RA Label for the filesystem - Etichetta per il filesystem + Etichetta per il file system @@ -1467,11 +1456,6 @@ Passphrase per la partizione esistente EncryptWidget - - - Form - Modulo - En&crypt system @@ -1501,7 +1485,7 @@ Passphrase per la partizione esistente Password must be a minimum of %1 characters - + La password deve avere almeno %1 caratteri @@ -1537,12 +1521,12 @@ Passphrase per la partizione esistente Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. - crea una<strong>nuova </strong>partizione %2 con un punto di montaggio<strong>%1</strong> e le caratteristiche <em>% 3</em>. + Crea una<strong>nuova </strong>partizione %2 con un punto di montaggio<strong>%1</strong> e le caratteristiche <em>% 3</em>. Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3. - crea una<strong>nuova</strong>partizione %2 con un punto di montaggio<strong>%1</strong> %3. + Crea una<strong>nuova</strong>partizione %2 con un punto di montaggio<strong>%1</strong> %3. @@ -1552,12 +1536,12 @@ Passphrase per la partizione esistente Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>. - crea la partizione %3 <strong>%1</strong> con un punto di montaggio <strong>%2</strong> e caratteristiche <em>%4</em>. + Crea la partizione %3 <strong>%1</strong> con un punto di montaggio <strong>%2</strong> e caratteristiche <em>%4</em>. Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4. - crea la partizione %3 <strong>%1</strong> con un punto di montaggio <strong>%2</strong> %4. + Crea la partizione %3 <strong>%1</strong> con un punto di montaggio <strong>%2</strong> %4. @@ -1577,11 +1561,6 @@ Passphrase per la partizione esistente FinishedPage - - - Form - Modulo - &Restart now @@ -1590,12 +1569,12 @@ Passphrase per la partizione esistente <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. - <h1>Tutto eseguito.</h1><br/>%1 è stato configurato sul tuo computer.<br/>Adesso puoi iniziare a utilizzare il tuo nuovo sistema. + <h1>Tutto fatto.</h1><br/>%1 è stato configurato sul tuo computer.<br/>Adesso puoi iniziare a utilizzare il nuovo sistema. <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html> - <html><head/><body><p>Quando questa casella è selezionata, il tuo computer verrà riavviato immediatamente quando clicchi su <span style="font-style:italic;">Finito</span> oppure chiudi il programma di setup.</p></body></html> + <html><head/><body><p>Quando questa casella è selezionata, il tuo computer verrà riavviato immediatamente quando fai clic su <span style="font-style:italic;">Finito</span> oppure chiudi il programma di installazione.</p></body></html> @@ -1605,12 +1584,12 @@ Passphrase per la partizione esistente <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html> - <html><head/><body><p>Quando questa casella è selezionata, il tuo sistema si riavvierà immediatamente quando clicchi su <span style="font-style:italic;">Fatto</span> o chiudi il programma di installazione.</p></body></html> + <html><head/><body><p>Quando questa casella è selezionata, il tuo sistema si riavvierà immediatamente quando fai clic su <span style="font-style:italic;">Fatto</span> o chiudi il programma di installazione.</p></body></html> <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. - <h1>Installazione fallita</h1><br/>%1 non è stato installato sul tuo computer.<br/>Il messaggio di errore è: %2. + <h1>Installazione non riuscita</h1><br/>%1 non è stato installato sul tuo computer.<br/>Il messaggio di errore è: %2. @@ -1668,12 +1647,12 @@ Passphrase per la partizione esistente Please ensure the system has at least %1 GiB available drive space. - + Assicurati che il sistema abbia almeno %1 GiB di spazio disponibile su disco. Available drive space is all of the hard disks and SSDs connected to the system. - + Lo spazio disponibile delle unità è quello dei dischi rigidi e degli SSD che sono connessi al sistema. @@ -1718,7 +1697,7 @@ Passphrase per la partizione esistente The setup program is not running with administrator rights. - Il programma di installazione non è stato lanciato con i permessi di amministratore. + Il programma di installazione non è stato avviato con i permessi di amministratore. @@ -1743,53 +1722,53 @@ Passphrase per la partizione esistente is always false - + è sempre falso The computer says no. - + Il computer ha detto di no. is always false (slowly) - + è sempre falso (lentamente) The computer says no (slowly). - + Il computer ha detto di no (lentamente). is always true - + è sempre vero The computer says yes. - + Il computer ha detto di sì. is always true (slowly) - + è sempre vero (lentamente) The computer says yes (slowly). - + Il computer ha detto di sì (lentamente). is checked three times. - + viene controllato tre volte. The snark has not been checked three times. The (some mythological beast) has not been checked three times. - + Lo snark non è stato controllato tre volte. @@ -1831,7 +1810,7 @@ Passphrase per la partizione esistente Creating initramfs with mkinitcpio. - Sto creando initramfs con mkinitcpio. + Creazione di initramfs con mkinitcpio. @@ -1839,7 +1818,7 @@ Passphrase per la partizione esistente Creating initramfs. - Sto creando initramfs. + Creazione di initramfs. @@ -1932,11 +1911,6 @@ Passphrase per la partizione esistente LicensePage - - - Form - Modulo - <h1>License Agreement</h1> @@ -2092,33 +2066,27 @@ Passphrase per la partizione esistente Configurazione in corso del file chiave LUKS. - - + + No partitions are defined. - Non è stata specificata alcuna partizione. + Non è stata definita alcuna partizione. - - - + + Encrypted rootfs setup error Errore nella configurazione del rootfs crittato - + Root partition %1 is LUKS but no passphrase has been set. La partizione root %1 è LUKS ma non sono state configurate passphrase. - + Could not create LUKS key file for root partition %1. Impossibile creare il file chiave LUKS per la partizione root %1. - - - Could not configure LUKS key file on partition %1. - Impossibile configurare il file chiave LUKS per la partizione %1. - MachineIdJob @@ -2130,12 +2098,12 @@ Passphrase per la partizione esistente Configuration Error - Errore di Configurazione + Errore di configurazione No root mount point is set for MachineId. - Non è impostato alcun punto di montaggio root per MachineId + Non è stato impostato alcun punto di montaggio root per MachineId @@ -2150,7 +2118,7 @@ Passphrase per la partizione esistente Please select your preferred location on the map so the installer can suggest the locale and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming. - Seleziona la tua posizione sulla mappa in modo che il programma di installazione possa suggerirti la localizzazione e le impostazioni del fuso orario. Puoi modificare le impostazioni suggerite nella parte in basso. Trascina la mappa per spostarti e usa i pulsanti +/- oppure la rotella del mouse per ingrandire o rimpicciolire. + Seleziona la tua posizione sulla mappa, in modo che il programma di installazione possa suggerirti la localizzazione e le impostazioni del fuso orario. Puoi modificare le impostazioni suggerite nella parte in basso. Trascina la mappa per spostarti e usa i pulsanti +/- oppure la rotella del mouse per ingrandire o rimpicciolire. @@ -2173,12 +2141,12 @@ Passphrase per la partizione esistente Browser software - Software navigazione web + Software per la navigazione web Browser package - Pacchetto navigazione web + Pacchetto per la navigazione web @@ -2319,7 +2287,7 @@ Passphrase per la partizione esistente Select your preferred Zone within your Region. - Seleziona la tua Zona preferita nei limiti della tua Regione. + Seleziona la tua zona preferita nei limiti della tua regione. @@ -2329,7 +2297,7 @@ Passphrase per la partizione esistente You can fine-tune Language and Locale settings below. - Puoi perfezionare le impostazioni di Lingua e Locale di seguito. + Di seguito puoi perfezionare le impostazioni della lingua e della localizzazione. @@ -2611,18 +2579,13 @@ Passphrase per la partizione esistente Errore sconosciuto - + Password is empty Password vuota PackageChooserPage - - - Form - Modulo - Product Name @@ -2641,7 +2604,7 @@ Passphrase per la partizione esistente Package Selection - Selezione del Pacchetto + Selezione del pacchetto @@ -2664,11 +2627,6 @@ Passphrase per la partizione esistente Page_Keyboard - - - Form - Modulo - Keyboard Model: @@ -2682,11 +2640,6 @@ Passphrase per la partizione esistente Page_UserSetup - - - Form - Modulo - What is your name? @@ -2695,7 +2648,7 @@ Passphrase per la partizione esistente Your Full Name - Nome Completo + Nome completo @@ -2720,7 +2673,7 @@ Passphrase per la partizione esistente Computer Name - Nome Computer + Nome del computer @@ -2743,7 +2696,7 @@ Passphrase per la partizione esistente Repeat Password - Ripetere Password + Ripeti la Password @@ -2863,11 +2816,6 @@ Passphrase per la partizione esistente PartitionPage - - - Form - Modulo - Storage de&vice: @@ -2886,7 +2834,7 @@ Passphrase per la partizione esistente Cre&ate - Crea + Cre&a @@ -2959,7 +2907,7 @@ Passphrase per la partizione esistente Partitioning is configured to <b>always</b> fail. - Il partizionamento è configurato per fallire <b>sempre</b>. + Il partizionamento è configurato per non riuscire <b>mai</b>. @@ -2977,72 +2925,72 @@ Passphrase per la partizione esistente Dopo: - + No EFI system partition configured Nessuna partizione EFI di sistema è configurata - + EFI system partition configured incorrectly Partizione di sistema EFI configurata in modo errato - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem. - Una partizione di sistema EFI è necessaria per avviare %1.<br/><br/> Per configurare una partizione di sistema EFI, vai indietro e seleziona o crea un filesystem adatto. + È necessaria una partizione di sistema EFI per avviare %1.<br/><br/> Per configurare una partizione di sistema EFI, vai indietro e seleziona o crea un file system adatto. - + The filesystem must be mounted on <strong>%1</strong>. - Il filesystem deve essere montato su <strong>%1</strong>. + Il file system deve essere montato su <strong>%1</strong>. - + The filesystem must have type FAT32. - Il filesystem deve essere il tipo FAT32. + Il file system deve essere di tipo FAT32. - + The filesystem must be at least %1 MiB in size. - Il filesystem deve essere almeno %1 MiB di dimensione. + Il file system deve essere di almeno %1 MiB di dimensione. - + The filesystem must have flag <strong>%1</strong> set. - Il filesystem deve avere il flag <strong>%1</strong> impostato. + Il file system deve avere impostato il flag <strong>%1</strong>. - + You can continue without setting up an EFI system partition but your system may fail to start. Puoi continuare senza impostare una partizione di sistema EFI ma il tuo sistema potrebbe non avviarsi. - + Option to use GPT on BIOS Opzione per usare GPT su BIOS - + A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>%2</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. - Una tabella delle partizioni GPT è la migliore opzione per tutti i sistemi. Questo installer supporta anche un setup per i sistemi BIOS.<br/><br/> Per configurare una tabella delle partizioni GPT sul BIOS, (se non è già stato fatto) vai indietro e imposta la tabella delle partizioni a GPT, poi crea una partizione di 8MB non formattata con il flag <strong>%2</strong> abilitato.<br/><br/>una partizione di 8MB non formattata è necessaria per avviare %1 su un sistema BIOS con GPT. + Una tabella delle partizioni GPT è la migliore opzione per tutti i sistemi. Questo programma d'installazione supporta anche un'installazione per i sistemi BIOS.<br/><br/> Per configurare una tabella delle partizioni GPT sul BIOS, se non l'hai già fatto, vai indietro e imposta la tabella delle partizioni a GPT, poi crea una partizione di 8 MB non formattata con il flag <strong>%2</strong> abilitato.<br/><br/>È necessaria una partizione di 8MB non formattata per avviare %1 un sistema BIOS con GPT. - + Boot partition not encrypted Partizione di avvio non criptata - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. E' stata configurata una partizione di avvio non criptata assieme ad una partizione root criptata. <br/><br/>Ci sono problemi di sicurezza con questo tipo di configurazione perchè dei file di sistema importanti sono tenuti su una partizione non criptata.<br/>Si può continuare se lo si desidera ma dopo ci sarà lo sblocco del file system, durante l'avvio del sistema.<br/>Per criptare la partizione di avvio, tornare indietro e ricrearla, selezionando <strong>Criptare</strong> nella finestra di creazione della partizione. - + has at least one disk device available. ha almeno un'unità disco disponibile. - + There are no partitions to install on. Non ci sono partizioni su cui installare. @@ -3063,15 +3011,10 @@ Passphrase per la partizione esistente PlasmaLnfPage - - - Form - Modulo - Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. - Scegliere il tema per l'ambiente desktop KDE Plasma. Si può anche saltare questa scelta e configurare il tema dopo aver installato il sistema. Cliccando su selezione del tema, ne sarà mostrata un'anteprima. + Scegli il tema per l'ambiente desktop KDE Plasma. Puoi anche saltare questa scelta e configurare l'aspetto dopo aver installato il sistema. Facendo clic sulla selezione dell'aspetto verrà mostrata un'anteprima. @@ -3218,7 +3161,7 @@ Output: Path <pre>%1</pre> must be an absolute path. - Il percorso <pre>%1</pre> deve essere un percorso assoluto. + Il percorso <pre>%1</pre> deve essere assoluto. @@ -3244,7 +3187,7 @@ Output: (no mount point) - (nessun mount point) + (nessun punto di montaggio) @@ -3258,7 +3201,8 @@ Output: <p>This computer does not satisfy some of the recommended requirements for setting up %1.<br/> Setup can continue, but some features might be disabled.</p> - Questo computer non soddisfa alcuni requisiti raccomandati per poter installare %1. L'installazione può continuare, ma alcune funzionalità potrebbero essere disabilitate. + <p>Questo computer non soddisfa alcuni requisiti raccomandati per poter installare %1.<br/> +L'installazione può continuare, ma alcune funzionalità potrebbero essere disabilitate. @@ -3300,7 +3244,8 @@ Output: <p>This computer does not satisfy some of the recommended requirements for setting up %1.<br/> Setup can continue, but some features might be disabled.</p> - Questo computer non soddisfa alcuni requisiti raccomandati per poter installare %1. L'installazione può continuare, ma alcune funzionalità potrebbero essere disabilitate. + <p>Questo computer non soddisfa alcuni requisiti raccomandati per poter installare %1<br/>. +L'installazione può continuare, ma alcune funzionalità potrebbero essere disabilitate. @@ -3308,7 +3253,7 @@ Output: Resize Filesystem Job - Operazione di ridimensionamento del Filesystem + Processo di ridimensionamento del file system @@ -3337,12 +3282,12 @@ Output: Resize Failed - Ridimensionamento fallito. + Ridimensionamento non riuscito The filesystem %1 could not be found in this system, and cannot be resized. - Il filesystem %1 non è stato trovato su questo sistema, e non può essere ridimensionato. + Il file system %1 non è stato trovato su questo sistema, e non può essere ridimensionato. @@ -3353,7 +3298,7 @@ Output: The filesystem %1 cannot be resized. - Il filesystem %1 non può essere ridimensionato. + Il file system %1 non può essere ridimensionato. @@ -3364,7 +3309,7 @@ Output: The filesystem %1 must be resized, but cannot. - Il filesystem %1 deve essere ridimensionato, ma non è possibile farlo. + Il file system %1 deve essere ridimensionato, ma non è possibile farlo. @@ -3427,7 +3372,7 @@ Output: Checking requirements again in a few seconds ... - + Nuovo controllo dei requisiti tra pochi secondi ... @@ -3731,7 +3676,7 @@ Output: &Yes - &Si + &Sì @@ -3777,28 +3722,28 @@ Output: KDE user feedback - Riscontro dell'utente di KDE + Segnalazioni degli utenti di KDE Configuring KDE user feedback. - Sto configurando il riscontro dell'utente di KDE + Sto configurando le segnalazioni degli utenti di KDE Error in KDE user feedback configuration. - Errore nella configurazione del feedback degli utenti di KDE. + Errore nella configurazione delle segnalazioni degli utenti di KDE. Could not configure KDE user feedback correctly, script error %1. - Impossibile configurare correttamente il feedback degli utenti di KDE, errore di script %1. + Impossibile configurare correttamente le segnalazioni degli utenti di KDE, errore di script %1. Could not configure KDE user feedback correctly, Calamares error %1. - Impossibile configurare correttamente il feedback degli utenti di KDE, errore di Calamares %1. + Impossibile configurare correttamente le segnalazioni degli utenti di KDE, errore di Calamares %1. @@ -3806,7 +3751,7 @@ Output: Machine feedback - Valutazione automatica + Segnalazione automatica @@ -3832,11 +3777,6 @@ Output: TrackingPage - - - Form - Modulo - Placeholder @@ -3845,7 +3785,7 @@ Output: <html><head/><body><p>Click here to send <span style=" font-weight:600;">no information at all</span> about your installation.</p></body></html> - <html><head/><body><p>Clicca qui per mandare<span style=" font-weight:600;">assolutamente nessuna informazione</span> sulla tua installazione.</p></body></html> + <html><head/><body><p>Fai clic qui per non mandare <span style=" font-weight:600;">assolutamente nessuna informazione</span> sulla tua installazione.</p></body></html> @@ -3904,12 +3844,12 @@ Output: <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> - <small>Se più di una persona utilizzerà questo computer, puoi creare ulteriori account dopo la configurazione.</small> + <small>Se questo computer viene utilizzato da più di una persona, puoi creare altri account dopo l'installazione.</small> <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> - <small>Se più di una persona utilizzerà questo computer, puoi creare ulteriori account dopo l'installazione.</small> + <small>Se questo computer viene utilizzato da più di una persona, puoi creare altri account dopo l'installazione.</small> @@ -3998,11 +3938,6 @@ Output: WelcomePage - - - Form - Modulo - @@ -4017,7 +3952,7 @@ Output: &Donate - &Donazioni + &Dona @@ -4096,7 +4031,7 @@ Output: Configuration Error - Errore di Configurazione + Errore di configurazione @@ -4155,7 +4090,7 @@ Output: Installation Completed - Installazione Completata + Installazione completata @@ -4172,7 +4107,7 @@ Ora puoi riavviare il tuo nuovo sistema o continuare a utilizzare l'ambiente Liv Restart System - Riavvia il Sistema + Riavvia il sistema @@ -4187,7 +4122,7 @@ Questo registro viene copiato in /var/log/installation.log del sistema di destin Installation Completed - Installazione Completata + Installazione completata @@ -4217,17 +4152,17 @@ Ora puoi riavviare il tuo dispositivo. <b>Keyboard Model:&nbsp;&nbsp;</b> - + <b>Modello della tastiera:&nbsp;&nbsp;</b> Layout - + Layout Variant - + Variante @@ -4247,13 +4182,15 @@ Ora puoi riavviare il tuo dispositivo. <h3>Languages</h3> </br> The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>. - + <h3>Lingue</h3> </br> + L'impostazione della localizzazione del sistema influisce sulla lingua e sull'insieme dei caratteri per alcuni elementi dell'interfaccia utente a riga di comando. L'impostazione corrente è <strong>%1</strong>. <h3>Locales</h3> </br> The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>. - + <h3>Localizzazioni</h3> </br> + L'impostazione della localizzazione del sistema influisce sul formato di numeri e date. L'impostazione corrente è <strong>%1</strong>. @@ -4288,22 +4225,22 @@ Ozione di Default. No Office Suite - Nessuna Suite Ufficio + Nessuna suite per ufficio Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support. It will be just a desktop, file browser, package manager, text editor and simple web-browser. - Crea un'installazione desktop minimale, rimuovi tutte le applicazioni extra e decidi in seguito cosa vuoi aggiungere al tuo sistema. Esempi di ciò che non sarà su una tale installazione, non ci sarà Suite Ufficio, nessun lettore multimediale, nessun visualizzatore di immagini o supporto per la stampa. Sarà solo un desktop, un esplora file, un gestore di pacchetti, un editor di testo e un semplice browser web. + Crea un'installazione desktop minimale, rimuovi tutte le applicazioni aggiuntive e decidi in seguito cosa vuoi aggiungere al tuo sistema. Alcuni esempi di ciò che non sarà su una questa installazione: una suite da ufficio, un lettore multimediale, un visualizzatore di immagini e un supporto per la stampa. Ci sarà solo un desktop, un esploratore di file, un gestore di pacchetti, un editor di testo e un semplice browser web. Minimal Install - Installazione Minimale + Installazione minimale Please select an option for your install, or use the default: LibreOffice included. - Seleziona un'opzione per la tua installazione o usa quella predefinita: LibreOffice incluso. + Seleziona un'opzione per la tua installazione, oppure usa quella predefinita: LibreOffice incluso. @@ -4374,7 +4311,7 @@ Ozione di Default. Your Full Name - Nome Completo + Nome completo @@ -4409,7 +4346,7 @@ Ozione di Default. Computer Name - Nome Computer + Nome del computer @@ -4424,7 +4361,7 @@ Ozione di Default. Choose a password to keep your account safe. - Scegliere una password per rendere sicuro il tuo account. + Scegli una password per rendere sicuro il tuo account. @@ -4434,7 +4371,7 @@ Ozione di Default. Repeat Password - Ripetere Password + Ripeti la password @@ -4459,7 +4396,7 @@ Ozione di Default. Only letters, numbers, underscore and hyphen are allowed, minimal of two characters. - ygyggy + Sono permesse solo lettere, numeri, trattini e trattini bassi. diff --git a/lang/calamares_ja-Hira.ts b/lang/calamares_ja-Hira.ts index 5f240c6ac..ad8c82923 100644 --- a/lang/calamares_ja-Hira.ts +++ b/lang/calamares_ja-Hira.ts @@ -84,11 +84,6 @@ Calamares::DebugWindow - - - Form - - GlobalStorage @@ -544,11 +539,6 @@ The installer will quit and all changes will be lost. ChoicePage - - - Form - - Select storage de&vice: @@ -914,12 +904,12 @@ The installer will quit and all changes will be lost. - + Your passwords do not match! - + OK! @@ -1456,11 +1446,6 @@ The installer will quit and all changes will be lost. EncryptWidget - - - Form - - En&crypt system @@ -1566,11 +1551,6 @@ The installer will quit and all changes will be lost. FinishedPage - - - Form - - &Restart now @@ -1921,11 +1901,6 @@ The installer will quit and all changes will be lost. LicensePage - - - Form - - <h1>License Agreement</h1> @@ -2081,33 +2056,27 @@ The installer will quit and all changes will be lost. - - + + No partitions are defined. - - - + + Encrypted rootfs setup error - + Root partition %1 is LUKS but no passphrase has been set. - + Could not create LUKS key file for root partition %1. - - - Could not configure LUKS key file on partition %1. - - MachineIdJob @@ -2582,18 +2551,13 @@ The installer will quit and all changes will be lost. - + Password is empty PackageChooserPage - - - Form - - Product Name @@ -2635,11 +2599,6 @@ The installer will quit and all changes will be lost. Page_Keyboard - - - Form - - Keyboard Model: @@ -2653,11 +2612,6 @@ The installer will quit and all changes will be lost. Page_UserSetup - - - Form - - What is your name? @@ -2834,11 +2788,6 @@ The installer will quit and all changes will be lost. PartitionPage - - - Form - - Storage de&vice: @@ -2948,72 +2897,72 @@ The installer will quit and all changes will be lost. - + No EFI system partition configured - + EFI system partition configured incorrectly - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem. - + The filesystem must be mounted on <strong>%1</strong>. - + The filesystem must have type FAT32. - + The filesystem must be at least %1 MiB in size. - + The filesystem must have flag <strong>%1</strong> set. - + You can continue without setting up an EFI system partition but your system may fail to start. - + Option to use GPT on BIOS - + A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>%2</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. - + Boot partition not encrypted - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. - + has at least one disk device available. - + There are no partitions to install on. @@ -3034,11 +2983,6 @@ The installer will quit and all changes will be lost. PlasmaLnfPage - - - Form - - Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. @@ -3800,11 +3744,6 @@ Output: TrackingPage - - - Form - - Placeholder @@ -3966,11 +3905,6 @@ Output: WelcomePage - - - Form - - diff --git a/lang/calamares_ja.ts b/lang/calamares_ja.ts index 82ebe4be4..e13bdbd13 100644 --- a/lang/calamares_ja.ts +++ b/lang/calamares_ja.ts @@ -84,11 +84,6 @@ Calamares::DebugWindow - - - Form - Form - GlobalStorage @@ -550,11 +545,6 @@ The installer will quit and all changes will be lost. ChoicePage - - - Form - フォーム - Select storage de&vice: @@ -920,12 +910,12 @@ The installer will quit and all changes will be lost. 使用できるのはアルファベットと数字と _ と - だけです。 - + Your passwords do not match! パスワードが一致していません! - + OK! OK! @@ -1463,11 +1453,6 @@ The installer will quit and all changes will be lost. EncryptWidget - - - Form - フォーム - En&crypt system @@ -1573,11 +1558,6 @@ The installer will quit and all changes will be lost. FinishedPage - - - Form - フォーム - &Restart now @@ -1928,11 +1908,6 @@ The installer will quit and all changes will be lost. LicensePage - - - Form - フォーム - <h1>License Agreement</h1> @@ -2088,33 +2063,27 @@ The installer will quit and all changes will be lost. LUKSキーファイルを設定しています。 - - + + No partitions are defined. パーティションが定義されていません。 - - - + + Encrypted rootfs setup error 暗号化された rootfs のセットアップエラー - + Root partition %1 is LUKS but no passphrase has been set. ルートパーティション %1 はLUKSですが、パスワードが設定されていません。 - + Could not create LUKS key file for root partition %1. ルートパーティション %1 のLUKSキーファイルを作成できませんでした。 - - - Could not configure LUKS key file on partition %1. - パーティション %1 でLUKSキーファイルを設定できませんでした。 - MachineIdJob @@ -2592,18 +2561,13 @@ The installer will quit and all changes will be lost. 未知のエラー - + Password is empty パスワードが空です PackageChooserPage - - - Form - フォーム - Product Name @@ -2645,11 +2609,6 @@ The installer will quit and all changes will be lost. Page_Keyboard - - - Form - フォーム - Keyboard Model: @@ -2663,11 +2622,6 @@ The installer will quit and all changes will be lost. Page_UserSetup - - - Form - フォーム - What is your name? @@ -2844,11 +2798,6 @@ The installer will quit and all changes will be lost. PartitionPage - - - Form - フォーム - Storage de&vice: @@ -2958,72 +2907,72 @@ The installer will quit and all changes will be lost. 変更後: - + No EFI system partition configured EFI システムパーティションが設定されていません - + EFI system partition configured incorrectly EFI システムパーティションが正しく設定されていません - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem. %1 を起動するには EFI システムパーティションが必要です。<br/><br/>EFI システムパーティションを設定するには、戻って適切なファイルシステムを選択または作成してください。 - + The filesystem must be mounted on <strong>%1</strong>. ファイルシステムは <strong>%1</strong> にマウントする必要があります。 - + The filesystem must have type FAT32. ファイルシステムのタイプは FAT32 にする必要があります。 - + The filesystem must be at least %1 MiB in size. ファイルシステムのサイズは最低でも %1 MiB である必要があります。 - + The filesystem must have flag <strong>%1</strong> set. ファイルシステムにはフラグ <strong>%1</strong> を設定する必要があります。 - + You can continue without setting up an EFI system partition but your system may fail to start. EFI システムパーティションを設定しなくても続行できますが、システムが起動しない場合があります。 - + Option to use GPT on BIOS BIOS で GPT を使用するためのオプション - + A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>%2</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. GPT パーティションテーブルは、すべてのシステムに最適なオプションです。このインストーラーは、BIOS システムのそのようなセットアップもサポートします。<br/><br/>BIOS で GPT パーティションテーブルを設定するには(まだ設定していない場合は)、戻ってパーティションテーブルを GPT に設定し、<strong>%2</strong> フラグを有効にした 8 MB の未フォーマットパーティションを作成します。<br/><br/>GPT を使用する BIOS システムで %1 を開始するには、未フォーマットの 8 MB のパーティションが必要です。 - + Boot partition not encrypted ブートパーティションが暗号化されていません - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. ブートパーティションは暗号化されたルートパーティションとともにセットアップされましたが、ブートパーティションは暗号化されていません。<br/><br/>重要なシステムファイルが暗号化されていないパーティションに残されているため、このようなセットアップは安全上の懸念があります。<br/>セットアップを続行することはできますが、後でシステムの起動中にファイルシステムが解除されます。<br/>ブートパーティションを暗号化させるには、前の画面に戻って、再度パーティションを作成し、パーティション作成ウィンドウ内で<strong>Encrypt</strong> (暗号化) を選択してください。 - + has at least one disk device available. は少なくとも1つのディスクデバイスを利用可能です。 - + There are no partitions to install on. インストールするパーティションがありません。 @@ -3044,11 +2993,6 @@ The installer will quit and all changes will be lost. PlasmaLnfPage - - - Form - フォーム - Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. @@ -3816,11 +3760,6 @@ Output: TrackingPage - - - Form - フォーム - Placeholder @@ -3982,11 +3921,6 @@ Output: WelcomePage - - - Form - フォーム - diff --git a/lang/calamares_ka.ts b/lang/calamares_ka.ts index 7626eb1cf..bdabb5405 100644 --- a/lang/calamares_ka.ts +++ b/lang/calamares_ka.ts @@ -84,11 +84,6 @@ Calamares::DebugWindow - - - Form - - GlobalStorage @@ -546,11 +541,6 @@ The installer will quit and all changes will be lost. ChoicePage - - - Form - - Select storage de&vice: @@ -916,12 +906,12 @@ The installer will quit and all changes will be lost. - + Your passwords do not match! - + OK! @@ -1458,11 +1448,6 @@ The installer will quit and all changes will be lost. EncryptWidget - - - Form - - En&crypt system @@ -1568,11 +1553,6 @@ The installer will quit and all changes will be lost. FinishedPage - - - Form - - &Restart now @@ -1923,11 +1903,6 @@ The installer will quit and all changes will be lost. LicensePage - - - Form - - <h1>License Agreement</h1> @@ -2083,33 +2058,27 @@ The installer will quit and all changes will be lost. - - + + No partitions are defined. - - - + + Encrypted rootfs setup error - + Root partition %1 is LUKS but no passphrase has been set. - + Could not create LUKS key file for root partition %1. - - - Could not configure LUKS key file on partition %1. - - MachineIdJob @@ -2593,18 +2562,13 @@ The installer will quit and all changes will be lost. - + Password is empty PackageChooserPage - - - Form - - Product Name @@ -2646,11 +2610,6 @@ The installer will quit and all changes will be lost. Page_Keyboard - - - Form - - Keyboard Model: @@ -2664,11 +2623,6 @@ The installer will quit and all changes will be lost. Page_UserSetup - - - Form - - What is your name? @@ -2845,11 +2799,6 @@ The installer will quit and all changes will be lost. PartitionPage - - - Form - - Storage de&vice: @@ -2959,72 +2908,72 @@ The installer will quit and all changes will be lost. - + No EFI system partition configured - + EFI system partition configured incorrectly - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem. - + The filesystem must be mounted on <strong>%1</strong>. - + The filesystem must have type FAT32. - + The filesystem must be at least %1 MiB in size. - + The filesystem must have flag <strong>%1</strong> set. - + You can continue without setting up an EFI system partition but your system may fail to start. - + Option to use GPT on BIOS - + A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>%2</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. - + Boot partition not encrypted - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. - + has at least one disk device available. - + There are no partitions to install on. @@ -3045,11 +2994,6 @@ The installer will quit and all changes will be lost. PlasmaLnfPage - - - Form - - Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. @@ -3811,11 +3755,6 @@ Output: TrackingPage - - - Form - - Placeholder @@ -3977,11 +3916,6 @@ Output: WelcomePage - - - Form - - diff --git a/lang/calamares_kk.ts b/lang/calamares_kk.ts index daf432ceb..69047e832 100644 --- a/lang/calamares_kk.ts +++ b/lang/calamares_kk.ts @@ -84,11 +84,6 @@ Calamares::DebugWindow - - - Form - - GlobalStorage @@ -546,11 +541,6 @@ The installer will quit and all changes will be lost. ChoicePage - - - Form - - Select storage de&vice: @@ -916,12 +906,12 @@ The installer will quit and all changes will be lost. - + Your passwords do not match! - + OK! @@ -1458,11 +1448,6 @@ The installer will quit and all changes will be lost. EncryptWidget - - - Form - - En&crypt system @@ -1568,11 +1553,6 @@ The installer will quit and all changes will be lost. FinishedPage - - - Form - - &Restart now @@ -1923,11 +1903,6 @@ The installer will quit and all changes will be lost. LicensePage - - - Form - - <h1>License Agreement</h1> @@ -2083,33 +2058,27 @@ The installer will quit and all changes will be lost. - - + + No partitions are defined. - - - + + Encrypted rootfs setup error - + Root partition %1 is LUKS but no passphrase has been set. - + Could not create LUKS key file for root partition %1. - - - Could not configure LUKS key file on partition %1. - - MachineIdJob @@ -2593,18 +2562,13 @@ The installer will quit and all changes will be lost. - + Password is empty PackageChooserPage - - - Form - - Product Name @@ -2646,11 +2610,6 @@ The installer will quit and all changes will be lost. Page_Keyboard - - - Form - - Keyboard Model: @@ -2664,11 +2623,6 @@ The installer will quit and all changes will be lost. Page_UserSetup - - - Form - - What is your name? @@ -2845,11 +2799,6 @@ The installer will quit and all changes will be lost. PartitionPage - - - Form - - Storage de&vice: @@ -2959,72 +2908,72 @@ The installer will quit and all changes will be lost. - + No EFI system partition configured - + EFI system partition configured incorrectly - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem. - + The filesystem must be mounted on <strong>%1</strong>. - + The filesystem must have type FAT32. - + The filesystem must be at least %1 MiB in size. - + The filesystem must have flag <strong>%1</strong> set. - + You can continue without setting up an EFI system partition but your system may fail to start. - + Option to use GPT on BIOS - + A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>%2</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. - + Boot partition not encrypted - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. - + has at least one disk device available. - + There are no partitions to install on. @@ -3045,11 +2994,6 @@ The installer will quit and all changes will be lost. PlasmaLnfPage - - - Form - - Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. @@ -3811,11 +3755,6 @@ Output: TrackingPage - - - Form - - Placeholder @@ -3977,11 +3916,6 @@ Output: WelcomePage - - - Form - - diff --git a/lang/calamares_kn.ts b/lang/calamares_kn.ts index b618a0e18..199e636d3 100644 --- a/lang/calamares_kn.ts +++ b/lang/calamares_kn.ts @@ -84,11 +84,6 @@ Calamares::DebugWindow - - - Form - - GlobalStorage @@ -546,11 +541,6 @@ The installer will quit and all changes will be lost. ChoicePage - - - Form - - Select storage de&vice: @@ -916,12 +906,12 @@ The installer will quit and all changes will be lost. - + Your passwords do not match! - + OK! @@ -1458,11 +1448,6 @@ The installer will quit and all changes will be lost. EncryptWidget - - - Form - - En&crypt system @@ -1568,11 +1553,6 @@ The installer will quit and all changes will be lost. FinishedPage - - - Form - - &Restart now @@ -1923,11 +1903,6 @@ The installer will quit and all changes will be lost. LicensePage - - - Form - - <h1>License Agreement</h1> @@ -2083,33 +2058,27 @@ The installer will quit and all changes will be lost. - - + + No partitions are defined. - - - + + Encrypted rootfs setup error - + Root partition %1 is LUKS but no passphrase has been set. - + Could not create LUKS key file for root partition %1. - - - Could not configure LUKS key file on partition %1. - - MachineIdJob @@ -2593,18 +2562,13 @@ The installer will quit and all changes will be lost. - + Password is empty PackageChooserPage - - - Form - - Product Name @@ -2646,11 +2610,6 @@ The installer will quit and all changes will be lost. Page_Keyboard - - - Form - - Keyboard Model: @@ -2664,11 +2623,6 @@ The installer will quit and all changes will be lost. Page_UserSetup - - - Form - - What is your name? @@ -2845,11 +2799,6 @@ The installer will quit and all changes will be lost. PartitionPage - - - Form - - Storage de&vice: @@ -2959,72 +2908,72 @@ The installer will quit and all changes will be lost. - + No EFI system partition configured - + EFI system partition configured incorrectly - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem. - + The filesystem must be mounted on <strong>%1</strong>. - + The filesystem must have type FAT32. - + The filesystem must be at least %1 MiB in size. - + The filesystem must have flag <strong>%1</strong> set. - + You can continue without setting up an EFI system partition but your system may fail to start. - + Option to use GPT on BIOS - + A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>%2</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. - + Boot partition not encrypted - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. - + has at least one disk device available. - + There are no partitions to install on. @@ -3045,11 +2994,6 @@ The installer will quit and all changes will be lost. PlasmaLnfPage - - - Form - - Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. @@ -3811,11 +3755,6 @@ Output: TrackingPage - - - Form - - Placeholder @@ -3977,11 +3916,6 @@ Output: WelcomePage - - - Form - - diff --git a/lang/calamares_ko.ts b/lang/calamares_ko.ts index 6f701bc33..3bd35b10d 100644 --- a/lang/calamares_ko.ts +++ b/lang/calamares_ko.ts @@ -84,11 +84,6 @@ Calamares::DebugWindow - - - Form - 형식 - GlobalStorage @@ -550,11 +545,6 @@ The installer will quit and all changes will be lost. ChoicePage - - - Form - 형식 - Select storage de&vice: @@ -920,12 +910,12 @@ The installer will quit and all changes will be lost. 문자, 숫자, 밑줄 및 하이픈만 허용됩니다. - + Your passwords do not match! 암호가 일치하지 않습니다! - + OK! 확인! @@ -1462,11 +1452,6 @@ The installer will quit and all changes will be lost. EncryptWidget - - - Form - 형식 - En&crypt system @@ -1572,11 +1557,6 @@ The installer will quit and all changes will be lost. FinishedPage - - - Form - 형식 - &Restart now @@ -1927,11 +1907,6 @@ The installer will quit and all changes will be lost. LicensePage - - - Form - 형식 - <h1>License Agreement</h1> @@ -2087,33 +2062,27 @@ The installer will quit and all changes will be lost. LUKS 키 파일 구성 중. - - + + No partitions are defined. 파티션이 정의되지 않았습니다. - - - + + Encrypted rootfs setup error 암호화된 rootfs 설정 오류 - + Root partition %1 is LUKS but no passphrase has been set. 루트 파티션 %1이(가) LUKS이지만 암호가 설정되지 않았습니다. - + Could not create LUKS key file for root partition %1. 루트 파티션 %1에 대한 LUKS 키 파일을 생성할 수 없습니다. - - - Could not configure LUKS key file on partition %1. - 파티션 %1에 LUKS 키 파일을 설정할 수 없습니다. - MachineIdJob @@ -2590,18 +2559,13 @@ The installer will quit and all changes will be lost. 알 수 없는 오류 - + Password is empty 비밀번호가 비어 있습니다 PackageChooserPage - - - Form - 형식 - Product Name @@ -2643,11 +2607,6 @@ The installer will quit and all changes will be lost. Page_Keyboard - - - Form - 형식 - Keyboard Model: @@ -2661,11 +2620,6 @@ The installer will quit and all changes will be lost. Page_UserSetup - - - Form - 형식 - What is your name? @@ -2842,11 +2796,6 @@ The installer will quit and all changes will be lost. PartitionPage - - - Form - 형식 - Storage de&vice: @@ -2956,72 +2905,72 @@ The installer will quit and all changes will be lost. 이후: - + No EFI system partition configured EFI 시스템 파티션이 설정되지 않았습니다 - + EFI system partition configured incorrectly EFI 시스템 파티션이 잘못 구성됨 - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem. %1을(를) 시작하려면 EFI 시스템 파티션이 필요합니다.<br/><br/>EFI 시스템 파티션을 구성하려면 돌아가서 적절한 파일 시스템을 선택하거나 생성하십시오. - + The filesystem must be mounted on <strong>%1</strong>. 파일 시스템은 <strong>%1</strong>에 마운트되어야 합니다. - + The filesystem must have type FAT32. 파일 시스템에는 FAT32 유형이 있어야 합니다. - + The filesystem must be at least %1 MiB in size. 파일 시스템의 크기는 %1MiB 이상이어야 합니다. - + The filesystem must have flag <strong>%1</strong> set. 파일 시스템에 플래그 <strong>%1</strong> 세트가 있어야 합니다. - + You can continue without setting up an EFI system partition but your system may fail to start. EFI 시스템 파티션을 설정하지 않고 계속할 수 있지만 시스템이 시작되지 않을 수 있습니다. - + Option to use GPT on BIOS BIOS에서 GPT를 사용하는 옵션 - + A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>%2</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. GPT 파티션 테이블은 모든 시스템에 가장 적합한 옵션입니다. 이 설치 관리자는 BIOS 시스템에 대한 이러한 설정도 지원합니다.<br/><br/>BIOS에서 GPT 파티션 테이블을 구성하려면(아직 수행하지 않은 경우) 돌아가서 파티션 테이블을 GPT로 설정한 다음 <strong>%2</strong> 플래그가 활성화된 8MB의 포맷되지 않은 파티션을 생성하십시오.<br/><br/>GPT가 있는 BIOS 시스템에서 %1을(를) 시작하려면 포맷되지 않은 8MB 파티션이 필요합니다. - + Boot partition not encrypted 부트 파티션이 암호화되지 않았습니다 - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. 암호화된 루트 파티션과 함께 별도의 부팅 파티션이 설정되었지만 부팅 파티션은 암호화되지 않았습니다.<br/><br/>중요한 시스템 파일은 암호화되지 않은 파티션에 보관되기 때문에 이러한 설정과 관련하여 보안 문제가 있습니다.<br/>원하는 경우 계속할 수 있지만 나중에 시스템을 시작하는 동안 파일 시스템 잠금이 해제됩니다.<br/>부팅 파티션을 암호화하려면 돌아가서 다시 생성하여 파티션 생성 창에서 <strong>암호화</strong>를 선택합니다. - + has at least one disk device available. 하나 이상의 디스크 장치를 사용할 수 있습니다. - + There are no partitions to install on. 설치를 위한 파티션이 없습니다. @@ -3042,11 +2991,6 @@ The installer will quit and all changes will be lost. PlasmaLnfPage - - - Form - 형식 - Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. @@ -3814,11 +3758,6 @@ Output: TrackingPage - - - Form - 형식 - Placeholder @@ -3980,11 +3919,6 @@ Output: WelcomePage - - - Form - 형식 - diff --git a/lang/calamares_lo.ts b/lang/calamares_lo.ts index 030e38bb9..bb03e340b 100644 --- a/lang/calamares_lo.ts +++ b/lang/calamares_lo.ts @@ -84,11 +84,6 @@ Calamares::DebugWindow - - - Form - - GlobalStorage @@ -544,11 +539,6 @@ The installer will quit and all changes will be lost. ChoicePage - - - Form - - Select storage de&vice: @@ -914,12 +904,12 @@ The installer will quit and all changes will be lost. - + Your passwords do not match! - + OK! @@ -1456,11 +1446,6 @@ The installer will quit and all changes will be lost. EncryptWidget - - - Form - - En&crypt system @@ -1566,11 +1551,6 @@ The installer will quit and all changes will be lost. FinishedPage - - - Form - - &Restart now @@ -1921,11 +1901,6 @@ The installer will quit and all changes will be lost. LicensePage - - - Form - - <h1>License Agreement</h1> @@ -2081,33 +2056,27 @@ The installer will quit and all changes will be lost. - - + + No partitions are defined. - - - + + Encrypted rootfs setup error - + Root partition %1 is LUKS but no passphrase has been set. - + Could not create LUKS key file for root partition %1. - - - Could not configure LUKS key file on partition %1. - - MachineIdJob @@ -2582,18 +2551,13 @@ The installer will quit and all changes will be lost. - + Password is empty PackageChooserPage - - - Form - - Product Name @@ -2635,11 +2599,6 @@ The installer will quit and all changes will be lost. Page_Keyboard - - - Form - - Keyboard Model: @@ -2653,11 +2612,6 @@ The installer will quit and all changes will be lost. Page_UserSetup - - - Form - - What is your name? @@ -2834,11 +2788,6 @@ The installer will quit and all changes will be lost. PartitionPage - - - Form - - Storage de&vice: @@ -2948,72 +2897,72 @@ The installer will quit and all changes will be lost. - + No EFI system partition configured - + EFI system partition configured incorrectly - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem. - + The filesystem must be mounted on <strong>%1</strong>. - + The filesystem must have type FAT32. - + The filesystem must be at least %1 MiB in size. - + The filesystem must have flag <strong>%1</strong> set. - + You can continue without setting up an EFI system partition but your system may fail to start. - + Option to use GPT on BIOS - + A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>%2</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. - + Boot partition not encrypted - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. - + has at least one disk device available. - + There are no partitions to install on. @@ -3034,11 +2983,6 @@ The installer will quit and all changes will be lost. PlasmaLnfPage - - - Form - - Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. @@ -3800,11 +3744,6 @@ Output: TrackingPage - - - Form - - Placeholder @@ -3966,11 +3905,6 @@ Output: WelcomePage - - - Form - - diff --git a/lang/calamares_lt.ts b/lang/calamares_lt.ts index 09b215b28..295c359e0 100644 --- a/lang/calamares_lt.ts +++ b/lang/calamares_lt.ts @@ -84,11 +84,6 @@ Calamares::DebugWindow - - - Form - Forma - GlobalStorage @@ -556,11 +551,6 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. ChoicePage - - - Form - Forma - Select storage de&vice: @@ -926,12 +916,12 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. Yra leidžiamos tik raidės, skaitmenys, pabraukimo brūkšniai ir brūkšneliai. - + Your passwords do not match! Jūsų slaptažodžiai nesutampa! - + OK! Gerai! @@ -1468,11 +1458,6 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. EncryptWidget - - - Form - Forma - En&crypt system @@ -1578,11 +1563,6 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. FinishedPage - - - Form - Forma - &Restart now @@ -1933,11 +1913,6 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. LicensePage - - - Form - Forma - <h1>License Agreement</h1> @@ -2093,33 +2068,27 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. Konfigūruojamas LUKS raktų failas. - - + + No partitions are defined. Nėra jokių apibrėžtų skaidinių. - - - + + Encrypted rootfs setup error Šifruoto rootfs sąrankos klaida - + Root partition %1 is LUKS but no passphrase has been set. Šaknies skaidinys %1 yra LUKS, tačiau nebuvo nustatyta jokia slaptafrazė. - + Could not create LUKS key file for root partition %1. Nepavyko šakniniam skaidiniui %1 sukurti LUKS rakto failo. - - - Could not configure LUKS key file on partition %1. - Nepavyko konfigūruoti LUKS rakto failo skaidinyje %1. - MachineIdJob @@ -2623,18 +2592,13 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. Nežinoma klaida - + Password is empty Slaptažodis yra tuščias PackageChooserPage - - - Form - Forma - Product Name @@ -2676,11 +2640,6 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. Page_Keyboard - - - Form - Forma - Keyboard Model: @@ -2694,11 +2653,6 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. Page_UserSetup - - - Form - Forma - What is your name? @@ -2875,11 +2829,6 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. PartitionPage - - - Form - Forma - Storage de&vice: @@ -2989,72 +2938,72 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. Po: - + No EFI system partition configured Nėra sukonfigūruoto EFI sistemos skaidinio - + EFI system partition configured incorrectly Neteisingai sukonfigūruotas EFI sistemos skaidinys - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem. %1 paleidimui yra reikalingas EFI sistemos skaidinys.<br/><br/>Norėdami konfigūruoti EFI sistemos skaidinį, grįžkite atgal ir pasirinkite arba sukurkite tinkamą failų sistemą. - + The filesystem must be mounted on <strong>%1</strong>. Failų sistema privalo būti prijungta ties <strong>%1</strong>. - + The filesystem must have type FAT32. Failų sistema privalo būti FAT32 tipo. - + The filesystem must be at least %1 MiB in size. Failų sistema privalo būti bent %1 MiB dydžio. - + The filesystem must have flag <strong>%1</strong> set. Failų sistema privalo turėti nustatytą <strong>%1</strong> vėliavėlę. - + You can continue without setting up an EFI system partition but your system may fail to start. Galite tęsti nenustatę EFI sistemos skaidinio, bet jūsų sistema gali nepasileisti. - + Option to use GPT on BIOS Parinktis naudoti GPT per BIOS - + A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>%2</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. GPT skaidinių lentelė yra geriausias variantas visoms sistemoms. Ši diegimo programa palaiko tokią sąranką taip pat ir BIOS sistemoms.<br/><br/>Norėdami konfigūruoti GPT skaidinių lentelę BIOS sistemoje, (jei dar nesate to padarę) grįžkite atgal ir nustatykite skaidinių lentelę į GPT, toliau, sukurkite 8 MB neformatuotą skaidinį su įjungta <strong>%2</strong> vėliavėle.<br/><br/>Neformatuotas 8 MB skaidinys yra būtinas, norint paleisti %1 BIOS sistemoje su GPT. - + Boot partition not encrypted Paleidimo skaidinys nėra užšifruotas - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. Kartu su užšifruotu šaknies skaidiniu, buvo nustatytas atskiras paleidimo skaidinys, tačiau paleidimo skaidinys nėra užšifruotas.<br/><br/>Dėl tokios sąrankos iškyla tam tikrų saugumo klausimų, kadangi svarbūs sisteminiai failai yra laikomi neužšifruotame skaidinyje.<br/>Jeigu norite, galite tęsti, tačiau failų sistemos atrakinimas įvyks vėliau, sistemos paleidimo metu.<br/>Norėdami užšifruoti paleidimo skaidinį, grįžkite atgal ir sukurkite jį iš naujo bei skaidinių kūrimo lange pažymėkite parinktį <strong>Užšifruoti</strong>. - + has at least one disk device available. turi bent vieną prieinamą disko įrenginį. - + There are no partitions to install on. Nėra skaidinių į kuriuos diegti. @@ -3075,11 +3024,6 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. PlasmaLnfPage - - - Form - Forma - Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. @@ -3847,11 +3791,6 @@ Išvestis: TrackingPage - - - Form - Forma - Placeholder @@ -4013,11 +3952,6 @@ Išvestis: WelcomePage - - - Form - Forma - diff --git a/lang/calamares_lv.ts b/lang/calamares_lv.ts index 4c9d81f5e..3c837ea2d 100644 --- a/lang/calamares_lv.ts +++ b/lang/calamares_lv.ts @@ -84,11 +84,6 @@ Calamares::DebugWindow - - - Form - - GlobalStorage @@ -548,11 +543,6 @@ The installer will quit and all changes will be lost. ChoicePage - - - Form - - Select storage de&vice: @@ -918,12 +908,12 @@ The installer will quit and all changes will be lost. - + Your passwords do not match! - + OK! @@ -1460,11 +1450,6 @@ The installer will quit and all changes will be lost. EncryptWidget - - - Form - - En&crypt system @@ -1570,11 +1555,6 @@ The installer will quit and all changes will be lost. FinishedPage - - - Form - - &Restart now @@ -1925,11 +1905,6 @@ The installer will quit and all changes will be lost. LicensePage - - - Form - - <h1>License Agreement</h1> @@ -2085,33 +2060,27 @@ The installer will quit and all changes will be lost. - - + + No partitions are defined. - - - + + Encrypted rootfs setup error - + Root partition %1 is LUKS but no passphrase has been set. - + Could not create LUKS key file for root partition %1. - - - Could not configure LUKS key file on partition %1. - - MachineIdJob @@ -2604,18 +2573,13 @@ The installer will quit and all changes will be lost. - + Password is empty PackageChooserPage - - - Form - - Product Name @@ -2657,11 +2621,6 @@ The installer will quit and all changes will be lost. Page_Keyboard - - - Form - - Keyboard Model: @@ -2675,11 +2634,6 @@ The installer will quit and all changes will be lost. Page_UserSetup - - - Form - - What is your name? @@ -2856,11 +2810,6 @@ The installer will quit and all changes will be lost. PartitionPage - - - Form - - Storage de&vice: @@ -2970,72 +2919,72 @@ The installer will quit and all changes will be lost. Pēc iestatīšanas: - + No EFI system partition configured - + EFI system partition configured incorrectly - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem. - + The filesystem must be mounted on <strong>%1</strong>. - + The filesystem must have type FAT32. - + The filesystem must be at least %1 MiB in size. - + The filesystem must have flag <strong>%1</strong> set. - + You can continue without setting up an EFI system partition but your system may fail to start. - + Option to use GPT on BIOS - + A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>%2</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. - + Boot partition not encrypted - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. - + has at least one disk device available. - + There are no partitions to install on. @@ -3056,11 +3005,6 @@ The installer will quit and all changes will be lost. PlasmaLnfPage - - - Form - - Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. @@ -3822,11 +3766,6 @@ Output: TrackingPage - - - Form - - Placeholder @@ -3988,11 +3927,6 @@ Output: WelcomePage - - - Form - - diff --git a/lang/calamares_mk.ts b/lang/calamares_mk.ts index ff592f981..cfce094b0 100644 --- a/lang/calamares_mk.ts +++ b/lang/calamares_mk.ts @@ -84,11 +84,6 @@ Calamares::DebugWindow - - - Form - - GlobalStorage @@ -546,11 +541,6 @@ The installer will quit and all changes will be lost. ChoicePage - - - Form - - Select storage de&vice: @@ -916,12 +906,12 @@ The installer will quit and all changes will be lost. - + Your passwords do not match! - + OK! @@ -1458,11 +1448,6 @@ The installer will quit and all changes will be lost. EncryptWidget - - - Form - - En&crypt system @@ -1568,11 +1553,6 @@ The installer will quit and all changes will be lost. FinishedPage - - - Form - - &Restart now @@ -1923,11 +1903,6 @@ The installer will quit and all changes will be lost. LicensePage - - - Form - - <h1>License Agreement</h1> @@ -2083,33 +2058,27 @@ The installer will quit and all changes will be lost. - - + + No partitions are defined. - - - + + Encrypted rootfs setup error - + Root partition %1 is LUKS but no passphrase has been set. - + Could not create LUKS key file for root partition %1. - - - Could not configure LUKS key file on partition %1. - - MachineIdJob @@ -2593,18 +2562,13 @@ The installer will quit and all changes will be lost. - + Password is empty PackageChooserPage - - - Form - - Product Name @@ -2646,11 +2610,6 @@ The installer will quit and all changes will be lost. Page_Keyboard - - - Form - - Keyboard Model: @@ -2664,11 +2623,6 @@ The installer will quit and all changes will be lost. Page_UserSetup - - - Form - - What is your name? @@ -2845,11 +2799,6 @@ The installer will quit and all changes will be lost. PartitionPage - - - Form - - Storage de&vice: @@ -2959,72 +2908,72 @@ The installer will quit and all changes will be lost. - + No EFI system partition configured - + EFI system partition configured incorrectly - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem. - + The filesystem must be mounted on <strong>%1</strong>. - + The filesystem must have type FAT32. - + The filesystem must be at least %1 MiB in size. - + The filesystem must have flag <strong>%1</strong> set. - + You can continue without setting up an EFI system partition but your system may fail to start. - + Option to use GPT on BIOS - + A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>%2</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. - + Boot partition not encrypted - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. - + has at least one disk device available. - + There are no partitions to install on. @@ -3045,11 +2994,6 @@ The installer will quit and all changes will be lost. PlasmaLnfPage - - - Form - - Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. @@ -3811,11 +3755,6 @@ Output: TrackingPage - - - Form - - Placeholder @@ -3977,11 +3916,6 @@ Output: WelcomePage - - - Form - - diff --git a/lang/calamares_ml.ts b/lang/calamares_ml.ts index bac1915b3..234cebad9 100644 --- a/lang/calamares_ml.ts +++ b/lang/calamares_ml.ts @@ -84,11 +84,6 @@ Calamares::DebugWindow - - - Form - ഫോം - GlobalStorage @@ -548,11 +543,6 @@ The installer will quit and all changes will be lost. ChoicePage - - - Form - ഫോം - Select storage de&vice: @@ -918,12 +908,12 @@ The installer will quit and all changes will be lost. അക്ഷരങ്ങൾ, അക്കങ്ങൾ, അണ്ടർസ്കോർ, ഹൈഫൺ എന്നിവയേ അനുവദിച്ചിട്ടുള്ളൂ. - + Your passwords do not match! നിങ്ങളുടെ പാസ്‌വേഡുകൾ പൊരുത്തപ്പെടുന്നില്ല! - + OK! @@ -1460,11 +1450,6 @@ The installer will quit and all changes will be lost. EncryptWidget - - - Form - ഫോം - En&crypt system @@ -1570,11 +1555,6 @@ The installer will quit and all changes will be lost. FinishedPage - - - Form - ഫോം - &Restart now @@ -1925,11 +1905,6 @@ The installer will quit and all changes will be lost. LicensePage - - - Form - ഫോം - <h1>License Agreement</h1> @@ -2085,33 +2060,27 @@ The installer will quit and all changes will be lost. LUKS കീ ഫയൽ ക്രമീകരിക്കുന്നു. - - + + No partitions are defined. പാര്‍ട്ടീഷ്യനുകള്‍ നിര്‍വ്വചിച്ചിട്ടില്ല - - - + + Encrypted rootfs setup error എന്‍ക്രിപ്റ്റുചെയ്ത റൂട്ട് എഫ്എസ് സജ്ജീകരണത്തില്‍ പ്രശ്നമുണ്ടു് - + Root partition %1 is LUKS but no passphrase has been set. റൂട്ട് പാർട്ടീഷൻ %1 LUKS ആണ് പക്ഷേ രഹസ്യവാക്കൊന്നും ക്രമീകരിച്ചിട്ടില്ല. - + Could not create LUKS key file for root partition %1. റൂട്ട് പാർട്ടീഷൻ %1ന് വേണ്ടി LUKS കീ ഫയൽ നിർമ്മിക്കാനായില്ല. - - - Could not configure LUKS key file on partition %1. - - MachineIdJob @@ -2595,18 +2564,13 @@ The installer will quit and all changes will be lost. അപരിചിതമായ പിശക് - + Password is empty രഹസ്യവാക്ക് ശൂന്യമാണ് PackageChooserPage - - - Form - ഫോം - Product Name @@ -2648,11 +2612,6 @@ The installer will quit and all changes will be lost. Page_Keyboard - - - Form - ഫോം - Keyboard Model: @@ -2666,11 +2625,6 @@ The installer will quit and all changes will be lost. Page_UserSetup - - - Form - ഫോം - What is your name? @@ -2847,11 +2801,6 @@ The installer will quit and all changes will be lost. PartitionPage - - - Form - ഫോം - Storage de&vice: @@ -2961,72 +2910,72 @@ The installer will quit and all changes will be lost. ശേഷം: - + No EFI system partition configured ഇഎഫ്ഐ സിസ്റ്റം പാർട്ടീഷനൊന്നും ക്രമീകരിച്ചിട്ടില്ല - + EFI system partition configured incorrectly - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem. - + The filesystem must be mounted on <strong>%1</strong>. - + The filesystem must have type FAT32. - + The filesystem must be at least %1 MiB in size. - + The filesystem must have flag <strong>%1</strong> set. - + You can continue without setting up an EFI system partition but your system may fail to start. - + Option to use GPT on BIOS - + A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>%2</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. - + Boot partition not encrypted ബൂട്ട് പാർട്ടീഷൻ എൻക്രിപ്റ്റ് ചെയ്യപ്പെട്ടിട്ടില്ല - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. എൻക്രിപ്റ്റ് ചെയ്ത ഒരു റൂട്ട് പാർട്ടീഷനോടൊപ്പം ഒരു വേർപെടുത്തിയ ബൂട്ട് പാർട്ടീഷനും ക്രമീകരിക്കപ്പെട്ടിരുന്നു, എന്നാൽ ബൂട്ട് പാർട്ടീഷൻ എൻക്രിപ്റ്റ് ചെയ്യപ്പെട്ടതല്ല.<br/><br/>ഇത്തരം സജ്ജീകരണത്തിന്റെ സുരക്ഷ ഉത്കണ്ഠാജനകമാണ്, എന്തെന്നാൽ പ്രധാനപ്പെട്ട സിസ്റ്റം ഫയലുകൾ ഒരു എൻക്രിപ്റ്റ് ചെയ്യപ്പെടാത്ത പാർട്ടീഷനിലാണ് സൂക്ഷിച്ചിട്ടുള്ളത്.<br/> താങ്കൾക്ക് വേണമെങ്കിൽ തുടരാം, പക്ഷേ ഫയൽ സിസ്റ്റം തുറക്കൽ സിസ്റ്റം ആരംഭപ്രക്രിയയിൽ വൈകിയേ സംഭവിക്കൂ.<br/>ബൂട്ട് പാർട്ടീഷൻ എൻക്രിപ്റ്റ് ചെയ്യാനായി, തിരിച്ചു പോയി പാർട്ടീഷൻ നിർമ്മാണ ജാലകത്തിൽ <strong>എൻക്രിപ്റ്റ്</strong> തിരഞ്ഞെടുത്തുകൊണ്ട് അത് വീണ്ടും നിർമ്മിക്കുക. - + has at least one disk device available. ഒരു ഡിസ്ക് ഡിവൈസെങ്കിലും ലഭ്യമാണ്. - + There are no partitions to install on. @@ -3047,11 +2996,6 @@ The installer will quit and all changes will be lost. PlasmaLnfPage - - - Form - ഫോം - Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. @@ -3816,11 +3760,6 @@ Output: TrackingPage - - - Form - ഫോം - Placeholder @@ -3982,11 +3921,6 @@ Output: WelcomePage - - - Form - ഫോം - diff --git a/lang/calamares_mr.ts b/lang/calamares_mr.ts index 9b7b445a0..7a3d2e436 100644 --- a/lang/calamares_mr.ts +++ b/lang/calamares_mr.ts @@ -84,11 +84,6 @@ Calamares::DebugWindow - - - Form - स्वरुप - GlobalStorage @@ -546,11 +541,6 @@ The installer will quit and all changes will be lost. ChoicePage - - - Form - स्वरुप - Select storage de&vice: @@ -916,12 +906,12 @@ The installer will quit and all changes will be lost. - + Your passwords do not match! तुमचा परवलीशब्द जुळत नाही - + OK! @@ -1458,11 +1448,6 @@ The installer will quit and all changes will be lost. EncryptWidget - - - Form - स्वरुप - En&crypt system @@ -1568,11 +1553,6 @@ The installer will quit and all changes will be lost. FinishedPage - - - Form - स्वरुप - &Restart now @@ -1923,11 +1903,6 @@ The installer will quit and all changes will be lost. LicensePage - - - Form - स्वरुप - <h1>License Agreement</h1> @@ -2083,33 +2058,27 @@ The installer will quit and all changes will be lost. - - + + No partitions are defined. - - - + + Encrypted rootfs setup error - + Root partition %1 is LUKS but no passphrase has been set. - + Could not create LUKS key file for root partition %1. - - - Could not configure LUKS key file on partition %1. - - MachineIdJob @@ -2593,18 +2562,13 @@ The installer will quit and all changes will be lost. - + Password is empty PackageChooserPage - - - Form - स्वरुप - Product Name @@ -2646,11 +2610,6 @@ The installer will quit and all changes will be lost. Page_Keyboard - - - Form - स्वरुप - Keyboard Model: @@ -2664,11 +2623,6 @@ The installer will quit and all changes will be lost. Page_UserSetup - - - Form - स्वरुप - What is your name? @@ -2845,11 +2799,6 @@ The installer will quit and all changes will be lost. PartitionPage - - - Form - स्वरुप - Storage de&vice: @@ -2959,72 +2908,72 @@ The installer will quit and all changes will be lost. नंतर : - + No EFI system partition configured - + EFI system partition configured incorrectly - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem. - + The filesystem must be mounted on <strong>%1</strong>. - + The filesystem must have type FAT32. - + The filesystem must be at least %1 MiB in size. - + The filesystem must have flag <strong>%1</strong> set. - + You can continue without setting up an EFI system partition but your system may fail to start. - + Option to use GPT on BIOS - + A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>%2</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. - + Boot partition not encrypted - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. - + has at least one disk device available. - + There are no partitions to install on. @@ -3045,11 +2994,6 @@ The installer will quit and all changes will be lost. PlasmaLnfPage - - - Form - स्वरुप - Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. @@ -3811,11 +3755,6 @@ Output: TrackingPage - - - Form - स्वरुप - Placeholder @@ -3977,11 +3916,6 @@ Output: WelcomePage - - - Form - स्वरुप - diff --git a/lang/calamares_nb.ts b/lang/calamares_nb.ts index a91b64c98..18808271e 100644 --- a/lang/calamares_nb.ts +++ b/lang/calamares_nb.ts @@ -84,11 +84,6 @@ Calamares::DebugWindow - - - Form - Form - GlobalStorage @@ -547,11 +542,6 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt. ChoicePage - - - Form - Form - Select storage de&vice: @@ -917,12 +907,12 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt. - + Your passwords do not match! - + OK! @@ -1459,11 +1449,6 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt. EncryptWidget - - - Form - Form - En&crypt system @@ -1569,11 +1554,6 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt. FinishedPage - - - Form - Form - &Restart now @@ -1924,11 +1904,6 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt. LicensePage - - - Form - Form - <h1>License Agreement</h1> @@ -2084,33 +2059,27 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt. - - + + No partitions are defined. - - - + + Encrypted rootfs setup error - + Root partition %1 is LUKS but no passphrase has been set. - + Could not create LUKS key file for root partition %1. - - - Could not configure LUKS key file on partition %1. - - MachineIdJob @@ -2594,18 +2563,13 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.Ukjent feil - + Password is empty PackageChooserPage - - - Form - Form - Product Name @@ -2647,11 +2611,6 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt. Page_Keyboard - - - Form - Form - Keyboard Model: @@ -2665,11 +2624,6 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt. Page_UserSetup - - - Form - Form - What is your name? @@ -2846,11 +2800,6 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt. PartitionPage - - - Form - Form - Storage de&vice: @@ -2960,72 +2909,72 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt. - + No EFI system partition configured - + EFI system partition configured incorrectly - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem. - + The filesystem must be mounted on <strong>%1</strong>. - + The filesystem must have type FAT32. - + The filesystem must be at least %1 MiB in size. - + The filesystem must have flag <strong>%1</strong> set. - + You can continue without setting up an EFI system partition but your system may fail to start. - + Option to use GPT on BIOS - + A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>%2</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. - + Boot partition not encrypted - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. - + has at least one disk device available. - + There are no partitions to install on. @@ -3046,11 +2995,6 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt. PlasmaLnfPage - - - Form - Form - Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. @@ -3812,11 +3756,6 @@ Output: TrackingPage - - - Form - Form - Placeholder @@ -3978,11 +3917,6 @@ Output: WelcomePage - - - Form - Form - diff --git a/lang/calamares_ne_NP.ts b/lang/calamares_ne_NP.ts index 613c2242e..1e8e06a70 100644 --- a/lang/calamares_ne_NP.ts +++ b/lang/calamares_ne_NP.ts @@ -84,11 +84,6 @@ Calamares::DebugWindow - - - Form - फारम - GlobalStorage @@ -546,11 +541,6 @@ The installer will quit and all changes will be lost. ChoicePage - - - Form - फारम - Select storage de&vice: @@ -916,12 +906,12 @@ The installer will quit and all changes will be lost. - + Your passwords do not match! पासवर्डहरू मिलेन ।  - + OK! @@ -1458,11 +1448,6 @@ The installer will quit and all changes will be lost. EncryptWidget - - - Form - फारम - En&crypt system @@ -1568,11 +1553,6 @@ The installer will quit and all changes will be lost. FinishedPage - - - Form - फारम - &Restart now @@ -1923,11 +1903,6 @@ The installer will quit and all changes will be lost. LicensePage - - - Form - फारम - <h1>License Agreement</h1> @@ -2083,33 +2058,27 @@ The installer will quit and all changes will be lost. - - + + No partitions are defined. - - - + + Encrypted rootfs setup error - + Root partition %1 is LUKS but no passphrase has been set. - + Could not create LUKS key file for root partition %1. - - - Could not configure LUKS key file on partition %1. - - MachineIdJob @@ -2593,18 +2562,13 @@ The installer will quit and all changes will be lost. - + Password is empty PackageChooserPage - - - Form - फारम - Product Name @@ -2646,11 +2610,6 @@ The installer will quit and all changes will be lost. Page_Keyboard - - - Form - फारम - Keyboard Model: @@ -2664,11 +2623,6 @@ The installer will quit and all changes will be lost. Page_UserSetup - - - Form - फारम - What is your name? @@ -2845,11 +2799,6 @@ The installer will quit and all changes will be lost. PartitionPage - - - Form - फारम - Storage de&vice: @@ -2959,72 +2908,72 @@ The installer will quit and all changes will be lost. - + No EFI system partition configured - + EFI system partition configured incorrectly - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem. - + The filesystem must be mounted on <strong>%1</strong>. - + The filesystem must have type FAT32. - + The filesystem must be at least %1 MiB in size. - + The filesystem must have flag <strong>%1</strong> set. - + You can continue without setting up an EFI system partition but your system may fail to start. - + Option to use GPT on BIOS - + A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>%2</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. - + Boot partition not encrypted - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. - + has at least one disk device available. - + There are no partitions to install on. @@ -3045,11 +2994,6 @@ The installer will quit and all changes will be lost. PlasmaLnfPage - - - Form - फारम - Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. @@ -3811,11 +3755,6 @@ Output: TrackingPage - - - Form - फारम - Placeholder @@ -3977,11 +3916,6 @@ Output: WelcomePage - - - Form - फारम - diff --git a/lang/calamares_nl.ts b/lang/calamares_nl.ts index b9804bb34..ed503586f 100644 --- a/lang/calamares_nl.ts +++ b/lang/calamares_nl.ts @@ -84,11 +84,6 @@ Calamares::DebugWindow - - - Form - Formulier - GlobalStorage @@ -552,11 +547,6 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. ChoicePage - - - Form - Formulier - Select storage de&vice: @@ -922,12 +912,12 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. Alleen letters, nummers en (laag) streepjes zijn toegestaan. - + Your passwords do not match! Je wachtwoorden komen niet overeen! - + OK! @@ -1464,11 +1454,6 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. EncryptWidget - - - Form - Formulier - En&crypt system @@ -1574,11 +1559,6 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. FinishedPage - - - Form - Formulier - &Restart now @@ -1929,11 +1909,6 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. LicensePage - - - Form - Formulier - <h1>License Agreement</h1> @@ -2089,33 +2064,27 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. LUKS-sleutelbestand configureren. - - + + No partitions are defined. Geen partities gedefineerd. - - - + + Encrypted rootfs setup error Versleutelde rootfs installatiefout - + Root partition %1 is LUKS but no passphrase has been set. Rootpartitie %1 is LUKS maar er is een wachtwoord ingesteld. - + Could not create LUKS key file for root partition %1. Kon het LUKS-sleutelbestand niet aanmaken voor rootpartitie %1. - - - Could not configure LUKS key file on partition %1. - Kon het LUKS-sleutelbestand niet aanmaken op partitie %1. - MachineIdJob @@ -2599,18 +2568,13 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. Onbekende fout - + Password is empty Wachtwoord is leeg PackageChooserPage - - - Form - Formulier - Product Name @@ -2652,11 +2616,6 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. Page_Keyboard - - - Form - Formulier - Keyboard Model: @@ -2670,11 +2629,6 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. Page_UserSetup - - - Form - Formulier - What is your name? @@ -2851,11 +2805,6 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. PartitionPage - - - Form - Formulier - Storage de&vice: @@ -2965,72 +2914,72 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. Na: - + No EFI system partition configured Geen EFI systeempartitie geconfigureerd - + EFI system partition configured incorrectly - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem. - + The filesystem must be mounted on <strong>%1</strong>. - + The filesystem must have type FAT32. - + The filesystem must be at least %1 MiB in size. - + The filesystem must have flag <strong>%1</strong> set. - + You can continue without setting up an EFI system partition but your system may fail to start. - + Option to use GPT on BIOS Optie om GPT te gebruiken in BIOS - + A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>%2</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. - + Boot partition not encrypted Bootpartitie niet versleuteld - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. Een aparte bootpartitie was ingesteld samen met een versleutelde rootpartitie, maar de bootpartitie zelf is niet versleuteld.<br/><br/>Dit is niet volledig veilig, aangezien belangrijke systeembestanden bewaard worden op een niet-versleutelde partitie.<br/>Je kan doorgaan als je wil, maar het ontgrendelen van bestandssystemen zal tijdens het opstarten later plaatsvinden.<br/>Om de bootpartitie toch te versleutelen: keer terug en maak de bootpartitie opnieuw, waarbij je <strong>Versleutelen</strong> aanvinkt in het venster partitie aanmaken. - + has at least one disk device available. tenminste één schijfapparaat beschikbaar. - + There are no partitions to install on. Er zijn geen partities om op te installeren. @@ -3051,11 +3000,6 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. PlasmaLnfPage - - - Form - Formulier - Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. @@ -3821,11 +3765,6 @@ De installatie kan niet doorgaan. TrackingPage - - - Form - Formulier - Placeholder @@ -3987,11 +3926,6 @@ De installatie kan niet doorgaan. WelcomePage - - - Form - Formulier - diff --git a/lang/calamares_oc.ts b/lang/calamares_oc.ts index 4628fc8b0..210b4d3d5 100644 --- a/lang/calamares_oc.ts +++ b/lang/calamares_oc.ts @@ -84,11 +84,6 @@ Calamares::DebugWindow - - - Form - Formulari - GlobalStorage @@ -550,11 +545,6 @@ The installer will quit and all changes will be lost. ChoicePage - - - Form - Formulari - Select storage de&vice: @@ -920,12 +910,12 @@ The installer will quit and all changes will be lost. Son solament permeses las letras, nombres, jonhents basses e los tirets. - + Your passwords do not match! Los senhals correspondon pas ! - + OK! D’acòrd ! @@ -1462,11 +1452,6 @@ The installer will quit and all changes will be lost. EncryptWidget - - - Form - Formulari - En&crypt system @@ -1572,11 +1557,6 @@ The installer will quit and all changes will be lost. FinishedPage - - - Form - Formulari - &Restart now @@ -1927,11 +1907,6 @@ The installer will quit and all changes will be lost. LicensePage - - - Form - Formulari - <h1>License Agreement</h1> @@ -2087,33 +2062,27 @@ The installer will quit and all changes will be lost. - - + + No partitions are defined. Cap de particion pas definida. - - - + + Encrypted rootfs setup error - + Root partition %1 is LUKS but no passphrase has been set. - + Could not create LUKS key file for root partition %1. - - - Could not configure LUKS key file on partition %1. - - MachineIdJob @@ -2597,18 +2566,13 @@ The installer will quit and all changes will be lost. Error desconeguda - + Password is empty Lo senhal es void PackageChooserPage - - - Form - Formulari - Product Name @@ -2650,11 +2614,6 @@ The installer will quit and all changes will be lost. Page_Keyboard - - - Form - Formulari - Keyboard Model: @@ -2668,11 +2627,6 @@ The installer will quit and all changes will be lost. Page_UserSetup - - - Form - Formulari - What is your name? @@ -2849,11 +2803,6 @@ The installer will quit and all changes will be lost. PartitionPage - - - Form - Formulari - Storage de&vice: @@ -2963,72 +2912,72 @@ The installer will quit and all changes will be lost. Aprèp : - + No EFI system partition configured - + EFI system partition configured incorrectly - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem. - + The filesystem must be mounted on <strong>%1</strong>. - + The filesystem must have type FAT32. - + The filesystem must be at least %1 MiB in size. - + The filesystem must have flag <strong>%1</strong> set. - + You can continue without setting up an EFI system partition but your system may fail to start. - + Option to use GPT on BIOS Opcion per utilizar GPT sul BIOS - + A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>%2</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. - + Boot partition not encrypted - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. - + has at least one disk device available. - + There are no partitions to install on. @@ -3049,11 +2998,6 @@ The installer will quit and all changes will be lost. PlasmaLnfPage - - - Form - Formulari - Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. @@ -3817,11 +3761,6 @@ Sortida : TrackingPage - - - Form - Formulari - Placeholder @@ -3983,11 +3922,6 @@ Sortida : WelcomePage - - - Form - Formulari - diff --git a/lang/calamares_pl.ts b/lang/calamares_pl.ts index 764cbde21..866741a37 100644 --- a/lang/calamares_pl.ts +++ b/lang/calamares_pl.ts @@ -84,11 +84,6 @@ Calamares::DebugWindow - - - Form - Formularz - GlobalStorage @@ -556,11 +551,6 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone. ChoicePage - - - Form - Formularz - Select storage de&vice: @@ -926,12 +916,12 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.Dozwolone są tylko litery, cyfry, podkreślenia i łączniki. - + Your passwords do not match! Twoje hasła nie są zgodne! - + OK! OK! @@ -1468,11 +1458,6 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone. EncryptWidget - - - Form - Formularz - En&crypt system @@ -1578,11 +1563,6 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone. FinishedPage - - - Form - Form - &Restart now @@ -1933,11 +1913,6 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone. LicensePage - - - Form - Formularz - <h1>License Agreement</h1> @@ -2093,33 +2068,27 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.Konfigurowanie pliku klucza LUKS. - - + + No partitions are defined. Nie zdefiniowano żadnych partycji. - - - + + Encrypted rootfs setup error Błąd konfiguracji zaszyfrowanych rootfs - + Root partition %1 is LUKS but no passphrase has been set. Partycja główna %1 to LUKS, ale nie ustawiono hasła. - + Could not create LUKS key file for root partition %1. Nie można utworzyć pliku klucza LUKS dla partycji głównej %1. - - - Could not configure LUKS key file on partition %1. - Nie można skonfigurować pliku klucza LUKS na partycji %1. - MachineIdJob @@ -2623,18 +2592,13 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.Nieznany błąd - + Password is empty Hasło jest puste PackageChooserPage - - - Form - Formularz - Product Name @@ -2676,11 +2640,6 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone. Page_Keyboard - - - Form - Form - Keyboard Model: @@ -2694,11 +2653,6 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone. Page_UserSetup - - - Form - Form - What is your name? @@ -2875,11 +2829,6 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone. PartitionPage - - - Form - Form - Storage de&vice: @@ -2989,72 +2938,72 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.Po: - + No EFI system partition configured Nie skonfigurowano partycji systemowej EFI - + EFI system partition configured incorrectly Partycja systemowa EFI skonfigurowana niepoprawnie - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem. Partycja systemowa EFI jest niezbędna do uruchomienia %1.<br/><br/>Do skonfigurowania partycji systemowej EFI, cofnij się i wybierz lub utwórz odpowiedni system plików. - + The filesystem must be mounted on <strong>%1</strong>. System plików musi zostać zamontowany w <strong>%1</strong>. - + The filesystem must have type FAT32. System plików musi być typu FAT32. - + The filesystem must be at least %1 MiB in size. Rozmiar systemu plików musi wynosić co najmniej %1 MiB. - + The filesystem must have flag <strong>%1</strong> set. System plików musi mieć ustawioną flagę <strong>%1</strong>. - + You can continue without setting up an EFI system partition but your system may fail to start. Możesz kontynuować bez konfigurowania partycji systemowej EFI, ale uruchomienie systemu może się nie powieść. - + Option to use GPT on BIOS Opcja korzystania z GPT w BIOS-ie - + A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>%2</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. Tabela partycji GPT jest najlepszą opcją dla wszystkich systemów. Ten instalator obsługuje taką konfigurację również dla systemów BIOS. <br/><br/>Aby skonfigurować tabelę partycji GPT w systemie BIOS, (jeśli jeszcze tego nie zrobiono) cofnij się i ustaw tabelę partycji na GPT, a następnie utwórz niesformatowaną partycję o rozmiarze 8 MB z włączoną flagą <strong>%2</strong>.<br/><br/> Niesformatowana partycja 8 MB jest niezbędna do uruchomienia %1 w systemie BIOS z GPT. - + Boot partition not encrypted Niezaszyfrowana partycja rozruchowa - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. Oddzielna partycja rozruchowa została skonfigurowana razem z zaszyfrowaną partycją roota, ale partycja rozruchowa nie jest szyfrowana.<br/><br/>Nie jest to najbezpieczniejsze rozwiązanie, ponieważ ważne pliki systemowe znajdują się na niezaszyfrowanej partycji.<br/>Możesz kontynuować, ale odblokowywanie systemu nastąpi później, w trakcie uruchamiania.<br/>Aby zaszyfrować partycję rozruchową, wróć i utwórz ją ponownie zaznaczając opcję <strong>Szyfruj</strong> w oknie tworzenia partycji. - + has at least one disk device available. jest dostępne co najmniej jedno urządzenie dyskowe. - + There are no partitions to install on. Brak partycji na których można dokonać instalacji. @@ -3075,11 +3024,6 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone. PlasmaLnfPage - - - Form - Formularz - Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. @@ -3848,11 +3792,6 @@ i nie uruchomi się TrackingPage - - - Form - Formularz - Placeholder @@ -4014,11 +3953,6 @@ i nie uruchomi się WelcomePage - - - Form - Formularz - diff --git a/lang/calamares_pt_BR.ts b/lang/calamares_pt_BR.ts index 323493ccc..869ae5d63 100644 --- a/lang/calamares_pt_BR.ts +++ b/lang/calamares_pt_BR.ts @@ -84,11 +84,6 @@ Calamares::DebugWindow - - - Form - Formulário - GlobalStorage @@ -554,11 +549,6 @@ O instalador será fechado e todas as alterações serão perdidas. ChoicePage - - - Form - Formulário - Select storage de&vice: @@ -924,12 +914,12 @@ O instalador será fechado e todas as alterações serão perdidas.É permitido apenas letras, números, sublinhado e hífen. - + Your passwords do not match! As senhas não estão iguais! - + OK! OK! @@ -1466,11 +1456,6 @@ O instalador será fechado e todas as alterações serão perdidas. EncryptWidget - - - Form - Formulário - En&crypt system @@ -1576,11 +1561,6 @@ O instalador será fechado e todas as alterações serão perdidas. FinishedPage - - - Form - Formulário - &Restart now @@ -1931,11 +1911,6 @@ O instalador será fechado e todas as alterações serão perdidas. LicensePage - - - Form - Formulário - <h1>License Agreement</h1> @@ -2091,33 +2066,27 @@ O instalador será fechado e todas as alterações serão perdidas.Configurando o arquivo de chave do LUKS. - - + + No partitions are defined. Nenhuma partição está definida. - - - + + Encrypted rootfs setup error Erro de configuração de rootfs encriptado - + Root partition %1 is LUKS but no passphrase has been set. A partição raiz %1 é LUKS, mas nenhuma senha foi definida. - + Could not create LUKS key file for root partition %1. Não foi possível criar o arquivo de chave LUKS para a partição raiz %1. - - - Could not configure LUKS key file on partition %1. - Não foi possível configurar a chave LUKS na partição %1. - MachineIdJob @@ -2612,18 +2581,13 @@ O instalador será fechado e todas as alterações serão perdidas.Erro desconhecido - + Password is empty A senha está em branco PackageChooserPage - - - Form - Formulário - Product Name @@ -2665,11 +2629,6 @@ O instalador será fechado e todas as alterações serão perdidas. Page_Keyboard - - - Form - Formulário - Keyboard Model: @@ -2683,11 +2642,6 @@ O instalador será fechado e todas as alterações serão perdidas. Page_UserSetup - - - Form - Formulário - What is your name? @@ -2864,11 +2818,6 @@ O instalador será fechado e todas as alterações serão perdidas. PartitionPage - - - Form - Formulário - Storage de&vice: @@ -2978,72 +2927,72 @@ O instalador será fechado e todas as alterações serão perdidas.Depois: - + No EFI system partition configured Nenhuma partição de sistema EFI configurada - + EFI system partition configured incorrectly Partição EFI do sistema configurada incorretamente - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem. Uma partição de sistema EFI é necessária para iniciar o %1. <br/><br/>Para configurar uma partição de sistema EFI, volte atrás e selecione ou crie um sistema de arquivos adequado. - + The filesystem must be mounted on <strong>%1</strong>. O sistema de arquivos deve ser montado em <strong>%1</strong>. - + The filesystem must have type FAT32. O sistema de arquivos deve ter o tipo FAT32. - + The filesystem must be at least %1 MiB in size. O sistema de arquivos deve ter pelo menos %1 MiB de tamanho. - + The filesystem must have flag <strong>%1</strong> set. O sistema de arquivos deve ter o marcador %1 definido. - + You can continue without setting up an EFI system partition but your system may fail to start. Você pode continuar sem configurar uma partição de sistema EFI, mas seu sistema pode não iniciar. - + Option to use GPT on BIOS Opção para usar GPT no BIOS - + A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>%2</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. Uma tabela de partições GPT é a melhor opção para todos os sistemas. Este instalador suporta tal configuração para sistemas BIOS também.<br/><br/>Para configurar uma tabela de partições GPT no BIOS, (caso não tenha sido feito ainda) volte atrás e defina a tabela de partições como GPT, depois crie uma partição sem formatação de 8 MB com o marcador <strong>%2</strong> ativado.<br/><br/>Uma partição não formatada de 8 MB é necessária para iniciar %1 em um sistema BIOS com GPT. - + Boot partition not encrypted Partição de inicialização não criptografada - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. Uma partição de inicialização separada foi configurada juntamente com uma partição raiz criptografada, mas a partição de inicialização não é criptografada.<br/><br/>Há preocupações de segurança quanto a esse tipo de configuração, porque arquivos de sistema importantes são mantidos em uma partição não criptografada.<br/>Você pode continuar se quiser, mas o desbloqueio do sistema de arquivos acontecerá mais tarde durante a inicialização do sistema.<br/>Para criptografar a partição de inicialização, volte e recrie-a, selecionando <strong>Criptografar</strong> na janela de criação da partição. - + has at least one disk device available. tem pelo menos um dispositivo de disco disponível. - + There are no partitions to install on. Não há partições para instalar. @@ -3064,11 +3013,6 @@ O instalador será fechado e todas as alterações serão perdidas. PlasmaLnfPage - - - Form - Formulário - Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. @@ -3836,11 +3780,6 @@ Saída: TrackingPage - - - Form - Formulário - Placeholder @@ -4002,11 +3941,6 @@ Saída: WelcomePage - - - Form - Formulário - diff --git a/lang/calamares_pt_PT.ts b/lang/calamares_pt_PT.ts index 13f51adef..e1e2ce732 100644 --- a/lang/calamares_pt_PT.ts +++ b/lang/calamares_pt_PT.ts @@ -84,11 +84,6 @@ Calamares::DebugWindow - - - Form - Formulário - GlobalStorage @@ -554,11 +549,6 @@ O instalador será encerrado e todas as alterações serão perdidas. ChoicePage - - - Form - Formulário - Select storage de&vice: @@ -924,12 +914,12 @@ O instalador será encerrado e todas as alterações serão perdidas.Apenas letras, números, underscore e hífen são permitidos. - + Your passwords do not match! As suas palavras-passe não coincidem! - + OK! OK! @@ -1466,11 +1456,6 @@ O instalador será encerrado e todas as alterações serão perdidas. EncryptWidget - - - Form - Forma - En&crypt system @@ -1576,11 +1561,6 @@ O instalador será encerrado e todas as alterações serão perdidas. FinishedPage - - - Form - Formulário - &Restart now @@ -1931,11 +1911,6 @@ O instalador será encerrado e todas as alterações serão perdidas. LicensePage - - - Form - Formulário - <h1>License Agreement</h1> @@ -2091,33 +2066,27 @@ O instalador será encerrado e todas as alterações serão perdidas.A configurar o ficheiro chave do LUKS. - - + + No partitions are defined. Nenhuma partição é definida. - - - + + Encrypted rootfs setup error Erro de configuração do rootfs criptografado - + Root partition %1 is LUKS but no passphrase has been set. A partição root %1 é LUKS, mas nenhuma palavra-passe foi definida. - + Could not create LUKS key file for root partition %1. Não foi possível criar o ficheiro de chave LUKS para a partição root %1. - - - Could not configure LUKS key file on partition %1. - Não foi possível configurar a chave LUKS na partição %1. - MachineIdJob @@ -2612,18 +2581,13 @@ O instalador será encerrado e todas as alterações serão perdidas.Erro desconhecido - + Password is empty Palavra-passe está vazia PackageChooserPage - - - Form - Forma - Product Name @@ -2665,11 +2629,6 @@ O instalador será encerrado e todas as alterações serão perdidas. Page_Keyboard - - - Form - Formulário - Keyboard Model: @@ -2683,11 +2642,6 @@ O instalador será encerrado e todas as alterações serão perdidas. Page_UserSetup - - - Form - Formulário - What is your name? @@ -2864,11 +2818,6 @@ O instalador será encerrado e todas as alterações serão perdidas. PartitionPage - - - Form - Formulário - Storage de&vice: @@ -2978,72 +2927,72 @@ O instalador será encerrado e todas as alterações serão perdidas.Depois: - + No EFI system partition configured Nenhuma partição de sistema EFI configurada - + EFI system partition configured incorrectly Partição de sistema EFI configurada incorretamente - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem. Uma partição de sistema EFI é necessária para iniciar o %1. <br/><br/>Para configurar uma partição de sistema EFI, volte atrás e selecione ou crie um sistema de ficheiros adequado. - + The filesystem must be mounted on <strong>%1</strong>. O sistema de ficheiros deve ser montado em <strong>%1</strong>. - + The filesystem must have type FAT32. O sistema de ficheiros deve ter o tipo FAT32. - + The filesystem must be at least %1 MiB in size. O sistema de ficheiros deve ter pelo menos %1 MiB de tamanho. - + The filesystem must have flag <strong>%1</strong> set. O sistema de ficheiros deve ter a "flag" %1 definida. - + You can continue without setting up an EFI system partition but your system may fail to start. Pode continuar sem configurar uma partição do sistema EFI, mas o seu sistema pode não arrancar. - + Option to use GPT on BIOS Opção para utilizar GPT no BIOS - + A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>%2</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. Uma tabela de partições GPT é a melhor opção para todos os sistemas. Este instalador suporta tal configuração para sistemas BIOS também.<br/><br/>Para configurar uma tabela de partições GPT no BIOS, (caso não tenha sido feito ainda) volte atrás e defina a tabela de partições como GPT, depois crie uma partição sem formatação de 8 MB com o sinalizador <strong>%2</strong> ativado.<br/><br/>Uma partição não formatada de 8 MB é necessária para iniciar %1 num sistema BIOS com o GPT. - + Boot partition not encrypted Partição de arranque não encriptada - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. Foi preparada uma partição de arranque separada juntamente com uma partição root encriptada, mas a partição de arranque não está encriptada.<br/><br/>Existem preocupações de segurança com este tipo de configuração, por causa de importantes ficheiros de sistema serem guardados numa partição não encriptada.<br/>Se desejar pode continuar, mas o destrancar do sistema de ficheiros irá ocorrer mais tarde durante o arranque do sistema.<br/>Para encriptar a partição de arranque, volte atrás e recrie-a, e selecione <strong>Encriptar</strong> na janela de criação de partições. - + has at least one disk device available. tem pelo menos um dispositivo de disco disponível. - + There are no partitions to install on. Não há partições para instalar. @@ -3064,11 +3013,6 @@ O instalador será encerrado e todas as alterações serão perdidas. PlasmaLnfPage - - - Form - Forma - Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. @@ -3836,11 +3780,6 @@ Saída de Dados: TrackingPage - - - Form - Forma - Placeholder @@ -4002,11 +3941,6 @@ Saída de Dados: WelcomePage - - - Form - Formulário - diff --git a/lang/calamares_ro.ts b/lang/calamares_ro.ts index f04f3441f..151a4df61 100644 --- a/lang/calamares_ro.ts +++ b/lang/calamares_ro.ts @@ -6,7 +6,7 @@ <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> - + <h1>%1</h1><br/><strong>%2<br/>pentru %3</strong><br/><br/> @@ -17,7 +17,7 @@ Copyright %1-%2 %3 &lt;%4&gt;<br/> Copyright year-year Name <email-address> - + Drepturi de Autor %1-%2 %3 &lt;%4&gt;<br/> @@ -25,7 +25,7 @@ Manage auto-mount settings - + Administrați setările de auto montare. @@ -84,11 +84,6 @@ Calamares::DebugWindow - - - Form - Formular - GlobalStorage @@ -167,7 +162,7 @@ %p% Progress percentage indicator: %p is where the number 0..100 is placed - + %p% @@ -283,7 +278,7 @@ Requirements checking for module '%1' is complete. - + Verificarea de cerințe pentru modulul '%1' este completă @@ -306,7 +301,7 @@ System-requirements checking is complete. - + Verificare cerințelor de sistem este finalizată. @@ -349,7 +344,7 @@ The upload was unsuccessful. No web-paste was done. - + Încărcarea a eșuat. Niciun web-paste a fost facut. @@ -358,7 +353,11 @@ %1 Link copied to clipboard - + Log de instalare postat catre + +%1 + +Link-ul a fost copiat in clipboard @@ -368,12 +367,12 @@ Link copied to clipboard %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. - + %1 nu a putut fi instalat. Calamares nu a reușit sa incărce toate modulele configurate. Aceasta este o problema de modul cum este utilizat Calamares de către distribuție. <br/>The following modules could not be loaded: - + <br/>Următoarele module nu au putut fi incărcate: @@ -388,7 +387,7 @@ Link copied to clipboard The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> - + %1 Programul de instalare va urma sa faca schimbari la discul dumneavoastră pentru a se configura %2 <br/> Aceste schimbari sunt ireversibile.<strong> @@ -398,7 +397,7 @@ Link copied to clipboard &Set up now - + &Configura-ți acum @@ -413,7 +412,7 @@ Link copied to clipboard &Set up - + %Configura-ți @@ -423,12 +422,12 @@ Link copied to clipboard Setup is complete. Close the setup program. - + Configurarea este finalizată. Inchideți programul. The installation is complete. Close the installer. - Instalarea este completă. Închide instalatorul. + Instalarea este completă. Închideți Programul de Instalare. @@ -474,7 +473,8 @@ Link copied to clipboard Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. - + Doriți sa anulați procesul de instalare? +Programul de instalare se va inchide si toate schimbările se vor pierde. @@ -512,7 +512,7 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute. %1 Setup Program - + %1 Programul de Instalare @@ -525,12 +525,12 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute. Set filesystem label on %1. - + Setează eticheta fișierului de sistem pe %1. Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>. - + Setează eticheta fișierului de sistem <strong>%1.</strong> catre partiția <strong>%2</strong>. @@ -549,11 +549,6 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute. ChoicePage - - - Form - Formular - Select storage de&vice: @@ -590,7 +585,7 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute. %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. - + %1 va fi micșorat la %2MiB si noua partiție de %3Mib va fi creată pentru %4 @@ -664,42 +659,42 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute. This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> - + Acest device de stocare are deja un sistem de operare pe acesta, dar masa de partiție <strong>%1</strong> este diferită față de necesarul <strong>%2</strong>.<br/> This storage device has one of its partitions <strong>mounted</strong>. - + Acest device de stocare are are deja unul dintre partiții <strong>montate</strong>. This storage device is a part of an <strong>inactive RAID</strong> device. - + Acest device de stocare este partea unui device de tip <strong>RAID inactiv</strong>. No Swap - + Fara Swap Reuse Swap - + Reutilizează Swap Swap (no Hibernate) - + Swap (Fară Hibernare) Swap (with Hibernate) - + Swap (Cu Hibernare) Swap to file - + Swap către fișier. @@ -707,17 +702,17 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute. Successfully unmounted %1. - + %1 a fost demontat cu succes. Successfully disabled swap %1. - + Swap %1 a fost dezactivat cu succes. Successfully cleared swap %1. - + Swap %1 a fost curațat cu succes. @@ -896,7 +891,7 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute. Only lowercase letters, numbers, underscore and hyphen are allowed. - + Doar litere mici, numere, lini si cratime sunt permise. @@ -919,12 +914,12 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute. - + Your passwords do not match! Parolele nu se potrivesc! - + OK! @@ -1461,11 +1456,6 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute. EncryptWidget - - - Form - Formular - En&crypt system @@ -1571,11 +1561,6 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute. FinishedPage - - - Form - Formular - &Restart now @@ -1926,11 +1911,6 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute. LicensePage - - - Form - Formular - <h1>License Agreement</h1> @@ -2086,33 +2066,27 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute. - - + + No partitions are defined. - - - + + Encrypted rootfs setup error - + Root partition %1 is LUKS but no passphrase has been set. - + Could not create LUKS key file for root partition %1. - - - Could not configure LUKS key file on partition %1. - - MachineIdJob @@ -2608,18 +2582,13 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.Eroare necunoscuta - + Password is empty PackageChooserPage - - - Form - Formular - Product Name @@ -2661,11 +2630,6 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute. Page_Keyboard - - - Form - Formular - Keyboard Model: @@ -2679,11 +2643,6 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute. Page_UserSetup - - - Form - Formular - What is your name? @@ -2692,7 +2651,7 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute. Your Full Name - + Numele Complet @@ -2717,7 +2676,7 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute. Computer Name - + Numele Calculatorului @@ -2734,18 +2693,18 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute. Password - + Parola Repeat Password - + Repetați Parola When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Când această casetă este bifată, se face verificarea severității parolei și nu veți putea folosi o parolă slabă. @@ -2860,11 +2819,6 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute. PartitionPage - - - Form - Formular - Storage de&vice: @@ -2974,72 +2928,72 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.După: - + No EFI system partition configured Nicio partiție de sistem EFI nu a fost configurată - + EFI system partition configured incorrectly - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem. - + The filesystem must be mounted on <strong>%1</strong>. - + The filesystem must have type FAT32. - + The filesystem must be at least %1 MiB in size. - + The filesystem must have flag <strong>%1</strong> set. - + You can continue without setting up an EFI system partition but your system may fail to start. - + Option to use GPT on BIOS - + A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>%2</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. - + Boot partition not encrypted Partiția de boot nu este criptată - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. A fost creată o partiție de boot împreună cu o partiție root criptată, dar partiția de boot nu este criptată.<br/><br/>Sunt potențiale probleme de securitate cu un astfel de aranjament deoarece importante fișiere de sistem sunt păstrate pe o partiție necriptată.<br/>Puteți continua dacă doriți, dar descuierea sistemului se va petrece mai târziu în timpul pornirii.<br/>Pentru a cripta partiția de boot, reveniți și recreați-o, alegând opțiunea <strong>Criptează</strong> din fereastra de creare de partiții. - + has at least one disk device available. - + There are no partitions to install on. @@ -3060,11 +3014,6 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute. PlasmaLnfPage - - - Form - Formular - Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. @@ -3829,11 +3778,6 @@ Output TrackingPage - - - Form - Formular - Placeholder @@ -3995,11 +3939,6 @@ Output WelcomePage - - - Form - Formular - @@ -4256,7 +4195,9 @@ Output <h3>%1</h3> <p>These are example release notes.</p> - + <h3>%1</h3> + <p>Acestea sunt exemple de notițe de lansare.</p> + @@ -4265,37 +4206,37 @@ Output LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/> Default option. - + LibreOffice este un program puternic si gratis de suita de office, utilizat de milioane de oameni de pe glob, Include o gramada de aplicații care il fac cel mai versatile gratis si sursă deschisa suită de office de pe piață. LibreOffice - + LibreOffice If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives. - + Daca nu doriți sa instalați o suita de office, doar selectați Fară Suită de Office. Mereu puteți adăuga unul (sau mai multe) mai târziu pe sistemul instalat cand necesitatea va apărea. No Office Suite - +  Fară Suită de Office Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support. It will be just a desktop, file browser, package manager, text editor and simple web-browser. - + Creați o instalare minimală Desktop, stergeți toate aplicațiile extra si decideți mai târziu ce doriți sa adăugați catre sistemul dumneavoastră. Exemple de ce nu o sa fie pe astfel de instalare, nu vor fi programe Office, media player, image viewer sau support pentru imprimantă. Va fi doar Desktop, program de vizualizat fisiere, package manager, editor de texte si un web browser simplu. Minimal Install - + Instalare minimală Please select an option for your install, or use the default: LibreOffice included. - + Va rugam alegeți o optiune pentru instalarea dumneavoastra sau folosiți optiunea implicită: LibreOffice inclus. @@ -4328,7 +4269,7 @@ Output Back - + Inapoi @@ -4336,7 +4277,7 @@ Output Pick your user name and credentials to login and perform admin tasks - + Alegeți usernameul si datele de logare pentru a efectua task-uri administrative. @@ -4346,7 +4287,7 @@ Output Your Full Name - + Numele Complet @@ -4356,22 +4297,22 @@ Output Login Name - + Numele de Logare. If more than one person will use this computer, you can create multiple accounts after installation. - + Daca mai multe persoane vor folosi acest calculator, puteți crea mai multe conturi dupa instalare. Only lowercase letters, numbers, underscore and hyphen are allowed. - + Doar litere mici, numere, lini si cratime sunt permise. root is not allowed as username. - + root nu este permis sa fie folosit ca si username. @@ -4381,17 +4322,17 @@ Output Computer Name - + Numele Calculatorului This name will be used if you make the computer visible to others on a network. - + Acest nume va fi folosit daca vă faceți calculatorul vizibil la alți pe o rețea. localhost is not allowed as hostname. - + localhost nu este permis ca si hostname. @@ -4401,37 +4342,37 @@ Output Password - + Parola Repeat Password - + Repetați Parola 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. - + Introduceți aceeași parolă de doua ori, pentru a putea verifica de greșeli de scriere. O parola buna contine o combinatie de litere, numere si punctuatie, trebuie ca aceasta sa fie lunga de minim 8 caractere, si ar trebui sa fie schimbată la intervale regulate. Validate passwords quality - + Validați calitatea parolelor When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Când această casetă este bifată, se face verificarea severității parolei și nu veți putea folosi o parolă slabă. Log in automatically without asking for the password - + Conectați-vă automat fără a cere parola. Only letters, numbers, underscore and hyphen are allowed, minimal of two characters. - + Doar litere, numere, lini si cratime sunt permise, minim doua caractere. @@ -4446,7 +4387,7 @@ Output Choose a root password to keep your account safe. - + Alege-ți o parolă root pentru a va păstra contul in siguranta. @@ -4456,12 +4397,12 @@ Output Repeat Root Password - + Repetați Parola Root Enter the same password twice, so that it can be checked for typing errors. - + Introduceți aceeasi parola de două ori, pentru a fi verificata de greșeli de scriere. @@ -4470,27 +4411,29 @@ Output <h3>Welcome to the %1 <quote>%2</quote> installer</h3> <p>This program will ask you some questions and set up %1 on your computer.</p> - + <h3>Bun venit la programul %1 <quote>%2</quote> de instalare +<p>Acest program o să vă intrebe niște intrebari si o sa configureze %1 pe calculatorul dumneavoastră.</p> + Support - + Suport Known issues - + Probleme știute Release notes - + Note de lansare Donate - + Donează diff --git a/lang/calamares_ru.ts b/lang/calamares_ru.ts index 3ef5a9caa..5be19989f 100644 --- a/lang/calamares_ru.ts +++ b/lang/calamares_ru.ts @@ -6,12 +6,12 @@ <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> - + <h1>%1</h1><br/><strong>%2<br/> для %3</strong><br/><br/> Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://app.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - + Спасибо <a href="https://calamares.io/team/">команде Calamares</a> и <a href="https://app.transifex.com/calamares/calamares/">команде переводчиков Calamares</a>.<br/><br/>Разработка <a href="https://calamares.io/">Calamares</a> спонсируется <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. @@ -84,11 +84,6 @@ Calamares::DebugWindow - - - Form - Форма - GlobalStorage @@ -123,7 +118,7 @@ Crashes Calamares, so that Dr. Konqui can look at it. - + Сбои Calamares, чтобы Dr. Konqui мог посмотреть на них. @@ -283,16 +278,16 @@ Requirements checking for module '%1' is complete. - + Проверка требований для модуля «%1» завершена. Waiting for %n module(s). - - - - - + + Ожидание %n модуля. + Ожидание %n модулей. + Ожидание %n модулей. + Ожидание %n модуля. @@ -555,11 +550,6 @@ The installer will quit and all changes will be lost. ChoicePage - - - Form - Форма - Select storage de&vice: @@ -779,7 +769,7 @@ The installer will quit and all changes will be lost. The commands use variables that are not defined. Missing variables are: %1. - + В командах используются переменные, которые не определены. Отсутствующие переменные: %1. @@ -842,12 +832,12 @@ The installer will quit and all changes will be lost. This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. - + Этот компьютер не соответствует минимальным требованиям для настройки %1.<br/>Настройка не может быть продолжена. This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. - + Этот компьютер не соответствует минимальным требованиям для установки %1.<br/>Установка не может быть продолжена. @@ -925,12 +915,12 @@ The installer will quit and all changes will be lost. Допускаются только буквы, цифры, символы подчёркивания и дефисы. - + Your passwords do not match! Пароли не совпадают! - + OK! Успешно! @@ -1467,11 +1457,6 @@ The installer will quit and all changes will be lost. EncryptWidget - - - Form - Форма - En&crypt system @@ -1501,7 +1486,7 @@ The installer will quit and all changes will be lost. Password must be a minimum of %1 characters - + Пароль должен содержать минимум %1 символов @@ -1537,12 +1522,12 @@ The installer will quit and all changes will be lost. Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. - + Настроить <strong>новый</strong> раздел %2 с точкой монтирования <strong>%1</strong> и функциями <em>%3</em>. Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3. - Настроить <strong>новый</strong> %2 раздел с точкой монтирования <strong>%1</strong> %3. + Настроить <strong>новый</strong> раздел %2 с точкой монтирования <strong>%1</strong> %3. @@ -1552,7 +1537,7 @@ The installer will quit and all changes will be lost. Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>. - + Настроить %3 раздел <strong>%1</strong> с точкой монтирования <strong>%2</strong> и функциями <em>%4</em>. @@ -1577,11 +1562,6 @@ The installer will quit and all changes will be lost. FinishedPage - - - Form - Геометрия - &Restart now @@ -1668,12 +1648,12 @@ The installer will quit and all changes will be lost. Please ensure the system has at least %1 GiB available drive space. - + Убедитесь, что в системе имеется не менее %1 ГиБ свободного места на диске. Available drive space is all of the hard disks and SSDs connected to the system. - + Доступное дисковое пространство — это все жесткие диски и SSD, подключенные к системе. @@ -1932,11 +1912,6 @@ The installer will quit and all changes will be lost. LicensePage - - - Form - Форма - <h1>License Agreement</h1> @@ -2092,33 +2067,27 @@ The installer will quit and all changes will be lost. Конфигурация файла ключа LUKS. - - + + No partitions are defined. Разделы не были заданы. - - - + + Encrypted rootfs setup error Ошибка шифрования корневой файловой системы - + Root partition %1 is LUKS but no passphrase has been set. Корневой раздел %1 это LUKS, но ключ шифрования не был задан. - + Could not create LUKS key file for root partition %1. Не удалось создать файл ключа LUKS для корневого раздела %1. - - - Could not configure LUKS key file on partition %1. - Не удалось настроить файл ключа LUKS на разделе %1. - MachineIdJob @@ -2329,7 +2298,7 @@ The installer will quit and all changes will be lost. You can fine-tune Language and Locale settings below. - + Вы можете точно настроить параметры языка и региона ниже. @@ -2620,18 +2589,13 @@ The installer will quit and all changes will be lost. Неизвестная ошибка - + Password is empty Пустой пароль PackageChooserPage - - - Form - Форма - Product Name @@ -2673,11 +2637,6 @@ The installer will quit and all changes will be lost. Page_Keyboard - - - Form - Геометрия - Keyboard Model: @@ -2691,11 +2650,6 @@ The installer will quit and all changes will be lost. Page_UserSetup - - - Form - Геометрия - What is your name? @@ -2872,11 +2826,6 @@ The installer will quit and all changes will be lost. PartitionPage - - - Form - Геометрия - Storage de&vice: @@ -2986,72 +2935,72 @@ The installer will quit and all changes will be lost. После: - + No EFI system partition configured Нет настроенного системного раздела EFI - + EFI system partition configured incorrectly Системный раздел EFI настроен неправильно - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem. - + Для запуска %1 необходим системный раздел EFI.<br/><br/> Чтобы настроить системный раздел EFI, вернитесь назад и выберите или создайте подходящую файловую систему. - + The filesystem must be mounted on <strong>%1</strong>. Файловая система должна быть смонтирована на <strong>%1</strong>. - + The filesystem must have type FAT32. Файловая система должна иметь тип FAT32. - + The filesystem must be at least %1 MiB in size. Файловая система должна быть размером не менее %1 МиБ. - + The filesystem must have flag <strong>%1</strong> set. - + В файловой системе должен быть установлен флаг <strong>%1</strong>. - + You can continue without setting up an EFI system partition but your system may fail to start. - + Вы можете продолжить без настройки системного раздела EFI, но ваша система может не запуститься. - + Option to use GPT on BIOS Возможность для использования GPT в BIOS - + A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>%2</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. - + Boot partition not encrypted Загрузочный раздел не зашифрован - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. Включено шифрование корневого раздела, но использован отдельный загрузочный раздел без шифрования.<br/><br/>При такой конфигурации возникают проблемы с безопасностью, потому что важные системные файлы хранятся на разделе без шифрования.<br/>Если хотите, можете продолжить, но файловая система будет разблокирована позднее во время загрузки системы.<br/>Чтобы включить шифрование загрузочного раздела, вернитесь назад и снова создайте его, отметив <strong>Шифровать</strong> в окне создания раздела. - + has at least one disk device available. имеет как малость один доступный накопитель. - + There are no partitions to install on. Нет разделов для установки. @@ -3072,11 +3021,6 @@ The installer will quit and all changes will be lost. PlasmaLnfPage - - - Form - Форма - Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. @@ -3397,7 +3341,7 @@ Output: Resizing %2MiB partition %1 to %3MiB. - Изменение размера раздела %1 с %2MB на %3MB. + Изменение размера раздела %1 с %2 МиБ на %3 МиБ. @@ -3437,7 +3381,7 @@ Output: Checking requirements again in a few seconds ... - + Повторная проверка требований через несколько секунд... @@ -3693,7 +3637,7 @@ Output: These groups are missing in the target system: %1 - + Эти группы отсутствуют в целевой системе: %1 @@ -3792,23 +3736,23 @@ Output: Configuring KDE user feedback. - Настраивание обратной связи KDE + Настройка обратной связи KDE. Error in KDE user feedback configuration. - Ошибка в настройке обратной связи KDE + Ошибка в настройке обратной связи KDE. Could not configure KDE user feedback correctly, script error %1. - + Не удалось правильно настроить связь с пользователем KDE, ошибка сценария %1. Could not configure KDE user feedback correctly, Calamares error %1. - + Не удалось правильно настроить связь с пользователем KDE, ошибка Calamares %1. @@ -3821,7 +3765,7 @@ Output: Configuring machine feedback. - Настраивание обратной связи компьютера. + Настройка обратной связи компьютера. @@ -3842,11 +3786,6 @@ Output: TrackingPage - - - Form - Форма - Placeholder @@ -4008,11 +3947,6 @@ Output: WelcomePage - - - Form - Форма - diff --git a/lang/calamares_si.ts b/lang/calamares_si.ts index 968e4f8d0..19756cd2d 100644 --- a/lang/calamares_si.ts +++ b/lang/calamares_si.ts @@ -84,11 +84,6 @@ Calamares::DebugWindow - - - Form - සිට - GlobalStorage @@ -552,11 +547,6 @@ The installer will quit and all changes will be lost. ChoicePage - - - Form - පෝරමය - Select storage de&vice: @@ -922,12 +912,12 @@ The installer will quit and all changes will be lost. අකුරු, ඉලක්කම්, යටි ඉරි සහ තනි ඉර පමණක් ඉඩ දෙනු ලැබේ. - + Your passwords do not match! ඔබගේ මුරපද නොගැලපේ! - + OK! හරි! @@ -1464,11 +1454,6 @@ The installer will quit and all changes will be lost. EncryptWidget - - - Form - පෝරමය - En&crypt system @@ -1574,11 +1559,6 @@ The installer will quit and all changes will be lost. FinishedPage - - - Form - පෝරමය - &Restart now @@ -1929,11 +1909,6 @@ The installer will quit and all changes will be lost. LicensePage - - - Form - පෝරමය - <h1>License Agreement</h1> @@ -2089,33 +2064,27 @@ The installer will quit and all changes will be lost. LUKS යතුරු ගොනුව වින්‍යාස කරමින්. - - + + No partitions are defined. කොටස් නිර්වචනය කර නොමැත. - - - + + Encrypted rootfs setup error සංකේතනය කරන ලද rootfs පිහිටුවීමේ දෝෂයකි - + Root partition %1 is LUKS but no passphrase has been set. මූල කොටස %1 LUKS වන නමුත් මුර-වැකිකඩක් සකසා නොමැත. - + Could not create LUKS key file for root partition %1. මූල කොටස %1 සඳහා LUKS යතුරු ගොනුව සෑදිය නොහැක. - - - Could not configure LUKS key file on partition %1. - %1 කොටසේ LUKS යතුරු ගොනුව වින්‍යාස කිරීමට නොහැකි විය. - MachineIdJob @@ -2601,18 +2570,13 @@ The installer will quit and all changes will be lost. නොදන්නා දෝෂයකි - + Password is empty මුරපදය හිස් ය PackageChooserPage - - - Form - පෝරමය - Product Name @@ -2654,11 +2618,6 @@ The installer will quit and all changes will be lost. Page_Keyboard - - - Form - පෝරමය - Keyboard Model: @@ -2672,11 +2631,6 @@ The installer will quit and all changes will be lost. Page_UserSetup - - - Form - පෝරමය - What is your name? @@ -2853,11 +2807,6 @@ The installer will quit and all changes will be lost. PartitionPage - - - Form - පෝරමය - Storage de&vice: @@ -2967,72 +2916,72 @@ The installer will quit and all changes will be lost. පසු: - + No EFI system partition configured EFI පද්ධති කොටසක් වින්‍යාස කර නොමැත - + EFI system partition configured incorrectly EFI පද්ධති කොටස වැරදි ලෙස වින්‍යාස කර ඇත - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem. %1 ආරම්භ කිරීමට EFI පද්ධති කොටසක් අවශ්‍ය වේ. <br/><br/>EFI පද්ධති කොටසක් වින්‍යාස කිරීමට, ආපසු ගොස් සුදුසු ගොනු පද්ධතියක් තෝරන්න හෝ සාදන්න. - + The filesystem must be mounted on <strong>%1</strong>. ගොනු පද්ධතිය %1 මත සවිකර තිබිය යුතුය. - + The filesystem must have type FAT32. ගොනු පද්ධතියට FAT32 වර්ගය තිබිය යුතුය. - + The filesystem must be at least %1 MiB in size. ගොනු පද්ධතිය අවම වශයෙන් %1 MiB විශාලත්වයකින් යුක්ත විය යුතුය. - + The filesystem must have flag <strong>%1</strong> set. ගොනු පද්ධතියට ධජය <strong>%1</strong> කට්ටලයක් තිබිය යුතුය. - + You can continue without setting up an EFI system partition but your system may fail to start. ඔබට EFI පද්ධති කොටසක් සැකසීමෙන් තොරව ඉදිරියට යා හැකි නමුත් ඔබේ පද්ධතිය ආරම්භ කිරීමට අසමත් විය හැක. - + Option to use GPT on BIOS BIOS මත GPT භාවිතා කිරීමේ විකල්පය - + A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>%2</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. - + Boot partition not encrypted ඇරඹුම් කොටස සංකේතනය කර නොමැත - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. එන්ක්‍රිප්ට් කරන ලද රූට් පාටිෂන් එකක් සමඟින් වෙනම ඇරඹුම් කොටසක් සකසා ඇත, නමුත් ඇරඹුම් කොටස සංකේතනය කර නොමැත. <br/<br/>වැදගත් පද්ධති ගොනු සංකේතනය නොකළ කොටසක තබා ඇති නිසා මෙවැනි සැකසුම සමඟ ආරක්ෂක ගැටළු ඇත. <br/>ඔබට අවශ්‍ය නම් ඔබට දිගටම කරගෙන යා හැක, නමුත් ගොනු පද්ධති අගුළු හැරීම පද්ධති ආරම්භයේදී පසුව සිදුවනු ඇත. <br/>ඇරඹුම් කොටස සංකේතනය කිරීමට, ආපසු ගොස් එය නැවත සාදන්න, කොටස් සෑදීමේ කවුළුව තුළ <strong>සංකේතනය</srong> තෝරන්න. - + has at least one disk device available. අවම වශයෙන් එක් තැටි උපාංගයක් තිබේ. - + There are no partitions to install on. ස්ථාපනය කිරීමට කොටස් නොමැත. @@ -3053,11 +3002,6 @@ The installer will quit and all changes will be lost. PlasmaLnfPage - - - Form - පෝරමය - Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. @@ -3825,11 +3769,6 @@ Output: TrackingPage - - - Form - පෝරමය - Placeholder @@ -3991,11 +3930,6 @@ Output: WelcomePage - - - Form - පෝරමය - diff --git a/lang/calamares_sk.ts b/lang/calamares_sk.ts index ee844e06a..933a6bd3a 100644 --- a/lang/calamares_sk.ts +++ b/lang/calamares_sk.ts @@ -84,11 +84,6 @@ Calamares::DebugWindow - - - Form - Forma - GlobalStorage @@ -552,11 +547,6 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. ChoicePage - - - Form - Forma - Select storage de&vice: @@ -923,12 +913,12 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. Sú povolené iba písmená, číslice, podtržníky a pomlčky. - + Your passwords do not match! Vaše heslá sa nezhodujú! - + OK! OK! @@ -1465,11 +1455,6 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. EncryptWidget - - - Form - Forma - En&crypt system @@ -1575,11 +1560,6 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. FinishedPage - - - Form - Forma - &Restart now @@ -1930,11 +1910,6 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. LicensePage - - - Form - Forma - <h1>License Agreement</h1> @@ -2090,33 +2065,27 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. Nastavuje sa kľúčový súbor LUKS. - - + + No partitions are defined. Nie sú určené žiadne oddiely. - - - + + Encrypted rootfs setup error Chyba pri inštalácii zašifrovaného koreňového súborového systému - + Root partition %1 is LUKS but no passphrase has been set. Koreňový oddiel %1 je typu LUKS, ale nebolo nastavené žiadne heslo. - + Could not create LUKS key file for root partition %1. Nepodarilo sa vytvoriť kľúčový súbor LUKS pre koreňový oddiel %1. - - - Could not configure LUKS key file on partition %1. - Nepodarilo sa nastaviť kľúčový súbor LUKS na oddieli %1. - MachineIdJob @@ -2619,18 +2588,13 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. Neznáma chyba - + Password is empty Heslo je prázdne PackageChooserPage - - - Form - Forma - Product Name @@ -2672,11 +2636,6 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. Page_Keyboard - - - Form - Forma - Keyboard Model: @@ -2690,11 +2649,6 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. Page_UserSetup - - - Form - Forma - What is your name? @@ -2871,11 +2825,6 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. PartitionPage - - - Form - Forma - Storage de&vice: @@ -2985,72 +2934,72 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. Potom: - + No EFI system partition configured Nie je nastavený žiadny oddiel systému EFI - + EFI system partition configured incorrectly Systémový oddiel EFI nie je správne nastavený - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem. Na spustenie distribúcie %1 je potrebný systémový oddiel EFI.<br/><br/>Na konfiguráciu systémového oddielu EFI, prejdite späť a vyberte alebo vytvorte vhodný systém súborov. - + The filesystem must be mounted on <strong>%1</strong>. Systém súborov musí byť pripojený do <strong>%1</strong>. - + The filesystem must have type FAT32. Systém súborov musí byť typu FAT32. - + The filesystem must be at least %1 MiB in size. Systém súborov musí mať veľkosť aspoň %1. - + The filesystem must have flag <strong>%1</strong> set. Systém súborov musí mať nastavený príznak <strong>%1 . - + You can continue without setting up an EFI system partition but your system may fail to start. Môžete pokračovať bez nastavenia systémového oddielu EFI, ale váš systém môže zlyhať pri spúšťaní. - + Option to use GPT on BIOS Voľba na použitie tabuľky GPT s BIOSom - + A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>%2</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. Tabuľka oddielov GPT je najlepšou voľbou pre všetky systémy. Inštalátor podporuje taktiež inštaláciu pre systémy s BIOSom.<br/><br/>Pre nastavenie tabuľky oddielov GPT s BIOSom, (ak ste tak už neučinili) prejdite späť a nastavte tabuľku oddielov na GPT, a potom vytvorte nenaformátovaný oddiel o veľkosti 8 MB s povoleným príznakom <strong>%2</strong>.<br/><br/>Nenaformátovaný oddiel o veľkosti 8 MB je potrebný na spustenie distribúcie %1 na systéme s BIOSom a tabuľkou GPT. - + Boot partition not encrypted Zavádzací oddiel nie je zašifrovaný - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. Spolu so zašifrovaným koreňovým oddielom bol nainštalovaný oddelený zavádzací oddiel, ktorý ale nie je zašifrovaný.<br/><br/>S týmto typom inštalácie je ohrozená bezpečnosť, pretože dôležité systémové súbory sú uchovávané na nezašifrovanom oddieli.<br/>Ak si to želáte, môžete pokračovať, ale neskôr, počas spúšťania systému sa vykoná odomknutie systému súborov.<br/>Na zašifrovanie zavádzacieho oddielu prejdite späť a vytvorte ju znovu vybraním voľby <strong>Zašifrovať</strong> v okne vytvárania oddielu. - + has at least one disk device available. má dostupné aspoň jedno diskové zariadenie. - + There are no partitions to install on. Neexistujú žiadne oddiely, na ktoré je možné vykonať inštaláciu. @@ -3071,11 +3020,6 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. PlasmaLnfPage - - - Form - Forma - Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. @@ -3843,11 +3787,6 @@ Výstup: TrackingPage - - - Form - Forma - Placeholder @@ -4009,11 +3948,6 @@ Výstup: WelcomePage - - - Form - Forma - diff --git a/lang/calamares_sl.ts b/lang/calamares_sl.ts index 7e5ff4cfc..ebd3074df 100644 --- a/lang/calamares_sl.ts +++ b/lang/calamares_sl.ts @@ -84,11 +84,6 @@ Calamares::DebugWindow - - - Form - Oblika - GlobalStorage @@ -551,11 +546,6 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. ChoicePage - - - Form - Oblika - Select storage de&vice: @@ -921,12 +911,12 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. - + Your passwords do not match! - + OK! @@ -1463,11 +1453,6 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. EncryptWidget - - - Form - Oblika - En&crypt system @@ -1573,11 +1558,6 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. FinishedPage - - - Form - Oblika - &Restart now @@ -1928,11 +1908,6 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. LicensePage - - - Form - Oblika - <h1>License Agreement</h1> @@ -2088,33 +2063,27 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. - - + + No partitions are defined. - - - + + Encrypted rootfs setup error - + Root partition %1 is LUKS but no passphrase has been set. - + Could not create LUKS key file for root partition %1. - - - Could not configure LUKS key file on partition %1. - - MachineIdJob @@ -2616,18 +2585,13 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. - + Password is empty PackageChooserPage - - - Form - Oblika - Product Name @@ -2669,11 +2633,6 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. Page_Keyboard - - - Form - Oblika - Keyboard Model: @@ -2687,11 +2646,6 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. Page_UserSetup - - - Form - Oblika - What is your name? @@ -2868,11 +2822,6 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. PartitionPage - - - Form - Oblika - Storage de&vice: @@ -2982,72 +2931,72 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. Potem: - + No EFI system partition configured - + EFI system partition configured incorrectly - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem. - + The filesystem must be mounted on <strong>%1</strong>. - + The filesystem must have type FAT32. - + The filesystem must be at least %1 MiB in size. - + The filesystem must have flag <strong>%1</strong> set. - + You can continue without setting up an EFI system partition but your system may fail to start. - + Option to use GPT on BIOS - + A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>%2</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. - + Boot partition not encrypted - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. - + has at least one disk device available. - + There are no partitions to install on. @@ -3068,11 +3017,6 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. PlasmaLnfPage - - - Form - Oblika - Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. @@ -3834,11 +3778,6 @@ Output: TrackingPage - - - Form - Oblika - Placeholder @@ -4000,11 +3939,6 @@ Output: WelcomePage - - - Form - Oblika - diff --git a/lang/calamares_sq.ts b/lang/calamares_sq.ts index 80a5ff41f..4aa99cf5e 100644 --- a/lang/calamares_sq.ts +++ b/lang/calamares_sq.ts @@ -84,11 +84,6 @@ Calamares::DebugWindow - - - Form - Formular - GlobalStorage @@ -552,11 +547,6 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej. ChoicePage - - - Form - Formular - Select storage de&vice: @@ -922,12 +912,12 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej. Lejohen vetëm shkronja, numra, nënvijë dhe vijë ndarëse. - + Your passwords do not match! Fjalëkalimet tuaj s’përputhen! - + OK! OK! @@ -1464,11 +1454,6 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej. EncryptWidget - - - Form - Formular - En&crypt system @@ -1574,11 +1559,6 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej. FinishedPage - - - Form - Formular - &Restart now @@ -1929,11 +1909,6 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej. LicensePage - - - Form - Formular - <h1>License Agreement</h1> @@ -2089,33 +2064,27 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej. Po formësohet kartelë kyçi LUKS. - - + + No partitions are defined. S’janë përcaktuar pjesë. - - - + + Encrypted rootfs setup error Gabim ujdisjeje rootfs të fshehtëzuar - + Root partition %1 is LUKS but no passphrase has been set. Pjesa rrënjë %1 është LUKS, por s’është caktuar frazëkalim. - + Could not create LUKS key file for root partition %1. S’u krijua dot kartelë kyçi LUKS për ndarjen rrënjë %1. - - - Could not configure LUKS key file on partition %1. - S’u formësua dot kartelë kyçi LUKS te pjesën %1. - MachineIdJob @@ -2602,18 +2571,13 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej. Gabim i panjohur - + Password is empty Fjalëkalimi është i zbrazët PackageChooserPage - - - Form - Formular - Product Name @@ -2655,11 +2619,6 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej. Page_Keyboard - - - Form - Formular - Keyboard Model: @@ -2673,11 +2632,6 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej. Page_UserSetup - - - Form - Formular - What is your name? @@ -2854,11 +2808,6 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej. PartitionPage - - - Form - Formular - Storage de&vice: @@ -2968,72 +2917,72 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej. Më Pas: - + No EFI system partition configured S’ka të formësuar pjesë sistemi EFI - + EFI system partition configured incorrectly Pjesë EFI sistemi e formësuar pasaktësisht - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem. Që të niset %1, është e nevojshme një pjesë EFI sistemi.<br/><br/>Që të formësoni një pjesë sistemi EFI, kthehuni nbrapsht dhe përzgjidhni ose krijoni një sistem të përshtatshëm kartelash. - + The filesystem must be mounted on <strong>%1</strong>. Sistemi i kartelave duhet të montohet te <strong>%1</strong>. - + The filesystem must have type FAT32. Sistemi i kartelave duhet të jetë i llojit FAT32. - + The filesystem must be at least %1 MiB in size. Sistemi i kartelave duhet të jetë të paktën %1 MiB i madh. - + The filesystem must have flag <strong>%1</strong> set. Sistemi i kartelave duhet të ketë të përzgjedhur parametrin <strong>%1</strong>. - + You can continue without setting up an EFI system partition but your system may fail to start. Mund të vazhdoni pa ujdisur një pjesë EFI sistemi, por nisja e sistemit tuaj mund të dështojë. - + Option to use GPT on BIOS Mundësi për përdorim GTP-je në BIOS - + A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>%2</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. Mundësia më e mirë për krejt sistemet është një tabelë GPT pjesësh. Ky instalues mbulon një ujdisje të tillë edhe për sisteme BIOS.<br/><br/>Që të formësoni një tabelë GPT pjesësh në BIOS, (nëse s’është bërë tashmë), kthehuni mbrapsht dhe vëreni tabelën e pjesëve si GPT, më pas, krijoni një pjesë 8 MB të paformatuar, me parametrin <strong>%2</strong> të aktivizuar.<br/><br/>Një pjesë e paformatuar 8 MB është e nevojshme për të nisur %1 në një sistem BIOS me GPT. - + Boot partition not encrypted Pjesë nisjesh e pafshehtëzuar - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. Tok me pjesën e fshehtëzuar <em>root</em> qe rregulluar edhe një pjesë <em>boot</em> veçmas, por pjesa <em>boot</em> s’është e fshehtëzuar.<br/><br/>Ka preokupime mbi sigurinë e këtij lloj rregullimi, ngaqë kartela të rëndësishme sistemi mbahen në një pjesë të pafshehtëzuar.<br/>Mund të vazhdoni, nëse doni, por shkyçja e sistemit të kartelave do të ndodhë më vonë, gjatë nisjes së sistemit.<br/>Që të fshehtëzoni pjesën <em>boot</em>, kthehuni mbrapsht dhe rikrijojeni, duke përzgjedhur te skena e krijimit të pjesës <strong>Fshehtëzoje</strong>. - + has at least one disk device available. ka të paktën një pajisje disku për përdorim. - + There are no partitions to install on. S’ka pjesë ku të instalohet. @@ -3054,11 +3003,6 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej. PlasmaLnfPage - - - Form - Formular - Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. @@ -3826,11 +3770,6 @@ Përfundim: TrackingPage - - - Form - Formular - Placeholder @@ -3992,11 +3931,6 @@ Përfundim: WelcomePage - - - Form - Formular - diff --git a/lang/calamares_sr.ts b/lang/calamares_sr.ts index fe279c4e1..6108b4cb8 100644 --- a/lang/calamares_sr.ts +++ b/lang/calamares_sr.ts @@ -84,11 +84,6 @@ Calamares::DebugWindow - - - Form - Форма - GlobalStorage @@ -549,11 +544,6 @@ The installer will quit and all changes will be lost. ChoicePage - - - Form - Форма - Select storage de&vice: @@ -919,12 +909,12 @@ The installer will quit and all changes will be lost. - + Your passwords do not match! Лозинке се не поклапају! - + OK! @@ -1461,11 +1451,6 @@ The installer will quit and all changes will be lost. EncryptWidget - - - Form - Форма - En&crypt system @@ -1571,11 +1556,6 @@ The installer will quit and all changes will be lost. FinishedPage - - - Form - Форма - &Restart now @@ -1926,11 +1906,6 @@ The installer will quit and all changes will be lost. LicensePage - - - Form - Форма - <h1>License Agreement</h1> @@ -2086,33 +2061,27 @@ The installer will quit and all changes will be lost. - - + + No partitions are defined. - - - + + Encrypted rootfs setup error - + Root partition %1 is LUKS but no passphrase has been set. - + Could not create LUKS key file for root partition %1. - - - Could not configure LUKS key file on partition %1. - - MachineIdJob @@ -2605,18 +2574,13 @@ The installer will quit and all changes will be lost. - + Password is empty PackageChooserPage - - - Form - Форма - Product Name @@ -2658,11 +2622,6 @@ The installer will quit and all changes will be lost. Page_Keyboard - - - Form - Форма - Keyboard Model: @@ -2676,11 +2635,6 @@ The installer will quit and all changes will be lost. Page_UserSetup - - - Form - Форма - What is your name? @@ -2857,11 +2811,6 @@ The installer will quit and all changes will be lost. PartitionPage - - - Form - Форма - Storage de&vice: @@ -2971,72 +2920,72 @@ The installer will quit and all changes will be lost. После: - + No EFI system partition configured - + EFI system partition configured incorrectly - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem. - + The filesystem must be mounted on <strong>%1</strong>. - + The filesystem must have type FAT32. - + The filesystem must be at least %1 MiB in size. - + The filesystem must have flag <strong>%1</strong> set. - + You can continue without setting up an EFI system partition but your system may fail to start. - + Option to use GPT on BIOS - + A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>%2</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. - + Boot partition not encrypted - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. - + has at least one disk device available. - + There are no partitions to install on. @@ -3057,11 +3006,6 @@ The installer will quit and all changes will be lost. PlasmaLnfPage - - - Form - Форма - Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. @@ -3823,11 +3767,6 @@ Output: TrackingPage - - - Form - Форма - Placeholder @@ -3989,11 +3928,6 @@ Output: WelcomePage - - - Form - Форма - diff --git a/lang/calamares_sr@latin.ts b/lang/calamares_sr@latin.ts index b04d888e6..62eed154b 100644 --- a/lang/calamares_sr@latin.ts +++ b/lang/calamares_sr@latin.ts @@ -84,11 +84,6 @@ Calamares::DebugWindow - - - Form - - GlobalStorage @@ -549,11 +544,6 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. ChoicePage - - - Form - - Select storage de&vice: @@ -919,12 +909,12 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. - + Your passwords do not match! Vaše lozinke se ne poklapaju - + OK! @@ -1461,11 +1451,6 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. EncryptWidget - - - Form - - En&crypt system @@ -1571,11 +1556,6 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. FinishedPage - - - Form - - &Restart now @@ -1926,11 +1906,6 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. LicensePage - - - Form - - <h1>License Agreement</h1> @@ -2086,33 +2061,27 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. - - + + No partitions are defined. - - - + + Encrypted rootfs setup error - + Root partition %1 is LUKS but no passphrase has been set. - + Could not create LUKS key file for root partition %1. - - - Could not configure LUKS key file on partition %1. - - MachineIdJob @@ -2605,18 +2574,13 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. - + Password is empty PackageChooserPage - - - Form - - Product Name @@ -2658,11 +2622,6 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. Page_Keyboard - - - Form - - Keyboard Model: @@ -2676,11 +2635,6 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. Page_UserSetup - - - Form - - What is your name? @@ -2857,11 +2811,6 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. PartitionPage - - - Form - - Storage de&vice: @@ -2971,72 +2920,72 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. Poslije: - + No EFI system partition configured - + EFI system partition configured incorrectly - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem. - + The filesystem must be mounted on <strong>%1</strong>. - + The filesystem must have type FAT32. - + The filesystem must be at least %1 MiB in size. - + The filesystem must have flag <strong>%1</strong> set. - + You can continue without setting up an EFI system partition but your system may fail to start. - + Option to use GPT on BIOS - + A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>%2</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. - + Boot partition not encrypted - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. - + has at least one disk device available. - + There are no partitions to install on. @@ -3057,11 +3006,6 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. PlasmaLnfPage - - - Form - - Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. @@ -3823,11 +3767,6 @@ Output: TrackingPage - - - Form - - Placeholder @@ -3989,11 +3928,6 @@ Output: WelcomePage - - - Form - - diff --git a/lang/calamares_sv.ts b/lang/calamares_sv.ts index 54ab895f1..420396ad3 100644 --- a/lang/calamares_sv.ts +++ b/lang/calamares_sv.ts @@ -84,11 +84,6 @@ Calamares::DebugWindow - - - Form - Form - GlobalStorage @@ -551,11 +546,6 @@ Alla ändringar kommer att gå förlorade. ChoicePage - - - Form - Formulär - Select storage de&vice: @@ -921,12 +911,12 @@ Alla ändringar kommer att gå förlorade. Endast bokstäver, nummer, understreck och bindestreck är tillåtet. - + Your passwords do not match! Lösenorden överensstämmer inte! - + OK! OK! @@ -1463,11 +1453,6 @@ Alla ändringar kommer att gå förlorade. EncryptWidget - - - Form - Form - En&crypt system @@ -1573,11 +1558,6 @@ Alla ändringar kommer att gå förlorade. FinishedPage - - - Form - Formulär - &Restart now @@ -1928,11 +1908,6 @@ Alla ändringar kommer att gå förlorade. LicensePage - - - Form - Formulär - <h1>License Agreement</h1> @@ -2088,33 +2063,27 @@ Alla ändringar kommer att gå förlorade. Konfigurerar LUKS nyckel fil. - - + + No partitions are defined. Inga partitioner är definerade. - - - + + Encrypted rootfs setup error Fel vid inställning av krypterat rootfs - + Root partition %1 is LUKS but no passphrase has been set. Root partition %1 är LUKS men ingen lösenfras har ställts in. - + Could not create LUKS key file for root partition %1. Kunde inte skapa LUKS nyckelfil för root partition %1. - - - Could not configure LUKS key file on partition %1. - Kunde inte konfigurera LUKS nyckelfil på partition %1. - MachineIdJob @@ -2601,18 +2570,13 @@ Sök på kartan genom att dra Okänt fel - + Password is empty Lösenordet är blankt PackageChooserPage - - - Form - Form - Product Name @@ -2654,11 +2618,6 @@ Sök på kartan genom att dra Page_Keyboard - - - Form - Form - Keyboard Model: @@ -2672,11 +2631,6 @@ Sök på kartan genom att dra Page_UserSetup - - - Form - Form - What is your name? @@ -2853,11 +2807,6 @@ Sök på kartan genom att dra PartitionPage - - - Form - Form - Storage de&vice: @@ -2967,72 +2916,72 @@ Sök på kartan genom att dra Efter: - + No EFI system partition configured Ingen EFI system partition konfigurerad - + EFI system partition configured incorrectly EFI-systempartitionen felaktigt konfigurerad - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem. En EFI-systempartition krävs för att starta %1 <br/><br/>För att konfigurera en EFI-systempartition, gå tillbaka och välj eller skapa ett lämpligt filsystem. - + The filesystem must be mounted on <strong>%1</strong>. Filsystemet måste vara monterat på <strong>%1</strong>. - + The filesystem must have type FAT32. Filsystemet måste vara av typ FAT32. - + The filesystem must be at least %1 MiB in size. Filsystemet måste vara minst %1 MiB i storlek. - + The filesystem must have flag <strong>%1</strong> set. Filsystemet måste ha flagga <strong>%1</strong> satt. - + You can continue without setting up an EFI system partition but your system may fail to start. Du kan fortsätta utan att ställa in en EFI-systempartition men ditt system kanske inte startar. - + Option to use GPT on BIOS Alternativ för att använda GPT på BIOS - + A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>%2</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. En GPT-partitionstabell är det bästa alternativet för alla system. Det här installationsprogrammet stöder också en sådan installation för BIOS-system. <br/><br/>för att konfigurera en GPT-partitionstabell i BIOS, (om du inte redan har gjort det) gå tillbaka och ställ in partitionstabellen till GPT, skapa sedan en 8 MB oformaterad partition med <strong>%2</strong> flaggan aktiverad.<br/><br/>En oformaterad 8 MB partition krävs för att starta %1 på ett BIOS-system med GPT. - + Boot partition not encrypted Boot partition inte krypterad - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. En separat uppstartspartition skapades tillsammans med den krypterade rootpartitionen, men uppstartspartitionen är inte krypterad.<br/><br/>Det finns säkerhetsproblem med den här inställningen, eftersom viktiga systemfiler sparas på en okrypterad partition.<br/>Du kan fortsätta om du vill, men upplåsning av filsystemet kommer hända senare under uppstart av systemet.<br/>För att kryptera uppstartspartitionen, gå tillbaka och återskapa den, och välj <strong>Kryptera</strong> i fönstret när du skapar partitionen. - + has at least one disk device available. har åtminstone en diskenhet tillgänglig. - + There are no partitions to install on. Det finns inga partitioner att installera på. @@ -3053,11 +3002,6 @@ Sök på kartan genom att dra PlasmaLnfPage - - - Form - Form - Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. @@ -3825,11 +3769,6 @@ Installationen kan inte fortsätta.</p> TrackingPage - - - Form - Form - Placeholder @@ -3991,11 +3930,6 @@ Installationen kan inte fortsätta.</p> WelcomePage - - - Form - Formulär - diff --git a/lang/calamares_ta_IN.ts b/lang/calamares_ta_IN.ts index ef8f192d6..23ebccd8d 100644 --- a/lang/calamares_ta_IN.ts +++ b/lang/calamares_ta_IN.ts @@ -84,11 +84,6 @@ Calamares::DebugWindow - - - Form - - GlobalStorage @@ -546,11 +541,6 @@ The installer will quit and all changes will be lost. ChoicePage - - - Form - - Select storage de&vice: @@ -916,12 +906,12 @@ The installer will quit and all changes will be lost. - + Your passwords do not match! - + OK! @@ -1458,11 +1448,6 @@ The installer will quit and all changes will be lost. EncryptWidget - - - Form - - En&crypt system @@ -1568,11 +1553,6 @@ The installer will quit and all changes will be lost. FinishedPage - - - Form - - &Restart now @@ -1923,11 +1903,6 @@ The installer will quit and all changes will be lost. LicensePage - - - Form - - <h1>License Agreement</h1> @@ -2083,33 +2058,27 @@ The installer will quit and all changes will be lost. - - + + No partitions are defined. - - - + + Encrypted rootfs setup error - + Root partition %1 is LUKS but no passphrase has been set. - + Could not create LUKS key file for root partition %1. - - - Could not configure LUKS key file on partition %1. - - MachineIdJob @@ -2593,18 +2562,13 @@ The installer will quit and all changes will be lost. - + Password is empty PackageChooserPage - - - Form - - Product Name @@ -2646,11 +2610,6 @@ The installer will quit and all changes will be lost. Page_Keyboard - - - Form - - Keyboard Model: @@ -2664,11 +2623,6 @@ The installer will quit and all changes will be lost. Page_UserSetup - - - Form - - What is your name? @@ -2845,11 +2799,6 @@ The installer will quit and all changes will be lost. PartitionPage - - - Form - - Storage de&vice: @@ -2959,72 +2908,72 @@ The installer will quit and all changes will be lost. - + No EFI system partition configured - + EFI system partition configured incorrectly - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem. - + The filesystem must be mounted on <strong>%1</strong>. - + The filesystem must have type FAT32. - + The filesystem must be at least %1 MiB in size. - + The filesystem must have flag <strong>%1</strong> set. - + You can continue without setting up an EFI system partition but your system may fail to start. - + Option to use GPT on BIOS - + A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>%2</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. - + Boot partition not encrypted - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. - + has at least one disk device available. - + There are no partitions to install on. @@ -3045,11 +2994,6 @@ The installer will quit and all changes will be lost. PlasmaLnfPage - - - Form - - Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. @@ -3811,11 +3755,6 @@ Output: TrackingPage - - - Form - - Placeholder @@ -3977,11 +3916,6 @@ Output: WelcomePage - - - Form - - diff --git a/lang/calamares_te.ts b/lang/calamares_te.ts index 51d8f66a5..ad058d1ab 100644 --- a/lang/calamares_te.ts +++ b/lang/calamares_te.ts @@ -85,11 +85,6 @@ automatic ఉంటుంది, మీరు మాన్యువల్ వి Calamares::DebugWindow - - - Form - - GlobalStorage @@ -548,11 +543,6 @@ The installer will quit and all changes will be lost. ChoicePage - - - Form - - Select storage de&vice: @@ -918,12 +908,12 @@ The installer will quit and all changes will be lost. - + Your passwords do not match! - + OK! @@ -1460,11 +1450,6 @@ The installer will quit and all changes will be lost. EncryptWidget - - - Form - - En&crypt system @@ -1570,11 +1555,6 @@ The installer will quit and all changes will be lost. FinishedPage - - - Form - - &Restart now @@ -1925,11 +1905,6 @@ The installer will quit and all changes will be lost. LicensePage - - - Form - - <h1>License Agreement</h1> @@ -2085,33 +2060,27 @@ The installer will quit and all changes will be lost. - - + + No partitions are defined. - - - + + Encrypted rootfs setup error - + Root partition %1 is LUKS but no passphrase has been set. - + Could not create LUKS key file for root partition %1. - - - Could not configure LUKS key file on partition %1. - - MachineIdJob @@ -2595,18 +2564,13 @@ The installer will quit and all changes will be lost. - + Password is empty PackageChooserPage - - - Form - - Product Name @@ -2648,11 +2612,6 @@ The installer will quit and all changes will be lost. Page_Keyboard - - - Form - - Keyboard Model: @@ -2666,11 +2625,6 @@ The installer will quit and all changes will be lost. Page_UserSetup - - - Form - - What is your name? @@ -2847,11 +2801,6 @@ The installer will quit and all changes will be lost. PartitionPage - - - Form - - Storage de&vice: @@ -2961,72 +2910,72 @@ The installer will quit and all changes will be lost. - + No EFI system partition configured - + EFI system partition configured incorrectly - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem. - + The filesystem must be mounted on <strong>%1</strong>. - + The filesystem must have type FAT32. - + The filesystem must be at least %1 MiB in size. - + The filesystem must have flag <strong>%1</strong> set. - + You can continue without setting up an EFI system partition but your system may fail to start. - + Option to use GPT on BIOS - + A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>%2</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. - + Boot partition not encrypted - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. - + has at least one disk device available. - + There are no partitions to install on. @@ -3047,11 +2996,6 @@ The installer will quit and all changes will be lost. PlasmaLnfPage - - - Form - - Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. @@ -3813,11 +3757,6 @@ Output: TrackingPage - - - Form - - Placeholder @@ -3979,11 +3918,6 @@ Output: WelcomePage - - - Form - - diff --git a/lang/calamares_tg.ts b/lang/calamares_tg.ts index 07319f936..3e41a5f7c 100644 --- a/lang/calamares_tg.ts +++ b/lang/calamares_tg.ts @@ -84,11 +84,6 @@ Calamares::DebugWindow - - - Form - Шакл - GlobalStorage @@ -548,11 +543,6 @@ The installer will quit and all changes will be lost. ChoicePage - - - Form - Шакл - Select storage de&vice: @@ -918,12 +908,12 @@ The installer will quit and all changes will be lost. Шумо метавонед танҳо ҳарфҳо, рақамҳо, зерхат ва нимтиреро истифода баред. - + Your passwords do not match! Ниҳонвожаҳои шумо мувофиқат намекунанд! - + OK! ХУБ! @@ -1460,11 +1450,6 @@ The installer will quit and all changes will be lost. EncryptWidget - - - Form - Шакл - En&crypt system @@ -1570,11 +1555,6 @@ The installer will quit and all changes will be lost. FinishedPage - - - Form - Шакл - &Restart now @@ -1925,11 +1905,6 @@ The installer will quit and all changes will be lost. LicensePage - - - Form - Шакл - <h1>License Agreement</h1> @@ -2085,33 +2060,27 @@ The installer will quit and all changes will be lost. Танзимкунии файли калиди LUKS. - - + + No partitions are defined. Ягон қисми диск муайян карда нашуд. - - - + + Encrypted rootfs setup error Хатои танзими рамзгузории "rootfs" - + Root partition %1 is LUKS but no passphrase has been set. Қисми диски реша (root)-и %1 дар LUKS асос меёбад, вале гузарвожа танзим нашудааст. - + Could not create LUKS key file for root partition %1. Файли калидии LUKS барои қисми диски реша (root)-и %1 эҷод карда нашуд. - - - Could not configure LUKS key file on partition %1. - Файли калидии LUKS дар қисми диски %1 танзим карда нашуд. - MachineIdJob @@ -2597,18 +2566,13 @@ The installer will quit and all changes will be lost. Хатои номаълум - + Password is empty Ниҳонвожаро ворид накардед PackageChooserPage - - - Form - Шакл - Product Name @@ -2650,11 +2614,6 @@ The installer will quit and all changes will be lost. Page_Keyboard - - - Form - Шакл - Keyboard Model: @@ -2668,11 +2627,6 @@ The installer will quit and all changes will be lost. Page_UserSetup - - - Form - Шакл - What is your name? @@ -2849,11 +2803,6 @@ The installer will quit and all changes will be lost. PartitionPage - - - Form - Шакл - Storage de&vice: @@ -2963,72 +2912,72 @@ The installer will quit and all changes will be lost. Баъд аз тағйир: - + No EFI system partition configured Ягон қисми диски низомии EFI танзим нашуд - + EFI system partition configured incorrectly - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem. - + The filesystem must be mounted on <strong>%1</strong>. - + The filesystem must have type FAT32. - + The filesystem must be at least %1 MiB in size. - + The filesystem must have flag <strong>%1</strong> set. - + You can continue without setting up an EFI system partition but your system may fail to start. - + Option to use GPT on BIOS Имкони истифодаи GPT дар BIOS - + A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>%2</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. - + Boot partition not encrypted Қисми диски роҳандозӣ рамзгузорӣ нашудааст - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. Қисми диски роҳандозии алоҳида дар як ҷой бо қисми диски реша (root)-и рамзгузоришуда танзим карда шуд, аммо қисми диски роҳандозӣ рамзгузорӣ нашудааст.<br/><br/>Барои ҳамин навъи танзимкунӣ масъалаи амниятӣ аҳамият дорад, зеро ки файлҳои низомии муҳим дар қисми диски рамзгузоринашуда нигоҳ дошта мешаванд.<br/>Агар шумо хоҳед, метавонед идома диҳед, аммо қулфкушоии низоми файлӣ дертар ҳангоми оғози кори низом иҷро карда мешавад.<br/>Барои рамзгзорӣ кардани қисми диски роҳандозӣ ба қафо гузаред ва бо интихоби тугмаи <strong>Рамзгузорӣ</strong> дар равзанаи эҷодкунии қисми диск онро аз нав эҷод намоед. - + has at least one disk device available. ақаллан як дастгоҳи диск дастрас аст. - + There are no partitions to install on. Ягон қисми диск барои насб вуҷуд надорад. @@ -3049,11 +2998,6 @@ The installer will quit and all changes will be lost. PlasmaLnfPage - - - Form - Шакл - Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. @@ -3821,11 +3765,6 @@ Output: TrackingPage - - - Form - Шакл - Placeholder @@ -3987,11 +3926,6 @@ Output: WelcomePage - - - Form - Шакл - diff --git a/lang/calamares_th.ts b/lang/calamares_th.ts index b30f3da2b..19864b6ea 100644 --- a/lang/calamares_th.ts +++ b/lang/calamares_th.ts @@ -84,11 +84,6 @@ Calamares::DebugWindow - - - Form - ฟอร์ม - GlobalStorage @@ -545,11 +540,6 @@ The installer will quit and all changes will be lost. ChoicePage - - - Form - ฟอร์ม - Select storage de&vice: @@ -915,12 +905,12 @@ The installer will quit and all changes will be lost. - + Your passwords do not match! รหัสผ่านของคุณไม่ตรงกัน! - + OK! ตกลง! @@ -1457,11 +1447,6 @@ The installer will quit and all changes will be lost. EncryptWidget - - - Form - ฟอร์ม - En&crypt system @@ -1567,11 +1552,6 @@ The installer will quit and all changes will be lost. FinishedPage - - - Form - ฟอร์ม - &Restart now @@ -1922,11 +1902,6 @@ The installer will quit and all changes will be lost. LicensePage - - - Form - แบบฟอร์ม - <h1>License Agreement</h1> @@ -2082,33 +2057,27 @@ The installer will quit and all changes will be lost. - - + + No partitions are defined. - - - + + Encrypted rootfs setup error - + Root partition %1 is LUKS but no passphrase has been set. - + Could not create LUKS key file for root partition %1. - - - Could not configure LUKS key file on partition %1. - - MachineIdJob @@ -2583,18 +2552,13 @@ The installer will quit and all changes will be lost. ข้อผิดพลาดที่ไม่รู้จัก - + Password is empty รหัสผ่านว่าง PackageChooserPage - - - Form - ฟอร์ม - Product Name @@ -2636,11 +2600,6 @@ The installer will quit and all changes will be lost. Page_Keyboard - - - Form - ฟอร์ม - Keyboard Model: @@ -2654,11 +2613,6 @@ The installer will quit and all changes will be lost. Page_UserSetup - - - Form - ฟอร์ม - What is your name? @@ -2835,11 +2789,6 @@ The installer will quit and all changes will be lost. PartitionPage - - - Form - ฟอร์ม - Storage de&vice: @@ -2949,72 +2898,72 @@ The installer will quit and all changes will be lost. หลัง: - + No EFI system partition configured - + EFI system partition configured incorrectly - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem. - + The filesystem must be mounted on <strong>%1</strong>. - + The filesystem must have type FAT32. - + The filesystem must be at least %1 MiB in size. - + The filesystem must have flag <strong>%1</strong> set. - + You can continue without setting up an EFI system partition but your system may fail to start. - + Option to use GPT on BIOS - + A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>%2</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. - + Boot partition not encrypted - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. - + has at least one disk device available. - + There are no partitions to install on. @@ -3035,11 +2984,6 @@ The installer will quit and all changes will be lost. PlasmaLnfPage - - - Form - ฟอร์ม - Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. @@ -3801,11 +3745,6 @@ Output: TrackingPage - - - Form - ฟอร์ม - Placeholder @@ -3967,11 +3906,6 @@ Output: WelcomePage - - - Form - แบบฟอร์ม - diff --git a/lang/calamares_tr_TR.ts b/lang/calamares_tr_TR.ts index 1be3a4bf1..864c5c535 100644 --- a/lang/calamares_tr_TR.ts +++ b/lang/calamares_tr_TR.ts @@ -6,12 +6,12 @@ <h1>%1</h1><br/><strong>%2<br/> for %3</strong><br/><br/> - <h1>%1</h1><br/><strong> %2 <br/> %3</strong> için <br/><br/> + <h1>%1</h1><br/><strong>%3 için<br/>%2</strong><br/><br/> Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://app.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - Teşekkürler <a href="https://calamares.io/team/">Calamares ekibi</a> ve <a href="https://app.transifex.com/calamares/calamares/">Calamares çeviri takımı</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> gelişim sponsoru <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Özgür Yazılım. + <a href="https://calamares.io/team/">Calamares</a> ve <a href="https://app.transifex.com/calamares/calamares/">Calamares çeviri takımına</a> teşekkürler.<br/><br/><a href="https://calamares.io/">Calamares</a> geliştirmesi <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Özgürleştiren Yazılım tarafından desteklenmektedir. @@ -33,17 +33,17 @@ The <strong>boot environment</strong> of this system.<br><br>Older x86 systems only support <strong>BIOS</strong>.<br>Modern systems usually use <strong>EFI</strong>, but may also show up as BIOS if started in compatibility mode. - Bu sistemdeki<br> <strong>önyükleme arayüzü</strong> sadece eski x86 sistem ve <strong>BIOS</strong> destekler. <br>Modern sistemler genellikle <strong>EFI</strong> kullanır fakat önyükleme arayüzü uyumlu modda ise BIOS seçilebilir. + Bu sistemin <strong>önyükleme ortamı</strong><br><br>Daha eski x86 sistemler yalnızca<strong>BIOS</strong> destekler.<br>Çağdaş sistemler genellikle <strong>EFI</strong> kullanır; ancak uyumluluk kipinde başlatılırlarsa BIOS olarak da görünebilirler. This system was started with an <strong>EFI</strong> boot environment.<br><br>To configure startup from an EFI environment, this installer must deploy a boot loader application, like <strong>GRUB</strong> or <strong>systemd-boot</strong> on an <strong>EFI System Partition</strong>. This is automatic, unless you choose manual partitioning, in which case you must choose it or create it on your own. - Bu sistem, bir <strong>EFI</strong> önyükleme arayüzü ile başladı.<br><br>EFI ortamından başlangıcı yapılandırmak için, bu yükleyici <strong>EFI Sistem Bölümü</strong> üzerinde <strong>GRUB</strong> veya <strong>systemd-boot</strong> gibi bir önyükleyici oluşturmalıdır. Bunu otomatik olarak yapabileceğiniz gibi elle disk bölümleri oluşturarak ta yapabilirsiniz. + Bu sistem, bir <strong>EFI</strong> önyükleme ortamı ile başlatıldı.<br><br>Bir EFI ortamından başlatmayı yapılandırmak için bu kurulum programı, bir <strong>EFI Sistem Bölüntüsü</strong>'nde <strong>GRUB</strong> veya <strong>systemd-boot</strong> gibi bir önyükleyici yerleştirmelidir. Bu işlem, elle bölüntülendirmeyi seçmediğiniz sürece kendiliğinden yapılır. Elle bölüntülendirmeyi seçerseniz onu kendiniz oluşturmanız gerekecektir. This system was started with a <strong>BIOS</strong> boot environment.<br><br>To configure startup from a BIOS environment, this installer must install a boot loader, like <strong>GRUB</strong>, either at the beginning of a partition or on the <strong>Master Boot Record</strong> near the beginning of the partition table (preferred). This is automatic, unless you choose manual partitioning, in which case you must set it up on your own. - Bu sistem, bir <strong>BIOS</strong> önyükleme arayüzü ile başladı.<br><br>BIOS ortamında önyükleme için, yükleyici bölümün başında veya bölüm tablosu başlangıcına yakın <strong>Master Boot Record</strong> üzerine <strong>GRUB</strong> gibi bir önyükleyici yüklemeniz gerekir (önerilir). Eğer bu işlemin otomatik olarak yapılmasını istemez iseniz elle bölümleme yapabilirsiniz. + Bu sistem, bir <strong>BIOS</strong> önyükleme ortamı ile başlatıldı.<br><br>Bir BIOS ortamından başlatmayı yapılandırmak için bu kurulum programı, bir bölüntünün başına veya bölüntüleme tablosunun başlangıcındaki <strong>Ana Önyükleme Kaydı</strong>'na (yeğlenen) <strong>GRUB</strong> gibi bir önyükleyici kurmalıdır. Bu işlem, elle bölüntülendirmeyi seçmediğiniz sürece kendiliğinden yapılır. Elle bölüntülendirmeyi seçerseniz onu kendiniz oluşturmanız gerekecektir. @@ -51,22 +51,22 @@ Master Boot Record of %1 - %1 Üzerine Önyükleyici Kur + %1 Ana Önyükleme Kaydı Boot Partition - Önyükleyici Disk Bölümü + Önyükleme Bölüntüsü System Partition - Sistem Disk Bölümü + Sistem Bölüntüsü Do not install a boot loader - Bir önyükleyici kurmayın + Bir önyükleyici kurma @@ -84,36 +84,31 @@ Calamares::DebugWindow - - - Form - Biçim - GlobalStorage - KüreselDepo + Global Depolama JobQueue - İşKuyruğu + İş Kuyruğu Modules - Eklentiler + Modüller Type: - Tipi: + Tür: none - hiçbiri + yok @@ -128,7 +123,7 @@ Reloads the stylesheet from the branding directory. - Stil sayfasını marka dizininden yeniden yükler. + Biçem sayfasını marka dizininden yeniden yükler. @@ -143,17 +138,17 @@ Reload Stylesheet - Stil Sayfasını Yeniden Yükle + Biçem Sayfasını Yeniden Yükle Displays the tree of widget names in the log (for stylesheet debugging). - Günlükte pencere öğesi adlarının ağacını görüntüler (stil sayfası hata ayıklaması için). + Günlükteki araç takımı adlarının ağacını görüntüler (biçem sayfası hata ayıklaması için). Widget Tree - Gereç Ağacı + Araç Takımı Ağacı @@ -172,12 +167,12 @@ Set up - Kur + Ayarla Install - Sistem Kuruluyor + Kur @@ -198,7 +193,7 @@ Done - Sistem kurulumu tamamlandı, kurulum aracından çıkabilirsiniz. + Tamamlandı @@ -214,17 +209,17 @@ Run command '%1' in target system. - Hedef sistemde '%1' komutunu çalıştırın. + Hedef sistemde '%1' komutunu çalıştır. Run command '%1'. - '%1' komutunu çalıştırın. + '%1' komutunu çalıştır. Running command %1 %2 - %1 Komutu çalışıyor %2 + %1 komutu çalışıyor %2 @@ -232,32 +227,32 @@ Running %1 operation. - %1 işlemleri yapılıyor. + %1 işlemi yapılıyor. Bad working directory path - Dizin yolu kötü çalışıyor + Hatalı çalışma dizini yolu Working directory %1 for python job %2 is not readable. - %2 python işleri için %1 dizinleme çalışırken okunamadı. + %2 Python işi için %1 çalışma dizini okunabilir değil. Bad main script file - Sorunlu betik dosyası + Hatalı ana betik dosyası Main script file %1 for python job %2 is not readable. - %2 python işleri için %1 sorunlu betik okunamadı. + %2 Python işi için %1 ana betik dosyası okunabilir değil. Boost.Python error in job "%1". - Boost.Python iş hatası "%1". + "%1" işinde Boost.Python hatası. @@ -265,7 +260,7 @@ Loading ... - Yükleniyor ... + Yükleniyor... @@ -275,7 +270,7 @@ Loading failed. - Yükleme başarısız. + Yüklenemedi. @@ -283,14 +278,14 @@ Requirements checking for module '%1' is complete. - '%1' Modülü için gereklilik denetimi tamamlandı. + '%1' modülü için gereklilikler denetimi tamamlandı. Waiting for %n module(s). %n modülü bekleniyor. - %n modülleri bekleniyor. + %n modül bekleniyor. @@ -312,7 +307,7 @@ Setup Failed - Kurulum Başarısız + Kurulum Başarısız Oldu @@ -342,12 +337,12 @@ Install Log Paste URL - Günlük Yapıştırma URL'sini Yükle + Günlük Yapıştırma URL'sini Kur The upload was unsuccessful. No web-paste was done. - Yükleme başarısız oldu. Web yapıştırması yapılmadı. + Karşıya yükleme başarısız oldu. Web yapıştırması yapılmadı. @@ -356,21 +351,21 @@ %1 Link copied to clipboard - Şurada yayınlanan günlüğü yükle + Kurulum günlüğü şuraya gönderildi: %1 -link panoya kopyalandı +Bağlantı panoya kopyalandı Calamares Initialization Failed - Calamares Başlatılamadı + Calamares İlklendirilemedi %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. - %1 yüklenemedi. Calamares yapılandırılmış modüllerin bazılarını yükleyemedi. Bu, Calamares'in kullandığınız dağıtıma uyarlamasından kaynaklanan bir sorundur. + %1 kurulamıyor. Calamares yapılandırılmış modüllerin tümünü yükleyemedi. Bu, Calamares'in kullandığınız dağıtıma uyarlanma yolundan kaynaklanan bir sorundur. @@ -380,62 +375,62 @@ link panoya kopyalandı Continue with setup? - Kuruluma devam et? + Kurulum sürdürülsün mü? Continue with installation? - Kurulum devam etsin mi? + Kurulum sürdürülsün mü? The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> - %1 sistem kurulum uygulaması,%2 kurulumu için diskinizde değişiklik yapmak üzere. <br/><strong>Bu değişiklikleri geri alamayacaksınız.</strong> + %1 kurulum programı, %2 ayarlarını yapmak için diskinizde değişiklik yapmak üzere.<br/><strong>Bu değişiklikleri geri alamayacaksınız.</strong> The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> - %1 sistem yükleyici %2 yüklemek için diskinizde değişiklik yapacak.<br/><strong>Bu değişiklikleri geri almak mümkün olmayacak.</strong> + %1 kurulum programı, %2 kurulumu için diskinizde değişiklikler yapmak üzere.<br/><strong>Bu değişiklikleri geri alamayacaksınız.</strong> &Set up now - &Şimdi kur + Şimdi &Ayarla &Install now - &Şimdi yükle + Şimdi &Kur Go &back - Geri &git + Geri &Git &Set up - &Kur + &Ayarla &Install - &Yükle + &Kur Setup is complete. Close the setup program. - Kurulum tamamlandı. Kurulum programını kapatın. + Kurulum tamamlandı. Programı kapatın. The installation is complete. Close the installer. - Yükleme işi tamamlandı. Sistem yükleyiciyi kapatın. + Kurulum tamamlandı. Kurulum programını kapatın. Cancel setup without changing the system. - Sistemi değiştirmeden kurulumu iptal et. + Sistemi değiştirmeden kurulumu iptal edin. @@ -460,7 +455,7 @@ link panoya kopyalandı &Cancel - &Vazgeç + İ&ptal @@ -470,21 +465,21 @@ link panoya kopyalandı Cancel installation? - Yüklemeyi iptal et? + Kurulum iptal edilsin mi? Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. - Mevcut kurulum işlemini gerçekten iptal etmek istiyor musunuz? -Kurulum uygulaması sonlandırılacak ve tüm değişiklikler kaybedilecek. + Geçerli kurulum sürecini iptal etmeyi gerçekten istiyor musunuz? +Program çıkacak ve tüm değişiklikler kaybedilecek. Do you really want to cancel the current install process? The installer will quit and all changes will be lost. - Yükleme işlemini gerçekten iptal etmek istiyor musunuz? -Yükleyiciden çıkınca tüm değişiklikler kaybedilecek. + Geçerli kurulum işlemini iptal etmeyi gerçekten istiyor musunuz? +Kurulum programı çıkacak ve tüm değişiklikler kaybedilecek. @@ -492,22 +487,22 @@ Yükleyiciden çıkınca tüm değişiklikler kaybedilecek. Unknown exception type - Bilinmeyen Özel Durum Tipi + Bilinmeyen istisna türü unparseable Python error - Python hata ayıklaması + Ayrıştırılamayan Python hatası unparseable Python traceback - Python geri çekme ayıklaması + Ayrıştırılamayan Python geri izi Unfetchable Python error. - Okunamayan Python hatası. + Getirilemeyen Python hatası. @@ -515,12 +510,12 @@ Yükleyiciden çıkınca tüm değişiklikler kaybedilecek. %1 Setup Program - %1 Kurulum Uygulaması + %1 Kurulum Programı %1 Installer - %1 Yükleniyor + %1 Kurulum Programı @@ -528,18 +523,18 @@ Yükleyiciden çıkınca tüm değişiklikler kaybedilecek. Set filesystem label on %1. - Dosya sistemi etiketini %1 olarak ayarla. + %1 üzerindeki dosya sistemi etiketini ayarla. Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>. - <strong>%1</strong> dosya sistemi etiketini <strong>%2</strong> bölümüne ayarlayın. + <strong>%1</strong> dosya sistemi etiketini <strong>%2</strong> bölüntüsüne ayarla. The installer failed to update partition table on disk '%1'. - Kurucu '%1' diskinde bölümleme tablosunu güncelleyemedi. + Kurulum programı, '%1' diskindeki bölüntü tablosunu güncelleyemedi. @@ -547,16 +542,11 @@ Yükleyiciden çıkınca tüm değişiklikler kaybedilecek. Gathering system information... - Sistem bilgileri toplanıyor... + Sistem bilgisi toplanıyor... ChoicePage - - - Form - Biçim - Select storage de&vice: @@ -573,18 +563,17 @@ Yükleyiciden çıkınca tüm değişiklikler kaybedilecek. After: - Sonra: + Sonrası: <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. - <strong>Elle bölümleme</strong><br/>Bölümler oluşturabilir ve boyutlandırabilirsiniz. + <strong>Elle bölüntüleme</strong><br/>Kendiniz bölüntüler oluşturabilir ve boyutlandırabilirsiniz. Reuse %1 as home partition for %2. - -%2 ev bölümü olarak %1 yeniden kullanılsın. + %1 bölüntüsünü %2 için ev bölüntüsü olarak yeniden kullan. @@ -594,7 +583,7 @@ Yükleyiciden çıkınca tüm değişiklikler kaybedilecek. %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. - %1, %2MB'a küçülecek ve %4 için yeni bir %3MB disk bölümü oluşturulacak. + %1, %2 MB olarak küçültülecek ve %4 için yeni bir %3 MB disk bölüntüsü oluşturulacak. @@ -604,27 +593,27 @@ Yükleyiciden çıkınca tüm değişiklikler kaybedilecek. <strong>Select a partition to install on</strong> - <strong>Yükleyeceğin disk bölümünü seç</strong> + <strong>Üzerine kurulum yapılacak disk bölümünü seç</strong> An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - Bu sistemde EFI disk bölümü bulunamadı. Lütfen geri dönün ve %1 kurmak için gelişmiş kurulum seçeneğini kullanın. + Bu sistemde bir EFI sistem bölüntüsü bulunamadı. Lütfen geri için ve %1 ayar süreci için elle bölüntüleme gerçekleştirin. The EFI system partition at %1 will be used for starting %2. - %1 EFI sistem bölümü %2 başlatmak için kullanılacaktır. + %1 konumundaki EFI sistem bölüntüsü, %2 başlatılması için kullanılacak. EFI system partition: - EFI sistem bölümü: + EFI sistem bölüntüsü: This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - Bu depolama aygıtı üzerinde yüklü herhangi bir işletim sistemi tespit etmedik. Ne yapmak istersiniz?<br/>Yaptığınız değişiklikler disk bölümü üzerine uygulanmadan önce gözden geçirme fırsatınız olacak. + Bu depolama aygıtında bir işletim sistemi yok gibi görünüyor. Ne yapmak istersiniz?<br/>Depolama aygıtına yapacağınız herhangi bir değişiklik uygulanmadan önce değişikliklerinizi gözden geçirme ve onaylama şansına sahip olacaksınız. @@ -632,7 +621,7 @@ Yükleyiciden çıkınca tüm değişiklikler kaybedilecek. <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. - <strong>Diski sil</strong><br/>Seçili depolama bölümündeki mevcut veriler şu anda <font color="red">silinecektir.</font> + <strong>Diski sil</strong><br/>Seçili depolama aygıtında şu anda bulunan tüm veri <font color="red">silinecektir</font>. @@ -640,7 +629,7 @@ Yükleyiciden çıkınca tüm değişiklikler kaybedilecek. <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. - <strong>Yanına yükleyin</strong><br/>Sistem yükleyici disk bölümünü küçülterek %1 için yer açacak. + <strong>Yanına kur</strong><br/>Kurulum programı, %1 için yer açmak üzere bir bölüntüyü küçültecektir. @@ -648,62 +637,62 @@ Yükleyiciden çıkınca tüm değişiklikler kaybedilecek. <strong>Replace a partition</strong><br/>Replaces a partition with %1. - <strong>Varolan bir disk bölümüne kur</strong><br/>Varolan bir disk bölümü üzerine %1 kur. + <strong>Bir bölüntüyü başkasıyla değiştir</strong><br/>Bir bölüntüyü %1 ile değiştirir. This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - Bu depolama aygıtı üzerinde %1 vardır. Ne yapmak istersiniz?<br/>Yaptığınız değişiklikler disk bölümü üzerine uygulanmadan önce gözden geçirme fırsatınız olacak. + Bu depolama aygıtında %1 var. Ne yapmak istersiniz?<br/>Depolama aygıtına yapacağınız herhangi bir değişiklik uygulanmadan önce değişikliklerinizi gözden geçirme ve onaylama şansına sahip olacaksınız. This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - Bu depolama aygıtı üzerinde bir işletim sistemi yüklü. Ne yapmak istersiniz? <br/>Yaptığınız değişiklikler disk bölümü üzerine uygulanmadan önce gözden geçirme fırsatınız olacak. + Bu depolama aygıtında halihazırda bir işletim sistemi var. Ne yapmak istersiniz?<br/>Depolama aygıtına yapacağınız herhangi bir değişiklik uygulanmadan önce değişikliklerinizi gözden geçirme ve onaylama şansına sahip olacaksınız. This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - Bu depolama aygıtı üzerinde birden fazla işletim sistemi var. Ne yapmak istersiniz? <br/>Yaptığınız değişiklikler disk bölümü üzerine uygulanmadan önce gözden geçirme fırsatınız olacak. + Bu depolama aygıtı üzerinde birden çok işletim sistemi var. Ne yapmak istersiniz?<br/>Depolama aygıtına yapacağınız herhangi bir değişiklik uygulanmadan önce değişikliklerinizi gözden geçirme ve onaylama şansına sahip olacaksınız. This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> - Bu depolama aygıtının üzerinde zaten bir işletim sistemi var, ancak <strong>%1</strong> bölüm tablosu, gerekli <strong>%2</strong>'den farklı. <br/> + Bu depolama aygıtında halihazırda bir işletim sistemi var; ancak <strong>%1</strong> bölüntüleme tablosu, gereken <strong>%2</strong> tablosundan farklı.<br/> This storage device has one of its partitions <strong>mounted</strong>. - Bu depolama aygıtının disk bölümlerinden biri <strong>bağlı</strong>. + Bu depolama aygıtının bölüntülerinden biri <strong>bağlı</strong>. This storage device is a part of an <strong>inactive RAID</strong> device. - Bu depolama aygıtı, <strong>etkin olmayan bir RAID</strong> cihazının parçasıdır. + Bu depolama aygıtı, <strong>etkin olmayan bir RAID</strong> aygıtının parçasıdır. No Swap - Takas alanı yok + Takas Alanı Yok Reuse Swap - Yeniden takas alanı + Takas Alanının Yeniden Kullan Swap (no Hibernate) - Takas Alanı (uyku modu yok) + Takas Alanı (Hazırda Bekletme Kullanılamaz) Swap (with Hibernate) - Takas Alanı (uyku moduyla) + Takas Alanı (Hazırda Beklet ile) Swap to file - Takas alanı dosyası + Dosyaya Takas Yaz @@ -711,7 +700,7 @@ Yükleyiciden çıkınca tüm değişiklikler kaybedilecek. Successfully unmounted %1. - %1 bağlantısı başarıyla kaldırıldı. + %1 bağlantısı başarıyla kesildi. @@ -731,22 +720,22 @@ Yükleyiciden çıkınca tüm değişiklikler kaybedilecek. Successfully disabled volume group %1. - %1 birim grubu başarıyla devre dışı bırakıldı. + %1 bölüm grubu başarıyla devre dışı bırakıldı. Clear mounts for partitioning operations on %1 - %1 bölümleme işlemleri için sorunsuz bağla + %1 üzerinde gerçekleştirilecek bölüntüleme işlemleri için bağlantıları kes Clearing mounts for partitioning operations on %1. - %1 bölümleme işlemleri için bağlama noktaları temizleniyor. + %1 üzerinde gerçekleştirilecek bölüntüleme işlemleri için bağlantılar kesiliyor. Cleared all mounts for %1 - %1 için tüm bağlı bölümler ayrıldı + %1 için olan tüm bağlantılar kesildi @@ -754,17 +743,17 @@ Yükleyiciden çıkınca tüm değişiklikler kaybedilecek. Clear all temporary mounts. - Tüm geçici bağları temizleyin. + Tüm geçici bağlantıları kes. Clearing all temporary mounts. - Geçici olarak bağlananlar temizleniyor. + Tüm geçici bağlantılar kesiliyor. Cleared all temporary mounts. - Tüm geçici bağlar temizlendi. + Tüm geçici bağlantılar kesildi. @@ -777,7 +766,7 @@ Yükleyiciden çıkınca tüm değişiklikler kaybedilecek. The commands use variables that are not defined. Missing variables are: %1. - Komutlar tanımlanmamış değişkenleri kullanır. Eksik değişkenler şunlardır: %1. + Komutlar tanımlanmamış değişkenleri kullanıyor. Eksik değişkenler: %1. @@ -785,17 +774,17 @@ Yükleyiciden çıkınca tüm değişiklikler kaybedilecek. Set keyboard model to %1.<br/> - %1 Klavye düzeni olarak seçildi.<br/> + Klavye modelini %1 olarak ayarla.<br/> Set keyboard layout to %1/%2. - Alt klavye türevi olarak %1/%2 seçildi. + Klavye düzenini %1/%2 olarak ayarla. Set timezone to %1/%2. - %1/%2 Zaman dilimi ayarla. + Zaman dilimini %1/%2 olarak ayarla. @@ -815,12 +804,12 @@ Yükleyiciden çıkınca tüm değişiklikler kaybedilecek. Network Installation. (Disabled: Received invalid groups data) - Ağ Kurulumu. (Devre dışı: Geçersiz grup verileri alındı) + Ağ Kurulumu. (Devre dışı: Geçersiz grup verisi alındı) Network Installation. (Disabled: Internal error) - Ağ Kurulumu. (Devre dışı: Dahili hata) + Ağ Kurulumu. (Devre dışı: İçsel hata) @@ -840,28 +829,28 @@ Yükleyiciden çıkınca tüm değişiklikler kaybedilecek. This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. - Bu bilgisayar, %1 kurulumu için asgari gereksinimleri karşılamıyor. <br/>Kurulum devam edemiyor. + Bu bilgisayar, %1 kurulumu için en düşük gereksinimleri karşılamıyor. <br/>Kurulum sürdürülemiyor. This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. - Bu bilgisayar, %1 kurulumu için asgari gereksinimleri karşılamıyor. <br/>Kurulum devam edemiyor. + Bu bilgisayar, %1 kurulumu için en düşük gereksinimleri karşılamıyor. <br/>Kurulum sürdürülemiyor. This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. - Bu bilgisayar %1 kurulumu için önerilen gereksinimlerin bazılarına uymuyor. Kurulum devam edebilirsiniz ancak bazı özellikler devre dışı bırakılabilir. + Bu bilgisayar, %1 kurulumu için önerilen gereksinimlerin bazılarını karşılamıyor.<br/>Kurulum sürdürülebilir; ancak bazı özellikler devre dışı bırakılabilir. This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. - Bu bilgisayara %1 kurulumu için önerilen gereksinimlerin bazıları karşılanamadı.<br/> -Kurulum devam edebilir fakat bazı özellikler devre dışı kalabilir. + Bu bilgisayar, %1 kurulumu için önerilen gereksinimlerin bazılarını karşılamıyor.<br/> +Kurulum sürdürülebilir; ancak bazı özellikler devre dışı bırakılabilir. This program will ask you some questions and set up %2 on your computer. - Bu program size bazı sorular soracak ve bilgisayarınıza %2 kuracak. + Bu program size bazı sorular sorup %2 yazılımını bilgisayarınıza kuracaktır. @@ -871,27 +860,27 @@ Kurulum devam edebilir fakat bazı özellikler devre dışı kalabilir. <h1>Welcome to %1 setup</h1> - <h1>%1 kurulumuna hoş geldiniz</h1> + <h1>%1 kurulum programına hoş geldiniz</h1> <h1>Welcome to the Calamares installer for %1</h1> - <h1>%1 Calamares Kurucusuna Hoş Geldiniz</h1> + <h1>%1 için Calamares kurulum programına hoş geldiniz</h1> <h1>Welcome to the %1 installer</h1> - <h1>%1 Kurucuya Hoş Geldiniz</h1> + <h1>%1 kurulum programına hoş geldiniz</h1> Your username is too long. - Kullanıcı adınız çok uzun. + Kullanıcı adınız pek uzun. '%1' is not allowed as username. - '%1' kullanıcı adı olarak izin verilmiyor. + '%1', kullanıcı adı olarak uygun değil. @@ -901,42 +890,42 @@ Kurulum devam edebilir fakat bazı özellikler devre dışı kalabilir. Only lowercase letters, numbers, underscore and hyphen are allowed. - Sadece küçük harflere, sayılara, alt çizgi ve kısa çizgilere izin verilir. + Yalnızca küçük harflere, sayılara, alt çizgiye ve kısa çizgiye izin verilir. Your hostname is too short. - Makine adınız çok kısa. + Makine adınız pek kısa. Your hostname is too long. - Makine adınız çok uzun. + Makine adınız pek uzun. '%1' is not allowed as hostname. - '%1' ana bilgisayar adı olarak kullanılamaz. + '%1', makine adı olarak uygun değil. Only letters, numbers, underscore and hyphen are allowed. - Sadece harfler, rakamlar, alt çizgi ve kısa çizgi izin verilir. + Yalnızca harflere, rakamlara, alt çizgiye ve kısa çizgiye izin verilir. - + Your passwords do not match! - Parolanız eşleşmiyor! + Parolalarınız eşleşmiyor! - + OK! TAMAM! Setup Failed - Kurulum Başarısız + Kurulum Başarısız Oldu @@ -946,12 +935,12 @@ Kurulum devam edebilir fakat bazı özellikler devre dışı kalabilir. The setup of %1 did not complete successfully. - %1 kurulumu başarısız oldu tamamlanmadı. + %1 kurulumu başarıyla tamamlanamadı. The installation of %1 did not complete successfully. - %1 kurulumu başarısız oldu. + %1 kurulumu başarıyla tamamlanamadı. @@ -971,17 +960,17 @@ Kurulum devam edebilir fakat bazı özellikler devre dışı kalabilir. The installation of %1 is complete. - Kurulum %1 oranında tamamlandı. + %1 kurulumu tamamlandı. Package Selection - Paket seçimi + Paket Seçimi Please pick a product from the list. The selected product will be installed. - Lütfen listeden bir ürün seçin. Seçilen ürün kurulacak. + Lütfen listeden bir ürün seçin. Seçili ürün kurulacak. @@ -996,17 +985,17 @@ Kurulum devam edebilir fakat bazı özellikler devre dışı kalabilir. None - Hiçbiri + Yok Summary - Kurulum Özeti + Özet This is an overview of what will happen once you start the setup procedure. - Bu, kurulum prosedürü başlatıldıktan sonra ne gibi değişiklikler dair olacağına genel bir bakış. + Bu, kurulum prosedürünü başlattıktan sonra neler olacağının genel bir görünümüdür. @@ -1019,7 +1008,7 @@ Kurulum devam edebilir fakat bazı özellikler devre dışı kalabilir. Contextual Processes Job - Bağlamsal Süreç İşleri + Bağlamsal Süreçler İşi @@ -1027,7 +1016,7 @@ Kurulum devam edebilir fakat bazı özellikler devre dışı kalabilir. Create a Partition - Yeni Bölüm Oluştur + Yeni Bölüntü Oluştur @@ -1042,7 +1031,7 @@ Kurulum devam edebilir fakat bazı özellikler devre dışı kalabilir. Partition &Type: - Bölüm &Tip: + Bölüntü &türü: @@ -1052,12 +1041,12 @@ Kurulum devam edebilir fakat bazı özellikler devre dışı kalabilir. E&xtended - U&zatılmış + &Genişletilmiş Fi&le System: - D&osya Sistemi: + D&osya sistemi: @@ -1067,7 +1056,7 @@ Kurulum devam edebilir fakat bazı özellikler devre dışı kalabilir. &Mount Point: - &Bağlama Noktası: + &Bağlama noktası: @@ -1077,12 +1066,12 @@ Kurulum devam edebilir fakat bazı özellikler devre dışı kalabilir. Label for the filesystem - Dosya sistemi için etiket + Dosya sistemi etiketi FS Label: - DS Etiketi: + DS etiketi: @@ -1107,7 +1096,7 @@ Kurulum devam edebilir fakat bazı özellikler devre dışı kalabilir. Mountpoint already in use. Please select another one. - Bağlama noktası zaten kullanımda. Lütfen diğerini seçiniz. + Bağlama noktası halihazırda kullanımda. Lütfen başka bir tane seçin. @@ -1120,43 +1109,43 @@ Kurulum devam edebilir fakat bazı özellikler devre dışı kalabilir. Create new %1MiB partition on %3 (%2) with entries %4. - %3 (%2) üzerinde %4 girdisi ile yeni bir %1MiB bölüm oluşturun. + %3 (%2) üzerinde %4 girdileriyle ile yeni bir %1 MiB bölüntü oluştur. Create new %1MiB partition on %3 (%2). - %3 (%2) üzerinde yeni bir %1MiB bölüm oluşturun. + %3 (%2) üzerinde yeni bir %1 MiB bölüntü oluştur. Create new %2MiB partition on %4 (%3) with file system %1. - %4 üzerinde (%3) ile %1 dosya sisteminde %2MB disk bölümü oluştur. + %4 üzerinde (%3) ile %1 dosya sisteminde %2 MB bölüntü oluştur. Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>. - <strong>%3</strong> (%2) üzerinde <em>%4</em> girdisi ile yeni bir <strong>%1MiB</strong> bölüm oluşturun. + <strong>%3</strong> (%2) üzerinde <em>%4</em> girdisi ile yeni bir <strong>%1 MiB</strong> bölüntü oluştur. Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2). - <strong>%3</strong> (%2) üzerinde yeni bir <strong>%1MiB</strong> bölüm oluşturun. + <strong>%3</strong> (%2) üzerinde yeni bir <strong>%1 MiB</strong> bölüntü oluştur. Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. - <strong>%4</strong> üzerinde (%3) ile <strong>%1</strong> dosya sisteminde <strong>%2MB</strong> disk bölümü oluştur. + <strong>%4</strong> (%3) üzerinde ile <strong>%1</strong> dosya sistemiyle <strong>%2 MB</strong>bölüntü oluşturun. Creating new %1 partition on %2. - %2 üzerinde %1 yeni disk bölümü oluştur. + %2 üzerinde yeni %1 bölüntüsü oluşturuluyor. The installer failed to create partition on disk '%1'. - Yükleyici '%1' diski üzerinde yeni bölüm oluşturamadı. + Kurulum programı, '%1' diskinde bölüntü oluşturamadı. @@ -1164,27 +1153,27 @@ Kurulum devam edebilir fakat bazı özellikler devre dışı kalabilir. Create Partition Table - Bölümleme Tablosu Oluştur + Bölüntü Tablosu Oluştur Creating a new partition table will delete all existing data on the disk. - Yeni bir bölüm tablosu oluşturmak disk üzerindeki tüm verileri silecektir. + Yeni bir bölüntü tablosu oluşturmak, disk üzerinde var olan tüm veriyi siler. What kind of partition table do you want to create? - Ne tür bölüm tablosu oluşturmak istiyorsunuz? + Ne tür bir bölüntü tablosu oluşturmak istiyorsunuz? Master Boot Record (MBR) - Önyükleme Bölümü (MBR) + Ana Önyükleme Kaydı (MBR) GUID Partition Table (GPT) - GUID Bölüm Tablosu (GPT) + GUID Bölüntü Tablosu (GPT) @@ -1192,22 +1181,22 @@ Kurulum devam edebilir fakat bazı özellikler devre dışı kalabilir. Create new %1 partition table on %2. - %2 üzerinde %1 yeni disk tablosu oluştur. + %2 üzerinde %1 yeni bölüntü tablosu oluştur. Create new <strong>%1</strong> partition table on <strong>%2</strong> (%3). - <strong>%2</strong> (%3) üzerinde <strong>%1</strong> yeni disk tablosu oluştur. + <strong>%2</strong> (%3) üzerinde <strong>%1</strong> yeni bölüntü tablosu oluştur. Creating new %1 partition table on %2. - %2 üzerinde %1 yeni disk tablosu oluştur. + %2 üzerinde %1 yeni bölüntü tablosu oluşturuluyor. The installer failed to create a partition table on %1. - Yükleyici %1 üzerinde yeni bir bölüm tablosu oluşturamadı. + Kurulum programı, %1 üzerinde yeni bir bölüntü tablosu oluşturamadı. @@ -1215,17 +1204,17 @@ Kurulum devam edebilir fakat bazı özellikler devre dışı kalabilir. Create user %1 - %1 Kullanıcısı oluşturuluyor... + %1 kullanıcısını oluştur Create user <strong>%1</strong>. - <strong>%1</strong> kullanıcı oluştur. + <strong>%1</strong> kullanıcısını oluştur. Preserving home directory - Ana dizini koru + Ana klasör korunuyor @@ -1241,7 +1230,7 @@ Kurulum devam edebilir fakat bazı özellikler devre dışı kalabilir. Setting file permissions - Dosya izinlerini ayarla + Dosya izinleri ayarlanıyor @@ -1249,7 +1238,7 @@ Kurulum devam edebilir fakat bazı özellikler devre dışı kalabilir. Create Volume Group - Birim Grubu Oluştur + Disk Bölümü Grubu Oluştur @@ -1257,22 +1246,22 @@ Kurulum devam edebilir fakat bazı özellikler devre dışı kalabilir. Create new volume group named %1. - %1 adında yeni birim grubu oluşturun. + %1 adında yeni disk bölümü grubu oluştur. Create new volume group named <strong>%1</strong>. - <strong>%1</strong>adlı yeni birim grubu oluştur + <strong>%1</strong> adında yeni disk bölümü grubu oluştur. Creating new volume group named %1. - %1 adlı yeni birim grubu oluşturuluyor. + %1 adında yeni disk bölümü grubu oluşturuluyor. The installer failed to create a volume group named '%1'. - Yükleyici, '%1' adında bir birim grubu oluşturamadı. + Kurulum programı, '%1' adında bir disk bölümü grubu oluşturamadı. @@ -1281,17 +1270,17 @@ Kurulum devam edebilir fakat bazı özellikler devre dışı kalabilir. Deactivate volume group named %1. - %1 adlı birim grubunu devre dışı bırakın. + %1 adlı disk bölümü grubunu devre dışı bırak. Deactivate volume group named <strong>%1</strong>. - <strong>%1</strong> adlı birim grubunu devre dışı bırakın. + <strong>%1</strong> adlı disk bölümü grubunu devre dışı bırak. The installer failed to deactivate a volume group named %1. - Yükleyici, %1 adında bir birim grubunu devre dışı bırakamadı. + Kurulum programı, %1 adlı bir disk bölümü grubunu devre dışı bırakamadı. @@ -1299,22 +1288,22 @@ Kurulum devam edebilir fakat bazı özellikler devre dışı kalabilir. Delete partition %1. - %1 disk bölümünü sil. + %1 bölüntüsünü sil. Delete partition <strong>%1</strong>. - <strong>%1</strong> disk bölümünü sil. + <strong>%1</strong> bölüntüsünü sil. Deleting partition %1. - %1 disk bölümü siliniyor. + %1 bölüntüsü siliniyor. The installer failed to delete partition %1. - Yükleyici %1 bölümünü silemedi. + Kurulum programı, %1 bölüntüsünü silemedi. @@ -1322,32 +1311,32 @@ Kurulum devam edebilir fakat bazı özellikler devre dışı kalabilir. This device has a <strong>%1</strong> partition table. - Bu aygıt bir <strong>%1</strong> bölümleme tablosuna sahip. + Bu aygıtta bir <strong>%1</strong> bölüntü tablosu var. This is a <strong>loop</strong> device.<br><br>It is a pseudo-device with no partition table that makes a file accessible as a block device. This kind of setup usually only contains a single filesystem. - Bu bir <strong>döngüsel</strong> aygıttır.<br><br>Bu bir pseudo-device aygıt olup disk bölümlemesi yoktur ve dosyalara erişim sağlayan blok bir aygıttır. Kurulum genelde sadece bir tek dosya sistemini içerir. + Bu bir <strong>döngü</strong> aygıtıdır.<br><br>Bir dosyayı blok aygıtı olarak erişilebilir hale getiren, bölüntü tablosu olmayan yalancı bir aygıttır. Bu tür kurulumlar genellikle yalnızca tek bir dosya sistemi içerir. This installer <strong>cannot detect a partition table</strong> on the selected storage device.<br><br>The device either has no partition table, or the partition table is corrupted or of an unknown type.<br>This installer can create a new partition table for you, either automatically, or through the manual partitioning page. - Sistem yükleyici seçili depolama aygıtında bir bölümleme tablosu tespit edemedi.<br><br>Aygıt üzerinde bir disk bölümleme tablosu hiç oluşturulmamış ya da disk yapısı bilinmeyen bir tiptedir.<br>Sistem yükleyiciyi kullanarak elle ya da otomatik olarak bir disk bölümü tablosu oluşturabilirsiniz. + Bu kurulum programı, seçili depolama aygıtındaki bir <strong>bölüntü tablosunu algılayamaz</strong>.<br><br>Aygıtın ya bölüntü tablosu yoktur ya da bölüntü tablosu bozuktur veya bilinmeyen bir türdedir.<br>Bu kurulum programı, kendiliğinden veya elle bölüntüleme sayfası aracılığıyla sizin için yeni bir bölüntü tablosu oluşturabilir. <br><br>This is the recommended partition table type for modern systems which start from an <strong>EFI</strong> boot environment. - <br><br>Bu bölümleme tablosu modern sistemlerdeki <strong>EFI</strong> önyükleme arayüzünü başlatmak için önerilir. + <br><br>Bu, bir <strong>EFI</strong> önyükleme ortamından başlayan çağdaş sistemler için önerilen bölüntü tablosu türüdür. <br><br>This partition table type is only advisable on older systems which start from a <strong>BIOS</strong> boot environment. GPT is recommended in most other cases.<br><br><strong>Warning:</strong> the MBR partition table is an obsolete MS-DOS era standard.<br>Only 4 <em>primary</em> partitions may be created, and of those 4, one can be an <em>extended</em> partition, which may in turn contain many <em>logical</em> partitions. - <br><br>Bu bölümleme tablosu <strong>BIOS</strong>önyükleme arayüzü kullanan eski sistemlerde tercih edilir. Birçok durumda GPT tavsiye edilmektedir.<br><br><strong>Uyarı:</strong> MBR bölüm tablosu eski tip MS-DOS biçimi için standarttır.<br>Sadece 4 <em>birincil</em> birim oluşturulabilir ve 4 ten fazla bölüm için <em>uzatılmış</em> bölümler oluşturulmalıdır, böylece daha çok <em>mantıksal</em> bölüm oluşturulabilir. + <br><br>Bu bölüntü tablosu, bir <strong>BIOS</strong> önyükleme ortamından başlayan eski sistemler için tavsiye edilir. Çoğu diğer durum için GPT önerilir.<br><br><strong>Uyarı:</strong> MBR bölüntü tablosu, artık eskimiş bir MS-DOS dönemi standardıdır. <br>Yalnızca 4<em>birincil</em> bölüntü oluşturulabilir ve bu dördün birisi, pek çok <em>mantıksal</em> bölüntü içeren bir <em>genişletilmiş</em> bölüntü olabilir. The type of <strong>partition table</strong> on the selected storage device.<br><br>The only way to change the partition table type is to erase and recreate the partition table from scratch, which destroys all data on the storage device.<br>This installer will keep the current partition table unless you explicitly choose otherwise.<br>If unsure, on modern systems GPT is preferred. - Seçili depolama aygıtında bir <strong>bölümleme tablosu</strong> oluştur.<br><br>Bölümleme tablosu oluşturmanın tek yolu aygıt üzerindeki bölümleri silmek, verileri yoketmek ve yeni bölümleme tablosu oluşturmaktır.<br>Sistem yükleyici aksi bir seçeneğe başvurmaz iseniz geçerli bölümlemeyi koruyacaktır.<br>Emin değilseniz, modern sistemler için GPT tercih edebilirsiniz. + Seçili depolama aygıtındaki <strong>bölüntü tablosu</strong> türü.<br><br>Bölüntü tablosu türünü değiştirmenin tek yolu, bölüntü tablosunu silip yeniden oluşturmaktır. Bu, depolama aygıtındaki tüm veriyi yok eder.<br>Kurulum programı, aksini seçmezseniz geçerli bölüntü tablosunu tutar.<br>Emin değilseniz çağdaş sistemlerde GPT seçebilirsiniz. @@ -1375,12 +1364,12 @@ Kurulum devam edebilir fakat bazı özellikler devre dışı kalabilir. Skip writing LUKS configuration for Dracut: "/" partition is not encrypted - Dracut için LUKS yapılandırma işlemi atlanıyor: "/" diski şifrelenemedi + Dracut için LUKS yapılandırma yazımı atlanıyor: "/" bölüntüsü şifrelenmedi Failed to open %1 - %1 Açılamadı + %1 açılamadı @@ -1388,7 +1377,7 @@ Kurulum devam edebilir fakat bazı özellikler devre dışı kalabilir. Dummy C++ Job - Dummy C++ Job + Örnek C++ İşi @@ -1396,7 +1385,7 @@ Kurulum devam edebilir fakat bazı özellikler devre dışı kalabilir. Edit Existing Partition - Mevcut Bölümü Düzenle + Var Olan Bölüntüyü Düzenle @@ -1411,17 +1400,17 @@ Kurulum devam edebilir fakat bazı özellikler devre dışı kalabilir. Format - Biçimle + Biçimlendir Warning: Formatting the partition will erase all existing data. - Uyarı: Biçimlenen bölümdeki tüm veriler silinecek. + Uyarı: Bölüntüyü biçimlendirmek, var olan tüm veriyi siler. &Mount Point: - &Bağlama Noktası: + &Bağlama noktası: @@ -1436,7 +1425,7 @@ Kurulum devam edebilir fakat bazı özellikler devre dışı kalabilir. Fi&le System: - D&osya Sistemi: + D&osya sistemi: @@ -1446,40 +1435,35 @@ Kurulum devam edebilir fakat bazı özellikler devre dışı kalabilir. Label for the filesystem - Dosya sistemi için etiket + Dosya sistemi etiketi FS Label: - DS Etiketi: + DS etiketi: Passphrase for existing partition - Mevcut bölüm için parola + Var olan bölüntü için parola Partition %1 could not be decrypted with the given passphrase.<br/><br/>Edit the partition again and give the correct passphrase or delete and create a new encrypted partition. - %1 bölümünün şifresi verilen parola ile çözülemedi. <br/><br/>Bölümü tekrar düzenleyin ve doğru parolayı girin veya silin ve yeni bir şifreli bölüm oluşturun. + %1 bölüntüsünün şifresi verilen parola ile çözülemedi. <br/><br/>Bölüntüyü yeniden düzenleyip ve doğru parolayı girin veya silip yeni bir şifreli bölüntü oluşturun. EncryptWidget - - - Form - Biçim - En&crypt system - Sistemi Şif&rele + Sistemi şif&rele Your system does not seem to support encryption well enough to encrypt the entire system. You may enable encryption, but performance may suffer. - Sisteminiz, tüm sistemi şifrelemek için yeterince şifrelemeyi desteklemiyor gibi görünüyor. Şifrelemeyi etkinleştirebilirsiniz, ancak performans düşebilir. + Sisteminiz, tüm sistemi şifrelemek için yeterince şifrelemeyi desteklemiyor gibi görünüyor. Şifrelemeyi etkinleştirebilirsiniz; ancak başarım düşebilir. @@ -1495,7 +1479,7 @@ Kurulum devam edebilir fakat bazı özellikler devre dışı kalabilir. Please enter the same passphrase in both boxes. - Her iki kutuya da aynı parolayı giriniz. + Her iki kutuya da aynı parolayı girin. @@ -1508,7 +1492,7 @@ Kurulum devam edebilir fakat bazı özellikler devre dışı kalabilir. Details: - Detaylar: + Ayrıntılar: @@ -1521,12 +1505,12 @@ Kurulum devam edebilir fakat bazı özellikler devre dışı kalabilir. Set partition information - Bölüm bilgilendirmesini ayarla + Bölüntü bilgisini ayarla Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em> - <em>%3</em> özelliklerine sahip <strong>yeni</strong> %2 sistem bölümüne %1 kur + <em>%3</em> özelliklerine sahip <strong>yeni</strong> %2 sistem bölüntüsüne %1 yazılımını kur @@ -1536,27 +1520,27 @@ Kurulum devam edebilir fakat bazı özellikler devre dışı kalabilir. Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. - <strong>%1</strong> bağlama noktası ve <em>%3</em> özelliklerine sahip <strong>yeni</strong> %2 bölümü kurun. + <strong>%1</strong> bağlama noktası ve <em>%3</em> özelliklerine sahip <strong>yeni</strong> bir %2 bölüntüsünü ayarla. Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3. - Bağlama noktası <strong>%1</strong> %3 olan <strong>yeni</strong> %2 bölümü kurun. + <strong>%1</strong> %3 bağlama noktası olan <strong>yeni</strong> %2 bölüntüsünü ayarla. Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>. - <em>%4</em> özelliklerine sahip %3 sistem bölümü <strong>%1</strong> üzerine %2 kur. + <em>%4</em> özelliklerine sahip %3 bölüntüsü <strong>%1</strong> üzerine %2 yazılımını kur. Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>. - Bağlama noktası <strong>%2</strong> ve özellikleri <em>%4</em> ile %3 bölümüne <strong>%1</strong> kurun. + <em>%4</em> özelliklerine sahip ve <strong>%2</strong> bağlama noktasıyla %3 bölüntüsünü <strong>%1</strong> ayarla. Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4. - <strong>%2</strong> %4 bağlama noktası ile %3 bölümüne <strong>%1</strong> kurun. + <strong>%2</strong> %4 bağlama noktası ile %3 bölüntüsünü <strong>%1</strong> ayarla. @@ -1566,21 +1550,16 @@ Kurulum devam edebilir fakat bazı özellikler devre dışı kalabilir. Install boot loader on <strong>%1</strong>. - <strong>%1</strong> üzerine sistem ön yükleyiciyi kur. + <strong>%1</strong> üzerine sistem önyükleyicisini kur. Setting up mount points. - Bağlama noktalarını ayarla. + Bağlama noktaları ayarlanıyor. FinishedPage - - - Form - Biçim - &Restart now @@ -1589,32 +1568,32 @@ Kurulum devam edebilir fakat bazı özellikler devre dışı kalabilir. <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. - <h1>Kurulum Tamamlandı.</h1><br/>%1 bilgisayarınıza kuruldu.<br/>Şimdi yeni kurduğunuz işletim sistemini kullanabilirsiniz. + <h1>Kurulum tamamlandı.</h1><br/>%1 bilgisayarınıza kuruldu.<br/>Artık yeni sisteminizi kullanmaya başlayabilirsiniz. <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html> - <html><head/><body><p>Bu kutucuk işaretlenerek <span style="font-style:italic;">Tamam</span> butonu tıklandığında ya da kurulum uygulaması kapatıldığında bilgisayarınız yeniden başlatılacaktır.</p></body></html> + <html><head/><body><p>Bu kutu işaretlendiğinde, <span style="font-style:italic;">Tamam</span>'a tıkladığınızda veya kurulum programını kapattığınızda sistem anında yeniden başlatılacaktır.</p></body></html> <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment. - <h1>Kurulum işlemleri tamamlandı.</h1><br/>%1 bilgisayarınıza yüklendi<br/>Yeni kurduğunuz sistemi kullanmak için yeniden başlatabilir veya %2 Çalışan sistem ile devam edebilirsiniz. + <h1>Her şey tamam.</h1><br/>%1 bilgisayarınıza kuruldu.<br/>Yeni kurduğunuz sistemi kullanmak için yeniden başlatabilir veya %2 çalışan sistemi ile sürdürebilirsiniz. <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html> - <html><head/><body><p>Bu kutucuk işaretlenerek <span style="font-style:italic;">Tamam</span> düğmesine tıklandığında ya da kurucu kapatıldığında bilgisayarınız yeniden başlatılacaktır.</p></body></html> + <html><head/><body><p>Bu kutu işaretlendiğinde, <span style="font-style:italic;">Tamam</span>'a tıkladığınızda veya kurulum programını kapattığınızda sistem anında yeniden başlatılacaktır.</p></body></html> <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. - <h1>Kurulum Başarısız</h1><br/>%1 bilgisayarınıza kurulamadı.<br/>Hata mesajı: %2. + Kurulum Başarısız Oldu</h1><br/>%1 bilgisayarınıza kurulamadı.<br/>Hata iletisi: %2. <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. - <h1>Yükleme Başarısız</h1><br/>%1 bilgisayarınıza yüklenemedi.<br/>Hata mesajı çıktısı: %2. + <h1>Kurulum Başarısız Oldu</h1><br/>%1 bilgisayarınıza kurulamadı.<br/>Hata iletisi: %2. @@ -1622,7 +1601,7 @@ Kurulum devam edebilir fakat bazı özellikler devre dışı kalabilir. Finish - Kurulum Tamam + Bitir @@ -1630,7 +1609,7 @@ Kurulum devam edebilir fakat bazı özellikler devre dışı kalabilir. Finish - Kurulum Tamam + Bitir @@ -1638,12 +1617,12 @@ Kurulum devam edebilir fakat bazı özellikler devre dışı kalabilir. Format partition %1 (file system: %2, size: %3 MiB) on %4. - %1 disk bölümü biçimle (dosya sistemi: %2 boyut: %3) %4 üzerinde. + %4 üzerindeki %1 bölüntüsünü biçimlendir (dosya sistemi: %2, boyut: %3 MB). Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>. - <strong>%1</strong> diskine <strong>%2</strong> dosya sistemi ile <strong>%3MB</strong> disk bölümü oluştur. + <strong>%2</strong> dosya sistemiyle <strong>%3 MB</strong> <strong>%1</strong> bölüntüsünü biçimlendir. @@ -1654,12 +1633,12 @@ Kurulum devam edebilir fakat bazı özellikler devre dışı kalabilir. Formatting partition %1 with file system %2. - %1 disk bölümü %2 dosya sistemi ile biçimlendiriliyor. + %1 bölüntüsü, %2 dosya sistemi ile biçimlendiriliyor. The installer failed to format partition %1 on disk '%2'. - Yükleyici %1 bölümünü '%2' diski üzerinde biçimlendiremedi. + Kurulum programı, '%2' diski üzerindeki %1 bölüntüsünü biçimlendiremedi. @@ -1677,33 +1656,32 @@ Kurulum devam edebilir fakat bazı özellikler devre dışı kalabilir. There is not enough drive space. At least %1 GiB is required. - Yeterli disk sürücü alanı mevcut değil. En az %1 GB disk alanı gereklidir. + Yeterli disk sürücüsü alanı yok. En az %1 GB disk alanı gereklidir. has at least %1 GiB working memory - En az %1 GB bellek var + en az %1 GB bellek var The system does not have enough working memory. At least %1 GiB is required. - Yeterli ram bellek gereksinimi karşılanamıyor. En az %1 GB ram bellek gereklidir. + Sistemde yeterli çalışma belleği yok. En az %1 GiB gereklidir. is plugged in to a power source - Bir güç kaynağına takılı olduğundan... + bir güç kaynağına takılı The system is not plugged in to a power source. - -Sistem güç kaynağına bağlı değil. + Sistem bir güç kaynağına bağlı değil. is connected to the Internet - İnternete bağlı olduğundan... + internete bağlı @@ -1713,37 +1691,37 @@ Sistem güç kaynağına bağlı değil. is running the installer as an administrator (root) - kurucu, yönetici (kök) olarak çalıştırıyor + kurulum programı yönetici (kök) olarak çalışıyor The setup program is not running with administrator rights. - Kurulum uygulaması yönetici haklarıyla çalışmıyor. + Kurulum programı yönetici haklarıyla çalışmıyor. The installer is not running with administrator rights. - Kurucu, yönetici haklarına sahip olmadan çalışmıyor. + Kurulum programı, yönetici haklarıyla çalışmıyor. has a screen large enough to show the whole installer - kurucunun tamamını gösterecek kadar büyük bir ekrana sahip + tüm kurulum programını gösterecek kadar büyük bir ekran var The screen is too small to display the setup program. - Kurulum uygulamasını görüntülemek için ekran çok küçük. + Kurulum programını görüntülemek için ekran çok küçük. The screen is too small to display the installer. - Ekran, kurucuyu görüntülemek için çok küçük. + Ekran, kurulum programını görüntülemek için çok küçük. is always false - her zaman yanlıştır + her zaman yanlış @@ -1753,7 +1731,7 @@ Sistem güç kaynağına bağlı değil. is always false (slowly) - her zaman yanlıştır (yavaşça) + her zaman yanlış (yavaşça) @@ -1763,7 +1741,7 @@ Sistem güç kaynağına bağlı değil. is always true - her zaman doğrudur + her zaman doğru @@ -1773,7 +1751,7 @@ Sistem güç kaynağına bağlı değil. is always true (slowly) - her zaman doğrudur (yavaşça) + her zaman doğru (yavaşça) @@ -1783,7 +1761,7 @@ Sistem güç kaynağına bağlı değil. is checked three times. - üç kez denetlenir. + üç kez denetlendi. @@ -1797,7 +1775,7 @@ Sistem güç kaynağına bağlı değil. Collecting information about your machine. - Makineniz hakkında bilgi toplama. + Makineniz hakkında bilgi toplanıyor. @@ -1808,7 +1786,7 @@ Sistem güç kaynağına bağlı değil. OEM Batch Identifier - OEM Toplu Tanımlayıcı + OEM Toplu Tanımlayıcısı @@ -1831,7 +1809,7 @@ Sistem güç kaynağına bağlı değil. Creating initramfs with mkinitcpio. - Mkinitcpio ile initramfs oluşturuluyor. + mkinitcpio ile initramfs oluşturuluyor. @@ -1847,17 +1825,17 @@ Sistem güç kaynağına bağlı değil. Konsole not installed - Konsole uygulaması yüklü değil + Konsole uygulaması kurulu değil Please install KDE Konsole and try again! - Lütfen KDE Konsole yükle ve tekrar dene! + KDE Konsole uygulamasını kurun ve yeniden deneyin! Executing script: &nbsp;<code>%1</code> - Komut durumu: &nbsp;<code>%1</code> + Betik yürütülüyor: &nbsp;<code>%1</code> @@ -1873,7 +1851,7 @@ Sistem güç kaynağına bağlı değil. Keyboard - Klavye Düzeni + Klavye @@ -1881,7 +1859,7 @@ Sistem güç kaynağına bağlı değil. Keyboard - Klavye Düzeni + Klavye @@ -1894,17 +1872,17 @@ Sistem güç kaynağına bağlı değil. The system locale setting affects the language and character set for some command line user interface elements.<br/>The current setting is <strong>%1</strong>. - Sistem yerel ayarı, bazı uçbirim, kullanıcı ayarlamaları ve başkaca dil seçeneklerini belirler ve etkiler. <br/>Varsayılan geçerli ayarlar <strong>%1</strong>. + Sistem yerel ayarları, bazı komut satırı kullanıcı arayüzü ögeleri için olan dili ve karakter kümelerini etkiler.<br/>Geçerli ayar <strong>%1</strong>. &Cancel - &Vazgeç + İ&ptal &OK - &TAMAM + &Tamam @@ -1917,12 +1895,12 @@ Sistem güç kaynağına bağlı değil. No target system available. - Mevcut hedef sistemi yok. + Kullanılabilir hedef sistem yok. No rootMountPoint is set. - Hiçbir rootMountPoint ayarlanmadı. + rootMountPoint ayarlanmadı. @@ -1932,15 +1910,10 @@ Sistem güç kaynağına bağlı değil. LicensePage - - - Form - Form - <h1>License Agreement</h1> - <h1>Lisans Anlaşması</h1> + <h1>Lisans Antlaşması</h1> @@ -1960,7 +1933,7 @@ Sistem güç kaynağına bağlı değil. If you do not agree with the terms, the setup procedure cannot continue. - Koşulları kabul etmiyorsanız kurulum prosedürü devam edemez. + Koşulları kabul etmiyorsanız kurulum prosedürü sürdürülemez. @@ -1970,7 +1943,7 @@ Sistem güç kaynağına bağlı değil. If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead. - Koşulları kabul etmiyorsanız, lisans koşullarına tabi yazılım yüklenmeyecek ve bunun yerine açık kaynak alternatifleri kullanılacaktır. + Koşulları kabul etmezseniz lisans koşullarına tabi yazılım kurulmaz ve bunun yerine açık kaynak alternatifleri kullanılır. @@ -1992,33 +1965,33 @@ Sistem güç kaynağına bağlı değil. <strong>%1 driver</strong><br/>by %2 %1 is an untranslatable product name, example: Creative Audigy driver - <strong>%1 sürücü</strong><br/>by %2 + <strong>%1 sürücüsü</strong><br/>, %2 tarafından <strong>%1 graphics driver</strong><br/><font color="Grey">by %2</font> %1 is usually a vendor name, example: Nvidia graphics driver - <strong>%1 grafik sürücü</strong><br/><font color="Grey">by %2</font> + <strong>%1 grafik sürücüsü</strong>,<br/><font color="Grey">%2 tarafından</font> <strong>%1 browser plugin</strong><br/><font color="Grey">by %2</font> - <strong>%1 tarayıcı eklentisi</strong><br/><font color="Grey">by %2</font> + <strong>%1 tarayıcı eklentisi</strong>,<br/><font color="Grey">%2</font> tarafından <strong>%1 codec</strong><br/><font color="Grey">by %2</font> - <strong>%1 kodek</strong><br/><font color="Grey">by %2</font> + <strong>%1 kodlayıcısı</strong>,<br/><font color="Grey">%2 tarafından</font> <strong>%1 package</strong><br/><font color="Grey">by %2</font> - <strong>%1 paketi</strong><br/><font color="Grey">by %2</font> + <strong>%1 paketi</strong>,<br/><font color="Grey">%2 tarafından</font> <strong>%1</strong><br/><font color="Grey">by %2</font> - <strong>%1</strong><br/><font color="Grey">by %2</font> + <strong>%1</strong>,<br/><font color="Grey">%2 tarafından</font> @@ -2038,7 +2011,7 @@ Sistem güç kaynağına bağlı değil. Open license agreement in browser. - Tarayıcıda açık lisans sözleşmesi. + Lisans antlaşmasını tarayıcıda aç. @@ -2046,12 +2019,12 @@ Sistem güç kaynağına bağlı değil. Region: - Bölge: + Kıta: Zone: - Şehir: + Bölge: @@ -2065,7 +2038,7 @@ Sistem güç kaynağına bağlı değil. Location - Sistem Yereli + Konum @@ -2073,7 +2046,7 @@ Sistem güç kaynağına bağlı değil. Quit - Çıkış + Çık @@ -2081,7 +2054,7 @@ Sistem güç kaynağına bağlı değil. Location - Sistem Yereli + Konum @@ -2092,32 +2065,26 @@ Sistem güç kaynağına bağlı değil. LUKS anahtar dosyası yapılandırılıyor. - - + + No partitions are defined. - Hiçbir disk bölümü tanımlanmadı. + Hiçbir bölüntü tanımlanmadı. - - - + + Encrypted rootfs setup error - Şifrelenmiş rootfs kurulum hatası + Şifrelenmiş rootfs ayarlama hatası - + Root partition %1 is LUKS but no passphrase has been set. - %1 kök disk bölümü LUKS olacak fakat bunun için parola belirlenmedi. + %1 kök bölüntüsü LUKS olacak; ancak bunun için parola ayarlanmadı. - + Could not create LUKS key file for root partition %1. - %1 kök disk bölümü için LUKS anahtar dosyası oluşturulamadı. - - - - Could not configure LUKS key file on partition %1. - %1 disk bölümü LUKS anahtar dosyası yapılandırılamadı. + %1 kök bölüntüsü için LUKS anahtar dosyası oluşturulamadı. @@ -2150,9 +2117,9 @@ Sistem güç kaynağına bağlı değil. Please select your preferred location on the map so the installer can suggest the locale and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming. - Kurucunun yerel ayarı önerebilmesi için lütfen haritada tercih ettiğiniz konumu seçin - ve saat dilimi ayarları. Aşağıdaki önerilen ayarlarda ince ayar yapabilirsiniz. Haritada sürükleyerek arama yapın - yakınlaştırmak / uzaklaştırmak için +/- düğmelerini kullanın veya yakınlaştırma için fare kaydırmayı kullanın. + Tercih ettiğiniz konumu haritada seçin ki kurulum programı ilgili yerel ayarları ve zaman dilimi + ayarlarını size önerebilsin. Önerilen ayarları aşağıda ayrıntılı olarak değiştirebilirsiniz. Haritada arama yapmak + için fareyle sürükleyin ve +/- düğmeleri veya fare tekerleği ile yakınlaştırıp uzaklaştırın. @@ -2197,7 +2164,7 @@ Sistem güç kaynağına bağlı değil. Services label for netinstall module, system services - Servisler + Hizmetler @@ -2221,7 +2188,7 @@ Sistem güç kaynağına bağlı değil. Development label for netinstall module - Gelişim + Geliştirme @@ -2233,7 +2200,7 @@ Sistem güç kaynağına bağlı değil. Multimedia label for netinstall module - Multimedya + Çoklu Ortam @@ -2257,7 +2224,7 @@ Sistem güç kaynağına bağlı değil. Utilities label for netinstall module - Bileşenler + İzlenceler @@ -2283,12 +2250,12 @@ Sistem güç kaynağına bağlı değil. <html><head/><body><p>Enter a batch-identifier here. This will be stored in the target system.</p></body></html> - <html><head/><body><p>Buraya toplu tanımlayıcı girin. Bu hedef sistemde depolanır.</p></body></html> + <html><head/><body><p>Buraya toplu tanımlayıcı girin. Bu, hedef sistemde depolanır.</p></body></html> <html><head/><body><h1>OEM Configuration</h1><p>Calamares will use OEM settings while configuring the target system.</p></body></html> - <html><head/><body><h1>OEM Yapılandırma</h1><p>Calamares hedef sistemi yapılandırırken OEM ayarlarını kullanacaktır.</p></body></html> + <html><head/><body><h1>OEM Yapılandırması</h1><p>Calamares hedef sistemi yapılandırırken OEM ayarlarını kullanacaktır.</p></body></html> @@ -2296,12 +2263,12 @@ Sistem güç kaynağına bağlı değil. OEM Configuration - OEM Yapılandırma + OEM Yapılandırması Set the OEM Batch Identifier to <code>%1</code>. - OEM Toplu Tanımlayıcıyı <code>%1</code>'e Ayarlayın. + OEM Toplu Tanımlayıcısını <code>%1</code> olarak ayarla. @@ -2309,7 +2276,7 @@ Sistem güç kaynağına bağlı değil. Select your preferred Region, or use the default settings. - Tercih ettiğiniz Bölgeyi seçin veya varsayılan ayarları kullanın. + Tercih ettiğiniz kıtayı seçin veya öntanımlı ayarları kullanın. @@ -2321,7 +2288,7 @@ Sistem güç kaynağına bağlı değil. Select your preferred Zone within your Region. - Konumunuzda tercih ettiğiniz Bölgeyi seçin. + Kıtanızdaki tercih edilen bölgeyi seçin. @@ -2339,17 +2306,17 @@ Sistem güç kaynağına bağlı değil. Password is too short - Şifre çok kısa + Şifre pek kısa Password is too long - Şifre çok uzun + Şifre pek uzun Password is too weak - Şifre çok zayıf + Şifre pek zayıf @@ -2364,92 +2331,92 @@ Sistem güç kaynağına bağlı değil. The password is the same as the old one - Şifre eski şifreyle aynı + Parola, eskisiyle aynı The password is a palindrome - Parola eskilerden birinin ters okunuşu olabilir + Parola, eskilerinden birinin ters okunuşu olabilir The password differs with case changes only - Parola sadece vaka değişiklikleri ile farklılık gösterir + Parola yalnızca BÜYÜK/küçük harf türünden değişiklik gösteriyor The password is too similar to the old one - Parola eski parolaya çok benzer + Parola, eski parolaya çok benziyor The password contains the user name in some form - Parola kullanıcı adını bir biçimde içeriyor + Parola, kullanıcı adını bir biçimde içeriyor The password contains words from the real name of the user in some form - Şifre, kullanıcının gerçek adına ait kelimeleri bazı biçimde içerir + Parola, kullanıcının gerçek adını içeriyor The password contains forbidden words in some form - Şifre, bazı biçimde yasak kelimeler içeriyor + Parola, izin verilmeyen sözcükler içeriyor The password contains too few digits - Parola çok az basamak içeriyor + Parolada pek az basamak var The password contains too few uppercase letters - Parola çok az harf içermektedir + Parolada pek az BÜYÜK harf var The password contains fewer than %n lowercase letters Parola %n'den daha az küçük harf içeriyor - Parola %n'den daha az küçük harf içeriyor + Parola, %n küçük harften daha az harf içeriyor The password contains too few lowercase letters - Parola çok az küçük harf içeriyor + Parola, pek az küçük harf içeriyor The password contains too few non-alphanumeric characters - Parola çok az sayıda alfasayısal olmayan karakter içeriyor + Parola, pek az sayıda abece-sayısal olmayan karakter içeriyor The password is too short - Parola çok kısa + Parola, pek kısa The password does not contain enough character classes - Parola yeterli sayıda karakter sınıfı içermiyor + Parola, yeterli sayıda karakter türü içermiyor The password contains too many same characters consecutively - Parola ardışık olarak aynı sayıda çok karakter içeriyor + Parola, ardışık olarak aynı sayıda çok karakter içeriyor The password contains too many characters of the same class consecutively - Parola aynı sınıfta çok fazla karakter içeriyor + Parola, aynı türden pek çok karakter içeriyor The password contains fewer than %n digits Parola %n'den az basamak içeriyor - Parola %n'den az basamak içeriyor + Parola, %n basamaktan daha az basamak içeriyor @@ -2457,7 +2424,7 @@ Sistem güç kaynağına bağlı değil. The password contains fewer than %n uppercase letters Parola %n'den daha az büyük harf içeriyor - Parola %n'den daha az büyük harf içeriyor + Parola, %n BÜYÜK harften daha az harf içeriyor @@ -2465,7 +2432,7 @@ Sistem güç kaynağına bağlı değil. The password contains fewer than %n non-alphanumeric characters Parola %n'den daha az alfasayısal olmayan karakter içeriyor - Parola %n'den daha az alfasayısal olmayan karakter içeriyor + Parola, %n abece-sayısal olmayan karakterden daha az karakter içeriyor @@ -2473,20 +2440,20 @@ Sistem güç kaynağına bağlı değil. The password is shorter than %n characters Parola %n karakterden kısa - Parola %n karakterden kısa + Parola, %n karakterden kısa The password is a rotated version of the previous one - Parola, öncekinin döndürülmüş bir sürümüdür + Parola, öncekinin döndürülmüş bir sürümü The password contains fewer than %n character classes Parola %n karakter sınıfından daha azını içeriyor - Parola %n karakter sınıfından daha azını içeriyor + Parola, %n karakter sınıfından daha azını içeriyor @@ -2494,7 +2461,7 @@ Sistem güç kaynağına bağlı değil. The password contains more than %n same characters consecutively Parola art arda %n'den fazla aynı karakter içeriyor - Parola art arda %n'den fazla aynı karakter içeriyor + Parola, %n karakterden daha çok karakter içeriyor @@ -2502,7 +2469,7 @@ Sistem güç kaynağına bağlı değil. The password contains more than %n characters of the same class consecutively Parola aynı sınıftan art arda %n'den fazla karakter içeriyor - Parola aynı sınıftan art arda %n'den fazla karakter içeriyor + Parola, aynı sınıfın %n karakterinden daha çok karakter içeriyor @@ -2516,7 +2483,7 @@ Sistem güç kaynağına bağlı değil. The password contains too long of a monotonic character sequence - Parola çok uzun monoton karakter dizisi içeriyor + Parola, çok uzun monoton karakter dizisi içeriyor @@ -2526,22 +2493,22 @@ Sistem güç kaynağına bağlı değil. Cannot obtain random numbers from the RNG device - RNG cihazından rastgele sayılar elde edemiyor + RNG aygıtından rastgele sayılar elde edilemiyor Password generation failed - required entropy too low for settings - Şifre üretimi başarısız oldu - ayarlar için entropi çok düşük gerekli + Parola üretimi başarısız oldu - ayarlar için entropi çok düşük gerekli The password fails the dictionary check - %1 - Parola imla kontrolünde başarısız oldu - %1 + Parola, sözlük denetimini geçemedi - %1 The password fails the dictionary check - Parola, sözlük onayı başarısız + Parola, sözlük denetimini geçemiyor @@ -2556,32 +2523,32 @@ Sistem güç kaynağına bağlı değil. Bad integer value of setting - %1 - Ayarın bozuk tam sayı değeri - %1 + Hatalı tamsayı değeri - %1 Bad integer value - Yanlış tamsayı değeri + Hatalı tamsayı değeri Setting %1 is not of integer type - %1 ayarı tamsayı tipinde değil + %1 ayarı tamsayı türünde değil Setting is not of integer type - Ayar tamsayı tipinde değil + Ayar tamsayı türünde değil Setting %1 is not of string type - Ayar %1, dizgi tipi değil + %1 ayarı dizi türünde değil Setting is not of string type - Ayar, dizgi tipi değil + Ayar dizi türünde değil @@ -2591,12 +2558,12 @@ Sistem güç kaynağına bağlı değil. The configuration file is malformed - Yapılandırma dosyası hatalı biçimlendirildi + Yapılandırma dosyası hatalı biçimde oluşturulmuş Fatal failure - Ölümcül arıza + Onulmaz hata @@ -2604,22 +2571,17 @@ Sistem güç kaynağına bağlı değil. Bilinmeyen hata - + Password is empty - Şifre boş + Parola boş PackageChooserPage - - - Form - Biçim - Product Name - Ürün adı + Ürün Adı @@ -2629,17 +2591,17 @@ Sistem güç kaynağına bağlı değil. Long Product Description - Uzun ürün açıklaması + Uzun Ürün Açıklaması Package Selection - Paket seçimi + Paket Seçimi Please pick a product from the list. The selected product will be installed. - Lütfen listeden bir ürün seçin. Seçilen ürün kurulacak. + Lütfen listeden bir ürün seçin. Seçili ürün kurulacak. @@ -2647,7 +2609,7 @@ Sistem güç kaynağına bağlı değil. Name - İsim + Ad @@ -2657,29 +2619,19 @@ Sistem güç kaynağına bağlı değil. Page_Keyboard - - - Form - Form - Keyboard Model: - Klavye Modeli: + Klavye modeli: Type here to test your keyboard - Klavye seçiminizi burada test edebilirsiniz + Klavyenizi sınamak için buraya yazın Page_UserSetup - - - Form - Form - What is your name? @@ -2693,12 +2645,12 @@ Sistem güç kaynağına bağlı değil. What name do you want to use to log in? - Giriş için hangi adı kullanmak istersiniz? + Oturum açmak için hangi adı kullanmak istiyorsunuz? login - Kullanıcı Adı + Oturum Açma @@ -2718,25 +2670,25 @@ Sistem güç kaynağına bağlı değil. Choose a password to keep your account safe. - Hesabınızın güvenliğini sağlamak için bir parola belirleyiniz. + Hesabınızı güvende tutmak için bir parola seçin. <small>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.</small> - <small>Yazım hatası ihtimaline karşı parolanızı iki kere yazınız. Güçlü bir parola en az sekiz karakter olmalı ve rakamları, harfleri, karakterleri içermelidir, düzenli aralıklarla değiştirilmelidir.</small> + <small>Olası yazım hatalarının denetlenebilmesi için parolayı iki kez girin. İyi bir parola; harflerin karışımından, sayılardan ve noktalama işaretlerinden oluşur ve en az sekiz karakter uzunluğunda olup düzenli aralıklarla değiştirilmelidir.</small> Password - Şifre + Parola Repeat Password - Şifreyi Tekrarla + Parolayı Yinele @@ -2746,28 +2698,28 @@ Sistem güç kaynağına bağlı değil. Require strong passwords. - Güçlü şifre gerekir. + Güçlü şifre gerektir. Log in automatically without asking for the password. - Şifre sormadan otomatik olarak giriş yap. + Parolayı sormadan kendiliğinden oturum aç. Use the same password for the administrator account. - Yönetici ile kullanıcı aynı şifreyi kullansın. + Yönetici hesabı için aynı parolayı kullan. Choose a password for the administrator account. - Yönetici-Root hesabı için bir parola belirle. + Yönetici hesabı için bir parola seç. <small>Enter the same password twice, so that it can be checked for typing errors.</small> - <small>Yazım hatası ihtimaline karşı aynı şifreyi tekrar giriniz.</small> + <small>Olası yazım hatalarının denetlenebilmesi için parolayı iki kez girin.</small> @@ -2775,37 +2727,37 @@ Sistem güç kaynağına bağlı değil. Root - Root + Kök Home - Home + Ana Klasör Boot - Boot + Önyükleme EFI system - EFI sistem + EFI Sistem Swap - Swap-Takas + Takas New partition for %1 - %1 için yeni disk bölümü + %1 için yeni bölüntü New partition - Yeni disk bölümü + Yeni bölüntü @@ -2826,12 +2778,12 @@ Sistem güç kaynağına bağlı değil. New partition - Yeni bölüm + Yeni bölüntü Name - İsim + Ad @@ -2856,11 +2808,6 @@ Sistem güç kaynağına bağlı değil. PartitionPage - - - Form - Form - Storage de&vice: @@ -2874,7 +2821,7 @@ Sistem güç kaynağına bağlı değil. New Partition &Table - Yeni Bölüm &Tablo + Yeni Bölüntü &Tablosu @@ -2894,42 +2841,42 @@ Sistem güç kaynağına bağlı değil. New Volume Group - Yeni Birim Grubu + Yeni Disk Bölümü Grubu Resize Volume Group - Birim Grubunu Yeniden Boyutlandır + Disk Bölümü Grubunu Yeniden Boyutlandır Deactivate Volume Group - Birim Grubunu Devre Dışı Bırak + Disk Bölümü Grubunu Devre Dışı Bırak Remove Volume Group - Birim Grubunu Kaldır + Disk Bölümü Grubunu Kaldır I&nstall boot loader on: - Ö&nyükleyiciyi şuraya kurun: + Önyükleyiciyi şuraya &kur: Are you sure you want to create a new partition table on %1? - %1 tablosunda yeni bölüm oluşturmaya devam etmek istiyor musunuz? + %1 üzerinde yeni bir bölüntü tablosu oluşturmak istiyor musunuz? Can not create new partition - Yeni disk bölümü oluşturulamıyor + Yeni bölüntü oluşturulamıyor The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead. - %1 üzerindeki disk bölümü tablosu zaten %2 birincil disk bölümüne sahip ve artık eklenemiyor. Lütfen bir birincil disk bölümü kaldırın ve bunun yerine uzatılmış bir disk bölümü ekleyin. + %1 üzerindeki bölüntü tablosu halihazırda %2 birincil bölüntüye sahip ve artık eklenemiyor. Lütfen bir birincil bölüntüyü kaldırın ve bunun yerine genişletilmiş bir bölüntü ekleyin. @@ -2937,108 +2884,107 @@ Sistem güç kaynağına bağlı değil. Gathering system information... - Sistem bilgileri toplanıyor... + Sistem bilgisi toplanıyor... Partitions - Disk Bölümleme + Bölüntüler Unsafe partition actions are enabled. - Güvenli olmayan bölümleme eylemi etkinleştirildi. + Güvenli olmayan bölüntü eylemleri etkinleştirildi. Partitioning is configured to <b>always</b> fail. - Bölümleme, <b>her zaman</b> başarısız olacak şekilde yapılandırılmıştır. + Bölüntüleme, <b>her zaman</b> başarısız olacak şekilde yapılandırıldı. No partitions will be changed. - Hiçbir bölüm değiştirilmeyecek. + Hiçbir bölüntü değiştirilmeyecek. Current: - Geçerli: + Şu anki durum: After: - Sonra: + Sonrası: - + No EFI system partition configured - EFI sistem bölümü yapılandırılmamış - - - - EFI system partition configured incorrectly - EFI sistem bölümü yanlış yapılandırılmış - - - - An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem. - %1 başlatmak için bir EFI sistem bölümü gereklidir. <br/><br/> Bir EFI sistem bölümü yapılandırmak için geri dönün ve uygun bir dosya sistemi seçin veya oluşturun. - - - - The filesystem must be mounted on <strong>%1</strong>. - Dosya sistemi <strong>%1</strong> üzerine bağlanmalıdır. + Yapılandırılan EFI sistem bölüntüsü yok - The filesystem must have type FAT32. - Dosya sistemi FAT32 tipine sahip olmalıdır. + EFI system partition configured incorrectly + EFI sistem bölüntüsü yanlış yapılandırılmış - + + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem. + %1 yazılımını başlatmak için bir EFI sistem bölüntüsü gereklidir. <br/><br/> Bir EFI sistem bölüntüsü yapılandırmak için geri dönün ve uygun bir dosya sistemi seçin veya oluşturun. + + + + The filesystem must be mounted on <strong>%1</strong>. + Dosya sistemi <strong>%1</strong> üzerinde bağlanmalıdır. + + + + The filesystem must have type FAT32. + Dosya sistemi FAT32 türünde olmalıdır. + + + The filesystem must be at least %1 MiB in size. Dosya sisteminin boyutu en az %1 MB olmalıdır. - + The filesystem must have flag <strong>%1</strong> set. Dosya sisteminde <strong>%1</strong> bayrağı ayarlanmış olmalıdır. - + You can continue without setting up an EFI system partition but your system may fail to start. - Bir EFI sistem bölümü kurmadan devam edebilirsiniz ancak sisteminiz başlamayabilir. + Bir EFI sistem bölüntüsü kurmadan sürdürebilirsiniz; ancak sisteminiz başlamayabilir. - + Option to use GPT on BIOS BIOS'ta GPT kullanma seçeneği - + A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>%2</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. - GPT bölüm tablosu, tüm sistemler için en iyi seçenektir. Bu yükleyici, BIOS sistemleri için de böyle bir kurulumu destekler. <br/><br/>BIOS'ta bir GPT bölüm tablosu yapılandırmak için (önceden yapılmadıysa) geri dönün ve bölüm tablosunu GPT olarak ayarlayın, ardından <strong>%2</strong> bayrağı etkinleştirilmiş.<br/><br/> 8 MB biçimlendirilmemiş bölüm oluşturun .GPT' ile BIOS sisteminde %1 başlatmak için biçimlendirilmemiş 8 MB bir bölüm gereklidir. + GPT bölüntü tablosu, tüm sistemler için en iyi seçenektir. Bu kurulum programı, BIOS sistemleri için de böyle bir düzeni destekler.<br/><br/>BIOS'ta bir GPT bölüntü tablosu yapılandırmak için (önceden yapılmadıysa) geri dönün ve bölüntü tablosunu GPT olarak ayarlayın; sonrasında <strong>%2</strong> bayrağı etkinleştirilmiş bir biçimde 8 MB'lık biçimlendirilmemiş bir bölüntü oluşturun.<br/><br/>%1 yazılımını bir BIOS sistemde GPT ile başlatmak için 8 MB'lık biçimlendirilmemiş bir bölüntü gereklidir. - + Boot partition not encrypted - Önyükleme yani boot diski şifrelenmedi + Önyükleme bölüntüsü şifreli değil - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. - Ayrı bir önyükleme yani boot disk bölümü, şifrenmiş bir kök bölüm ile birlikte ayarlandı, fakat önyükleme bölümü şifrelenmedi.<br/><br/>Bu tip kurulumun güvenlik endişeleri vardır, çünkü önemli sistem dosyaları şifrelenmemiş bir bölümde saklanır.<br/>İsterseniz kuruluma devam edebilirsiniz, fakat dosya sistemi kilidi daha sonra sistem başlatılırken açılacak.<br/> -Önyükleme bölümünü şifrelemek için geri dönün ve bölüm oluşturma penceresinde <strong>Şifreleme</strong>seçeneği ile yeniden oluşturun. + Şifrelenmiş bir kök bölümü ile birlikte ayrı bir önyükleme bölüntüsü ayarlandı; ancak önyükleme bölüntüsü şifrelenmiyor.<br/><br/>Bu tür düzenler ile ilgili güvenlik endişeleri vardır; çünkü önemli sistem dosyaları şifrelenmemiş bir bölümde tutulur.<br/>İsterseniz sürdürebilirsiniz; ancak dosya sistemi kilidini açma, sistem başlatma işlem silsilesinde daha sonra gerçekleşecektir.<br/>Önyükleme bölüntüsünü şifrelemek için geri dönüp bölüntü oluşturma penceresinde <strong>Şifrele</strong>'yi seçerek onu yeniden oluşturun. - + has at least one disk device available. - Mevcut en az bir disk aygıtı var. + en az bir disk aygıtı kullanılabilir. - + There are no partitions to install on. - Kurulacak disk bölümü yok. + Üzerine kurulacak bir bölüntü yok. @@ -3046,26 +2992,21 @@ Sistem güç kaynağına bağlı değil. Plasma Look-and-Feel Job - Plazma Look-and-Feel İşleri + Plasma Görünüm ve His Could not select KDE Plasma Look-and-Feel package - KDE Plazma Look-and-Feel paketi seçilemedi + KDE Plasma Görünüm ve His paketi seçilemedi PlasmaLnfPage - - - Form - Biçim - Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. - Lütfen KDE Plazma Masaüstü için temalardan Bak ve Hisset bölümünü seçin. Ayrıca bu adımı atlayabilir ve sistem ayarlandıktan sonra bak ve hisset tema yapılandırabilirsiniz. Bir bak ve hisset seçeneğine tıklarsanız size canlı bir önizleme gösterilecektir. + Lütfen KDE Plasma Masaüstü için temalardan görünüm ve hissi seçin. Ayrıca bu adımı atlayabilir ve sistem ayarlandıktan sonra sistem görünüşünü yapılandırabilirsiniz. Bir görünüm ve his seçeneğine tıklarsanız size canlı bir önizleme gösterilecektir. @@ -3078,7 +3019,7 @@ Sistem güç kaynağına bağlı değil. Look-and-Feel - Look-and-Feel + Görünüm ve His @@ -3120,52 +3061,52 @@ Output: External command crashed. - Harici komut çöktü. + Dış komut çöktü. Command <i>%1</i> crashed. - Komut <i>%1</i> çöktü. + <i>%1</i> komutu çöktü. External command failed to start. - Harici komut başlatılamadı. + Dış komut başlatılamadı. Command <i>%1</i> failed to start. - Komut <i>%1</i> başlatılamadı. + <i>%1</i> komutu başlatılamadı. Internal error when starting command. - Komut başlatılırken dahili hata. + Komut başlatılırken içsel hata. Bad parameters for process job call. - Çalışma adımları başarısız oldu. + Süreç iş çağrısı için hatalı parametreler. External command failed to finish. - Harici komut başarısız oldu. + Dış komut işini bitiremedi. Command <i>%1</i> failed to finish in %2 seconds. - Komut <i>%1</i> %2 saniyede başarısız oldu. + <i>%1</i> komutu, işini %2 saniyede bitiremedi. External command finished with errors. - Harici komut hatalarla bitti. + Dış komut, işini hatalarla bitirdi. Command <i>%1</i> finished with exit code %2. - Komut <i>%1</i> %2 çıkış kodu ile tamamlandı + <i>%1</i> komutu, %2 çıkış kodu ile işini bitirdi. @@ -3183,23 +3124,23 @@ Output: extended - uzatılmış + genişletilmiş unformatted - biçimlenmemiş + biçimlendirilmemiş swap - Swap-Takas + takas Default - Varsayılan + Öntanımlı @@ -3223,7 +3164,7 @@ Output: Could not create new random file <pre>%1</pre>. - <pre>%1</pre>yeni rasgele dosya oluşturulamadı. + Yeni rastgele dosya<pre>%1</pre> oluşturulamadı. @@ -3233,7 +3174,7 @@ Output: No description provided. - Açıklama bulunamadı. + Sağlanan açıklama yok. @@ -3243,7 +3184,7 @@ Output: Unpartitioned space or unknown partition table - Bölümlenmemiş alan veya bilinmeyen bölüm tablosu + Bölüntülenmemiş alan veya bilinmeyen bölüntü tablosu @@ -3252,8 +3193,8 @@ Output: <p>This computer does not satisfy some of the recommended requirements for setting up %1.<br/> Setup can continue, but some features might be disabled.</p> - <p>Bu bilgisayar %1 kurmak için önerilen gereksinimlerin bazılarını karşılamıyor.<br/> - Kurulum devam edebilir, ancak bazı özellikler devre dışı kalabilir.</p> + <p>Bu bilgisayar, %1 kurulumu için önerilen gereksinimlerin bazılarını karşılamıyor.<br/> + Kurulum sürdürülebilir; ancak bazı özellikler devre dışı bırakılabilir.</p> @@ -3261,7 +3202,7 @@ Output: Remove live user from target system - Liveuser kullanıcısını hedef sistemden kaldırın + Canlı kullanıcıyı hedef sistemden kaldır @@ -3270,17 +3211,17 @@ Output: Remove Volume Group named %1. - %1 adlı Birim Grubunu kaldır. + %1 adlı disk bölümü grubunu kaldır. Remove Volume Group named <strong>%1</strong>. - <strong>%1</strong> adlı Birim Grubunu kaldır. + <strong>%1</strong> adlı disk bölümü grubunu kaldır. The installer failed to remove a volume group named '%1'. - Yükleyici, '%1' adında bir birim grubunu kaldıramadı. + Kurulum programı, '%1' adlı bir disk bölümü grubunu kaldıramadı. @@ -3289,15 +3230,15 @@ Output: <p>This computer does not satisfy the minimum requirements for installing %1.<br/> Installation cannot continue.</p> - <p>Bu bilgisayar %1 kurulumu için asgari gereksinimleri karşılamıyor.<br/> - Kurulum devam edemiyor.</p> + <p>Bu bilgisayar, %1 kurulumu için en düşük gereksinimleri karşılamıyor.<br/> + Kurulum sürdürülemiyor.</p> <p>This computer does not satisfy some of the recommended requirements for setting up %1.<br/> Setup can continue, but some features might be disabled.</p> - <p>Bu bilgisayar %1 kurmak için önerilen gereksinimlerin bazılarını karşılamıyor.<br/> - Kurulum devam edebilir, ancak bazı özellikler devre dışı kalabilir.</p> + <p>Bu bilgisayar, %1 kurulumu için önerilen gereksinimlerin bazılarını karşılamıyor.<br/> + Kurulum sürdürülebilir; ancak bazı özellikler devre dışı bırakılabilir.</p> @@ -3305,7 +3246,7 @@ Output: Resize Filesystem Job - Dosya Sistemini Yeniden Boyutlandır + Dosya Sistemini Yeniden Boyutlandırma İşi @@ -3315,17 +3256,17 @@ Output: The file-system resize job has an invalid configuration and will not run. - Dosya sistemi yeniden boyutlandırma işi sorunlu yapılandırıldı ve çalışmayacak. + Dosya sistemini yeniden boyutlandıma işinin yapılandırması geçersiz ve çalışmayacak. KPMCore not Available - KPMCore Hazır değil + KPMCore Kullanılamıyor Calamares cannot start KPMCore for the file-system resize job. - Calamares dosya sistemi yeniden boyutlandırma işi için KPMCore başlatılamıyor. + Dosya sistemini yeniden boyutlandırma işi için Calamares, KPMCore'u başlatamıyor. @@ -3334,7 +3275,7 @@ Output: Resize Failed - Yeniden Boyutlandırılamadı + Yeniden Boyutlandırma Başarısız Oldu @@ -3361,12 +3302,12 @@ Output: The filesystem %1 must be resized, but cannot. - %1 dosya sistemi yeniden boyutlandırılmalıdır, fakat yapılamaz. + %1 dosya sistemi yeniden boyutlandırılmalıdır; ancak yapılamıyor. The device %1 must be resized, but cannot - %1 dosya sistemi yeniden boyutlandırılmalıdır, ancak yapılamaz. + %1 dosya sistemi yeniden boyutlandırılmalıdır; ancak yapılamıyor. @@ -3379,17 +3320,17 @@ Output: Resize <strong>%2MiB</strong> partition <strong>%1</strong> to <strong>%3MiB</strong>. - <strong>%2MB</strong> <strong>%1</strong> disk bölümü <strong>%3MB</strong> olarak yeniden boyutlandır. + <strong>%2 MB</strong> <strong>%1</strong> bölüntüsünü <strong>%3 MB</strong> olarak yeniden boyutlandır. Resizing %2MiB partition %1 to %3MiB. - %1 disk bölümü %2 boyutundan %3 boyutuna ayarlanıyor. + %1 bölüntüsü, %2 -> %3 olarak yeniden boyutlandırılıyor. The installer failed to resize partition %1 on disk '%2'. - Yükleyici %1 bölümünü '%2' diski üzerinde yeniden boyutlandırılamadı. + Kurulum programı, '%2' diski üzerindeki %1 bölüntüsünü yeniden boyutlandırılamadı. @@ -3397,7 +3338,7 @@ Output: Resize Volume Group - Birim Grubunu Yeniden Boyutlandır + Disk Bölümü Grubunu Yeniden Boyutlandır @@ -3406,17 +3347,17 @@ Output: Resize volume group named %1 from %2 to %3. - %1 adındaki birim grubunu %2'den %3'e kadar yeniden boyutlandırın. + %1 adlı disk bölümü grubunu %2 -> %3 olarak yeniden boyutlandır. Resize volume group named <strong>%1</strong> from <strong>%2</strong> to <strong>%3</strong>. - <strong>%1</strong>adındaki birim grubunu <strong>%2</strong>'den <strong>%3</strong>'e yeniden boyutlandırın + <strong>%1</strong> adlı disk bölümü grubunu <strong>%2</strong> -> <strong>%3</strong> olarak yeniden boyutlandır. The installer failed to resize a volume group named '%1'. - Yükleyici, '%1' adında bir birim grubunu yeniden boyutlandıramadı. + Kurulum programı, '%1' adlı bir disk bölümü grubunu yeniden boyutlandıramadı. @@ -3437,7 +3378,7 @@ Output: Partitioning - Bölümleme + Bölüntüleme @@ -3445,29 +3386,29 @@ Output: Set hostname %1 - %1 sunucu-adı ayarla + %1 makine adını ayarla Set hostname <strong>%1</strong>. - <strong>%1</strong> sunucu-adı ayarla. + <strong>%1</strong> makine adını ayarla. Setting hostname %1. - %1 sunucu-adı ayarlanıyor. + %1 makine adı ayarlanıyor. Internal Error - Dahili Hata + İçsel Hata Cannot write hostname to target system - Hedef sisteme sunucu-adı yazılamadı + Hedef sisteme makine adı yazılamadı @@ -3475,29 +3416,29 @@ Output: Set keyboard model to %1, layout to %2-%3 - Klavye düzeni %1 olarak, alt türevi %2-%3 olarak ayarlandı. + Klavye modeline %1, düzenini %2-%3 olarak ayarla Failed to write keyboard configuration for the virtual console. - Uçbirim için klavye yapılandırmasını kaydetmek başarısız oldu. + Sanal konsol için klavye yapılandırması yazılamadı. Failed to write to %1 - %1 üzerine kaydedilemedi + %1 üzerine yazılamadı Failed to write keyboard configuration for X11. - X11 için klavye yapılandırmaları kaydedilemedi. + X11 için klavye yapılandırması yazılamadı. Failed to write keyboard configuration to existing /etc/default directory. - /etc/default dizine klavye yapılandırması yazılamadı. + Var olan /etc/default dizinine klavye yapılandırması yazılamadı. @@ -3505,82 +3446,82 @@ Output: Set flags on partition %1. - %1 bölüm bayrağını ayarla. + %1 bölüntüsüne bayrakları ayarla. Set flags on %1MiB %2 partition. - %1MB %2 disk bölümüne bayrak ayarla. + %1 MB %2 bölüntüsüne bayraklar ayarla. Set flags on new partition. - Yeni disk bölümüne bayrak ayarla. + Yeni bölüntüye bayrakları ayarla. Clear flags on partition <strong>%1</strong>. - <strong>%1</strong> bölüm bayrağını kaldır. + <strong>%1</strong> bölüntüsündeki bayrakları kaldır. Clear flags on %1MiB <strong>%2</strong> partition. - %1MB <strong>%2</strong> disk bölümünden bayrakları temizle. + %1 MB <strong>%2</strong> bölüntüsündeki bayrakları temizle. Clear flags on new partition. - Yeni disk bölümünden bayrakları temizle. + Yeni bölüntüdeki bayrakları temizle. Flag partition <strong>%1</strong> as <strong>%2</strong>. - Bayrak bölüm <strong>%1</strong> olarak <strong>%2</strong>. + <strong>%1</strong> bölüntüsünü <strong>%2</strong> olarak bayrakla. Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>. - %1MB <strong>%2</strong> disk bölüm bayrağı <strong>%3</strong> olarak belirlendi. + %1 MB <strong>%2</strong> bölüntüsünü <strong>%3</strong> olarak bayrakla. Flag new partition as <strong>%1</strong>. - Yeni disk bölümü <strong>%1</strong> olarak belirlendi. + Yeni bölüntüyü <strong>%1</strong> olarak bayrakla. Clearing flags on partition <strong>%1</strong>. - <strong>%1</strong> bölümünden bayraklar kaldırılıyor. + <strong>%1</strong> bölüntüsündeki bayraklar kaldırılıyor. Clearing flags on %1MiB <strong>%2</strong> partition. - %1MB <strong>%2</strong> disk bölümünden bayraklar temizleniyor. + %1 MB <strong>%2</strong> bölüntüsündeki bayraklar temizleniyor. Clearing flags on new partition. - Yeni disk bölümünden bayraklar temizleniyor. + Yeni bölüntüdeki bayraklar temizleniyor. Setting flags <strong>%2</strong> on partition <strong>%1</strong>. - <strong>%2</strong> bayrakları <strong>%1</strong> bölümüne ayarlandı. + <strong>%1</strong> bölüntüsüne <strong>%2</strong> bayrakları ayarlanıyor. Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition. - <strong>%3</strong> bayrağı %1MB <strong>%2</strong> disk bölümüne ayarlanıyor. + %1 MiB <strong>%2</strong> bölüntüsüne <strong>%3</strong> bayrakları ayarlanıyor. Setting flags <strong>%1</strong> on new partition. - Yeni disk bölümüne <strong>%1</strong> bayrağı ayarlanıyor. + Yeni bölüntüye <strong>%1</strong> bayrakları ayarlanıyor. The installer failed to set flags on partition %1. - Yükleyici %1 bölüm bayraklarını ayarlamakta başarısız oldu. + Kurulum programı, %1 bölüntüsüne bayrakları ayarlayamadı. @@ -3588,17 +3529,17 @@ Output: Set password for user %1 - %1 Kullanıcı için parola ayarla + %1 kullanıcısı için parolayı ayarla Setting password for user %1. - %1 Kullanıcısı için parola ayarlanıyor. + %1 kullanıcısı için parola ayarlanıyor. Bad destination system path. - Hedef sistem yolu bozuk. + Bozuk hedef sistem yolu. @@ -3608,7 +3549,7 @@ Output: Cannot disable root account. - root hesap devre dışı bırakılamaz. + Kök hesabı devre dışı bırakılamaz. @@ -3618,12 +3559,12 @@ Output: Cannot set password for user %1. - %1 Kullanıcısı için parola ayarlanamadı. + %1 kullanıcısı için parola ayarlanamıyor. usermod terminated with error code %1. - usermod %1 hata koduyla çöktü. + usermod %1 hata koduyla sonlandı. @@ -3631,12 +3572,12 @@ Output: Set timezone to %1/%2 - %1/%2 Zaman dilimi ayarla + Zaman dilimini %1/%2 olarak ayarla Cannot access selected timezone path. - Seçilen zaman dilimini yoluna erişilemedi. + Seçili zaman dilimi yoluna erişilemedi. @@ -3646,22 +3587,22 @@ Output: Cannot set timezone. - Zaman dilimi ayarlanamadı. + Zaman dilimi ayarlanamıyor. Link creation failed, target: %1; link name: %2 - Link oluşturulamadı, hedef: %1; link adı: %2 + Bağlantı oluşturulamadı, hedef: %1; bağlantı adı: %2 Cannot set timezone, - Bölge ve zaman dilimi ayarlanmadı, + Zaman dilimi ayarlanamıyor, Cannot open /etc/timezone for writing - /etc/timezone açılamadığından düzenlenemedi + /etc/timezone yazmak için açılamıyor @@ -3688,7 +3629,7 @@ Output: Configure <pre>sudo</pre> users. - <pre>sudo</pre> kullanıcını yapılandır. + <pre>sudo</pre> kullanıcılarını yapılandır. @@ -3706,7 +3647,7 @@ Output: Shell Processes Job - Uçbirim İşlemleri + Kabuk Süreç İşleri @@ -3723,7 +3664,7 @@ Output: &OK - &TAMAM + &Tamam @@ -3738,7 +3679,7 @@ Output: &Cancel - &Vazgeç + İ&ptal @@ -3751,17 +3692,17 @@ Output: Installation feedback - Kurulum geribildirimi + Kurulum geri bildirimi Sending installation feedback. - Kurulum geribildirimi gönderiliyor. + Kurulum geri bildirimi gönderiliyor. Internal error in install-tracking. - Kurulum izlemede dahili hata. + Kurulum izlemede içsel hata. @@ -3790,12 +3731,12 @@ Output: Could not configure KDE user feedback correctly, script error %1. - KDE kullanıcı geri bildirimi doğru yapılandırılamadı, komut dosyası hatası %1. + KDE kullanıcı geri bildirimi doğru yapılandırılamadı, betik hatası %1. Could not configure KDE user feedback correctly, Calamares error %1. - KDE kullanıcı geri bildirimi doğru şekilde yapılandırılamadı, %1 Calamares hatası. + KDE kullanıcı geri bildirimi doğru şekilde yapılandırılamadı; Calamares hatası %1. @@ -3808,32 +3749,27 @@ Output: Configuring machine feedback. - Makine geribildirimini yapılandırma. + Makine geri bildirimini yapılandırılıyor. Error in machine feedback configuration. - Makine geri bildirim yapılandırma hatası var. + Makine geri bildirimi yapılandırmasında hata. Could not configure machine feedback correctly, script error %1. - Makine geribildirimi doğru yapılandırılamadı, betik hatası %1. + Makine geri bildirimi doğru yapılandırılamadı, betik hatası %1. Could not configure machine feedback correctly, Calamares error %1. - Makine geribildirimini doğru bir şekilde yapılandıramadı, Calamares hata %1. + Makine geri bildirimini doğru bir şekilde yapılandıramadı; Calamares hatası %1. TrackingPage - - - Form - Biçim - Placeholder @@ -3842,7 +3778,7 @@ Output: <html><head/><body><p>Click here to send <span style=" font-weight:600;">no information at all</span> about your installation.</p></body></html> - <html><head/><body><p>Buraya tıklayın <span style=" font-weight:600;">hiçbir bilgi göndermemek için</span> kurulan sisteminiz hakkında.</p></body></html> + <html><head/><body><p>Kurulumunuz hakkında <span style=" font-weight:600;">hiçbir bilgi</span> göndermemek için buraya tıklayın.</p></body></html> @@ -3852,22 +3788,22 @@ Output: Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area. - İzleme, %1 ne sıklıkla kurulduğunu, hangi donanıma kurulduğunu ve hangi uygulamaların kullanıldığını görmesine yardımcı olur. Nelerin gönderileceğini görmek için lütfen her bir alanın yanındaki yardım simgesini tıklayın. + İzleme, %1 yazılımının ne sıklıkla kurulduğunu, hangi donanıma kurulduğunu ve hangi uygulamaların kullanıldığını görmesine yardımcı olur. Nelerin gönderileceğini görmek için lütfen her bir alanın yanındaki yardım simgesine tıklayın. By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes. - Bunu seçerek kurulumunuz ve donanımınız hakkında bilgi göndereceksiniz. Bu bilgiler, kurulum bittikten sonra <b> yalnızca bir kez </b> gönderilecektir. + Bunu seçerek, kurulumunuz ve donanımınız hakkında bilgi göndereceksiniz. Bu bilgiler, kurulum bittikten sonra <b>yalnızca bir kez</b> gönderilecektir. By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. - Bunu seçerek, periyodik olarak %1'e <b> makine </b> kurulum, donanım ve uygulamalarınız hakkında bilgi gönderirsiniz. + Bunu seçerek, periyodik olarak %1 topluluğuna <b>makine</b> kurulumu, donanım ve uygulamalarınız hakkında bilgi gönderirsiniz. By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. - Bunu seçerek, <b> kullanıcı </b> kurulumunuz, donanımınız, uygulamalarınız ve uygulama kullanım alışkanlıklarınız hakkında düzenli olarak %1'e bilgi gönderirsiniz. + Bunu seçerek, <b>kullanıcı</b> kurulumunuz, donanımınız, uygulamalarınız ve uygulama kullanım alışkanlıklarınız hakkında düzenli olarak %1 topluluğuna bilgi gönderirsiniz. @@ -3875,7 +3811,7 @@ Output: Feedback - Geribildirim + Geri Bildirim @@ -3883,12 +3819,12 @@ Output: Unmount file systems. - Dosya sistemlerini ayırın. + Dosya sistemleri bağlantılarını kes. No target system available. - Mevcut hedef sistemi yok. + Kullanılabilir hedef sistem yok. @@ -3901,12 +3837,12 @@ Output: <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> - <small>Bu bilgisayarı birden fazla kişi kullanacaksa, kurulumdan sonra birden fazla kullanıcı hesabı oluşturabilirsiniz.</small> + <small>Bu bilgisayarı birden çok kişi kullanacaksa kurulumdan sonra birden çok kullanıcı hesabı oluşturabilirsiniz.</small> <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> - <small>Bu bilgisayarı birden fazla kişi kullanacaksa, kurulum bittikten sonra birden fazla kullanıcı hesabı oluşturabilirsiniz.</small> + <small>Bu bilgisayarı birden çok kişi kullanacaksa kurulumdan sonra birden çok kullanıcı hesabı oluşturabilirsiniz.</small> @@ -3914,7 +3850,7 @@ Output: Users - Kullanıcı Tercihleri + Kullanıcılar @@ -3922,7 +3858,7 @@ Output: Users - Kullanıcı Tercihleri + Kullanıcılar @@ -3945,47 +3881,47 @@ Output: Create Volume Group - Birim Grubu Oluştur + Disk Bölümü Grubu Oluştur List of Physical Volumes - Fiziksel Birimlerin Listesi + Fiziksel Disk Bölümlerinin Listesi Volume Group Name: - Birim Grubu Adı: + Disk bölümü grubu adı: Volume Group Type: - Birim Grubu Tipi: + Disk bölümü grubu türü: Physical Extent Size: - Fiziksel Genişleme Boyutu: + Fiziksel genişleme boyutu: MiB - MB + MiB Total Size: - Toplam Boyut: + Toplam boyut: Used Size: - Kullanılan Boyut: + Kullanılan oyut: Total Sectors: - Toplam Sektörler: + Toplam dilimler: @@ -3995,16 +3931,11 @@ Output: WelcomePage - - - Form - Biçim - Select application and system language - Uygulama ve sistem dilini seçin + Uygulama ve sistem dilini seç @@ -4014,12 +3945,12 @@ Output: &Donate - &Bağış + &Bağış Yap Open help and support website - Yardım ve destek web sitesini açın + Yardım ve destek web sitesini aç @@ -4039,7 +3970,7 @@ Output: Open release notes website - Sürüm Notları web sitesini aç + Sürüm notları web sitesini aç @@ -4049,17 +3980,17 @@ Output: %1 support - %1 destek + %1 desteği About %1 setup - %1 kurulum hakkında + %1 kurulumu hakkında About %1 installer - %1 sistem yükleyici hakkında + %1 kurulum programı hakkında @@ -4067,7 +3998,7 @@ Output: Welcome - Hoş geldiniz + Hoş Geldiniz @@ -4075,7 +4006,7 @@ Output: Welcome - Hoş geldiniz + Hoş Geldiniz @@ -4088,7 +4019,7 @@ Output: Failed to create zpool on - üzerinde zpool oluşturulamadı + Şurada zpool oluşturulamadı: @@ -4098,12 +4029,12 @@ Output: No partitions are available for ZFS. - ZFS için disk bölümü yok. + ZFS için kullanılabilir bölüntü yok. Internal data missing - Dahili veri eksik + İçsel veri eksik @@ -4139,7 +4070,7 @@ Output: Show information about Calamares - Calamares hakkında bilgilendirme göster + Calamares hakkında bilgi göster @@ -4159,12 +4090,12 @@ Output: %1 has been installed on your computer.<br/> You may now restart into your new system, or continue using the Live environment. %1 bilgisayarınıza kuruldu.<br/> - Kurduğunuz sistemi şimdi yeniden başlayabilir veya Canlı ortamı kullanmaya devam edebilirsiniz. + Kurduğunuz sistemi şimdi yeniden başlayabilir veya Canlı ortamı kullanmayı sürdürebilirsiniz. Close Installer - Kurucuyu Kapat + Kurulum Programını Kapat @@ -4191,7 +4122,7 @@ Output: %1 has been installed on your computer.<br/> You may now restart your device. %1 bilgisayarınıza kuruldu.<br/> - Artık cihazınızı yeniden başlatabilirsiniz. + Artık aygıtınızı yeniden başlatabilirsiniz. @@ -4214,7 +4145,7 @@ Output: <b>Keyboard Model:&nbsp;&nbsp;</b> - <b>Klavye Modeli:&nbsp;&nbsp;</b> + <b>Klavye modeli:&nbsp;&nbsp;</b> @@ -4229,7 +4160,7 @@ Output: Type here to test your keyboard - Klavye seçiminizi burada test edebilirsiniz + Klavye seçiminizi burada sınayabilirsiniz @@ -4245,14 +4176,14 @@ Output: <h3>Languages</h3> </br> The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>. <h3>Dil</h3> </br> - Sistem yerel ayarı, bazı komut satırı kullanıcı arabirimi öğeleri için dil ve karakter kümesini etkiler. Geçerli ayar <strong>%1</strong>. + Sistem yerel ayarı, bazı komut satırı kullanıcı arabirimi öğeleri için dil ve karakter kümesini etkiler. Geçerli ayar: <strong>%1</strong>. <h3>Locales</h3> </br> The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>. <h3>Yerel</h3> </br> - Sistem yerel ayarı, sayı ve tarih biçimini etkiler. Mevcut ayar <strong>%1</strong>. + Sistem yerel ayarı, sayı ve tarih biçimini etkiler. Geçerli ayar: <strong>%1</strong>. @@ -4277,12 +4208,12 @@ Output: LibreOffice - LibreOfis + LibreOffice If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives. - Bir ofis paketi yüklemek istemiyorsanız, Office Paketi Yok'u seçmeniz yeterlidir. İhtiyaç duyulduğunda, kurulu sisteminize her zaman bir (veya daha fazlasını) ekleyebilirsiniz. + Bir ofis paketi yüklemek istemiyorsanız Ofis Paketi Yok'u seçmeniz yeterlidir. Gereksinim duyulduğunda, kurulu sisteminize her zaman bir (veya daha fazlasını) ekleyebilirsiniz. @@ -4292,17 +4223,17 @@ Output: Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support. It will be just a desktop, file browser, package manager, text editor and simple web-browser. - Minimal bir Masaüstü kurulumu oluşturun, tüm ekstra uygulamaları kaldırın ve sisteminize ne eklemek istediğinize daha sonra karar verin. Böyle bir kurulumda nelerin olmayacağına dair örnekler, Ofis Takımı olmayacak, medya oynatıcı olmayacak, resim görüntüleyici veya baskı desteği olmayacak. Yalnızca bir masaüstü, dosya tarayıcısı, paket yöneticisi, metin düzenleyici ve basit web tarayıcısı olacak. + Minimal bir masaüstü kurulumu oluşturun, tüm ekstra uygulamaları kaldırın ve daha sonra sisteminize ne eklemek istediğinize karar verin. Böyle bir kurulumda olmayacağına dair örnekler, Ofis Paketi, Ortam Oynatıcısı, Görsel Görüntüleyicisi veya Yazdırma Desteği olmayacaktır. Sadece bir masaüstü, dosya tarayıcısı, paket yöneticisi, metin düzenleyicisi ve basit web tarayıcısı olacak. Minimal Install - Asgari Kurulum + Minimal Kurulum Please select an option for your install, or use the default: LibreOffice included. - Lütfen kurulum için bir seçenek seçin veya varsayılanı kullanın: LibreOffice dahildir. + Lütfen kurulum için bir seçenek seçin veya öntanımlıyı kullanın: LibreOffice içerilir. @@ -4339,7 +4270,7 @@ Output: <p><i>Yatık yazı</i></p> <p><u>Altı çizili yazı</u></p> <p><center>Ortaya hizalı yazı.</center></p> - <p><s>Üstü çizili yazı</s></p> + <p><s>Üzeri çizili yazı</s></p> <p>Kod örneği: <code>ls -l /home</code></p> @@ -4350,7 +4281,7 @@ Output: <li>AMD CPU sistemler</li> </ul> - <p>Dikey kaydırma çubuğu ayarlanabilir, mevcut genişlik 10 olarak ayarlanmıştır.</p> + <p>Dikey sarma çubuğu ayarlanabilir, geçerli genişlik 10 olarak ayarlanmıştır.</p> @@ -4378,27 +4309,27 @@ Output: What name do you want to use to log in? - Giriş için hangi adı kullanmak istersiniz? + Oturum açmak için hangi adı kullanmak istersiniz? Login Name - Kullanıcı adı + Oturum Açma Adı If more than one person will use this computer, you can create multiple accounts after installation. - Bu bilgisayarı birden fazla kişi kullanacaksa, kurulumdan sonra birden fazla hesap oluşturabilirsiniz. + Bu bilgisayarı birden çok kişi kullanacaksa kurulumdan sonra çoklu hesaplar oluşturabilirsiniz. Only lowercase letters, numbers, underscore and hyphen are allowed. - Sadece küçük harflere, sayılara, alt çizgi ve kısa çizgilere izin verilir. + Yalnızca küçük harflere, sayılara, alt çizgiye ve kısa çizgiye izin verilir. root is not allowed as username. - root kullanıcı adı olarak kulanılmasına izin verilmez. + root, uygun bir kullanıcı adı değildir. @@ -4418,22 +4349,22 @@ Output: localhost is not allowed as hostname. - localhost ana bilgisayar adı olarak kullanılmasına izin verilmez. + localhost, makine adı olarak uygun değil. Choose a password to keep your account safe. - Hesabınızın güvenliğini sağlamak için bir parola belirleyiniz. + Hesabınızın güvenliğini sağlamak için bir parola seçin. Password - Şifre + Parola Repeat Password - Şifreyi Tekrarla + Parolayı Yinele @@ -4448,12 +4379,12 @@ Output: When this box is checked, password-strength checking is done and you will not be able to use a weak password. - Bu kutu işaretlendiğinde parola gücü denetlenir ve zayıf bir parola kullanamazsınız. + Bu kutu işaretlendiğinde, parola gücü denetlenir ve zayıf bir parola kullanamazsınız. Log in automatically without asking for the password - Parola sormadan otomatik olarak oturum açın + Parola sormadan kendiliğinden oturum aç @@ -4463,27 +4394,27 @@ Output: Reuse user password as root password - Kullanıcı şifresini yetkili kök şifre olarak kullan + Kullanıcı parolasını yetkili kök parolası olarak yeniden kullan Use the same password for the administrator account. - Yönetici ile kullanıcı aynı şifreyi kullansın. + Yönetici hesabı için aynı parolayı kullanın. Choose a root password to keep your account safe. - Hesabınızı güvende tutmak için bir kök şifre seçin. + Hesabınızı güvende tutmak için bir kök parolası seçin. Root Password - Kök Şifre + Kök Parolası Repeat Root Password - Kök Şifresini Tekrarla + Kök Parolasını Yinele diff --git a/lang/calamares_uk.ts b/lang/calamares_uk.ts index b221551fc..50c15aeec 100644 --- a/lang/calamares_uk.ts +++ b/lang/calamares_uk.ts @@ -84,11 +84,6 @@ Calamares::DebugWindow - - - Form - Форма - GlobalStorage @@ -556,11 +551,6 @@ The installer will quit and all changes will be lost. ChoicePage - - - Form - Форма - Select storage de&vice: @@ -926,12 +916,12 @@ The installer will quit and all changes will be lost. Можна використовувати лише латинські літери, цифри, символи підкреслювання та дефіси. - + Your passwords do not match! Паролі не збігаються! - + OK! Гаразд! @@ -1468,11 +1458,6 @@ The installer will quit and all changes will be lost. EncryptWidget - - - Form - Форма - En&crypt system @@ -1578,11 +1563,6 @@ The installer will quit and all changes will be lost. FinishedPage - - - Form - Форма - &Restart now @@ -1933,11 +1913,6 @@ The installer will quit and all changes will be lost. LicensePage - - - Form - Форма - <h1>License Agreement</h1> @@ -2093,33 +2068,27 @@ The installer will quit and all changes will be lost. Налаштовуємо файл ключа LUKS. - - + + No partitions are defined. Не визначено жодного розділу. - - - + + Encrypted rootfs setup error Помилка налаштовування зашифрованих rootfs - + Root partition %1 is LUKS but no passphrase has been set. Кореневим розділом %1 є розділ LUKS, але пароль до нього не встановлено. - + Could not create LUKS key file for root partition %1. Не вдалося створити файл ключа LUKS для кореневого розділу %1. - - - Could not configure LUKS key file on partition %1. - Не вдалося налаштувати файл ключа LUKS на розділі %1. - MachineIdJob @@ -2624,18 +2593,13 @@ The installer will quit and all changes will be lost. Невідома помилка - + Password is empty Пароль є порожнім PackageChooserPage - - - Form - Форма - Product Name @@ -2677,11 +2641,6 @@ The installer will quit and all changes will be lost. Page_Keyboard - - - Form - Форма - Keyboard Model: @@ -2695,11 +2654,6 @@ The installer will quit and all changes will be lost. Page_UserSetup - - - Form - Форма - What is your name? @@ -2876,11 +2830,6 @@ The installer will quit and all changes will be lost. PartitionPage - - - Form - Форма - Storage de&vice: @@ -2990,72 +2939,72 @@ The installer will quit and all changes will be lost. Після: - + No EFI system partition configured Не налаштовано жодного системного розділу EFI - + EFI system partition configured incorrectly Системний розділ EFI налаштовано неправильно - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem. Для запуску %1 потрібен системний розділ EFI.<br/><br/>Щоб налаштувати системний розділ EFI, поверніться до попередніх пунктів і виберіть створення відповідної файлової системи. - + The filesystem must be mounted on <strong>%1</strong>. Файлову систему має бути змоновано до <strong>%1</strong>. - + The filesystem must have type FAT32. Файлова система має належати до типу FAT32. - + The filesystem must be at least %1 MiB in size. Розмір файлової системи має бути не меншим за %1 МіБ. - + The filesystem must have flag <strong>%1</strong> set. Для файлової системи має бути встановлено прапорець <strong>%1</strong>. - + You can continue without setting up an EFI system partition but your system may fail to start. Ви можете продовжити без встановлення системного розділу EFI, але це може призвести до неможливості запуску вашої операційної системи. - + Option to use GPT on BIOS Варіант із використанням GPT на BIOS - + A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>%2</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. Таблиця розділів GPT є найкращим варіантом для усіх систем. У цьому засобі для встановлення передбачено підтримку таких налаштувань і для систем із BIOS.<br/><br/>Щоб налаштувати таблицю розділів GPT на BIOS, (якщо цього ще не зроблено) поверніться і встановіть для таблиці розділів значення GPT, потім створіть неформатований розділ розміром 8 МБ з увімкненим прапорцем <strong>%2</strong>.<br/><br/>Неформатований розділ у 8 МБ не обов'язковим для запуску %1 у системі з BIOS і GPT. - + Boot partition not encrypted Завантажувальний розділ незашифрований - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. Було налаштовано окремий завантажувальний розділ поряд із зашифрованим кореневим розділом, але завантажувальний розділ незашифрований.<br/><br/>Існують проблеми з безпекою такого типу, оскільки важливі системні файли зберігаються на незашифрованому розділі.<br/>Ви можете продовжувати, якщо бажаєте, але розблокування файлової системи відбудеться пізніше під час запуску системи.<br/>Щоб зашифрувати завантажувальний розділ, поверніться і створіть його знов, обравши <strong>Зашифрувати</strong> у вікні створення розділів. - + has at least one disk device available. має принаймні один доступний дисковий пристрій. - + There are no partitions to install on. Немає розділів для встановлення. @@ -3076,11 +3025,6 @@ The installer will quit and all changes will be lost. PlasmaLnfPage - - - Form - Форма - Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. @@ -3848,11 +3792,6 @@ Output: TrackingPage - - - Form - Форма - Placeholder @@ -4014,11 +3953,6 @@ Output: WelcomePage - - - Form - Форма - diff --git a/lang/calamares_ur.ts b/lang/calamares_ur.ts index c057c1fc4..9dcf23a28 100644 --- a/lang/calamares_ur.ts +++ b/lang/calamares_ur.ts @@ -84,11 +84,6 @@ Calamares::DebugWindow - - - Form - - GlobalStorage @@ -546,11 +541,6 @@ The installer will quit and all changes will be lost. ChoicePage - - - Form - - Select storage de&vice: @@ -916,12 +906,12 @@ The installer will quit and all changes will be lost. - + Your passwords do not match! - + OK! @@ -1458,11 +1448,6 @@ The installer will quit and all changes will be lost. EncryptWidget - - - Form - - En&crypt system @@ -1568,11 +1553,6 @@ The installer will quit and all changes will be lost. FinishedPage - - - Form - - &Restart now @@ -1923,11 +1903,6 @@ The installer will quit and all changes will be lost. LicensePage - - - Form - - <h1>License Agreement</h1> @@ -2083,33 +2058,27 @@ The installer will quit and all changes will be lost. - - + + No partitions are defined. - - - + + Encrypted rootfs setup error - + Root partition %1 is LUKS but no passphrase has been set. - + Could not create LUKS key file for root partition %1. - - - Could not configure LUKS key file on partition %1. - - MachineIdJob @@ -2593,18 +2562,13 @@ The installer will quit and all changes will be lost. - + Password is empty PackageChooserPage - - - Form - - Product Name @@ -2646,11 +2610,6 @@ The installer will quit and all changes will be lost. Page_Keyboard - - - Form - - Keyboard Model: @@ -2664,11 +2623,6 @@ The installer will quit and all changes will be lost. Page_UserSetup - - - Form - - What is your name? @@ -2845,11 +2799,6 @@ The installer will quit and all changes will be lost. PartitionPage - - - Form - - Storage de&vice: @@ -2959,72 +2908,72 @@ The installer will quit and all changes will be lost. - + No EFI system partition configured - + EFI system partition configured incorrectly - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem. - + The filesystem must be mounted on <strong>%1</strong>. - + The filesystem must have type FAT32. - + The filesystem must be at least %1 MiB in size. - + The filesystem must have flag <strong>%1</strong> set. - + You can continue without setting up an EFI system partition but your system may fail to start. - + Option to use GPT on BIOS - + A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>%2</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. - + Boot partition not encrypted - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. - + has at least one disk device available. - + There are no partitions to install on. @@ -3045,11 +2994,6 @@ The installer will quit and all changes will be lost. PlasmaLnfPage - - - Form - - Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. @@ -3811,11 +3755,6 @@ Output: TrackingPage - - - Form - - Placeholder @@ -3977,11 +3916,6 @@ Output: WelcomePage - - - Form - - diff --git a/lang/calamares_uz.ts b/lang/calamares_uz.ts index 1334d0d80..441ea8d8f 100644 --- a/lang/calamares_uz.ts +++ b/lang/calamares_uz.ts @@ -84,11 +84,6 @@ Calamares::DebugWindow - - - Form - - GlobalStorage @@ -544,11 +539,6 @@ The installer will quit and all changes will be lost. ChoicePage - - - Form - - Select storage de&vice: @@ -914,12 +904,12 @@ The installer will quit and all changes will be lost. - + Your passwords do not match! - + OK! @@ -1456,11 +1446,6 @@ The installer will quit and all changes will be lost. EncryptWidget - - - Form - - En&crypt system @@ -1566,11 +1551,6 @@ The installer will quit and all changes will be lost. FinishedPage - - - Form - - &Restart now @@ -1921,11 +1901,6 @@ The installer will quit and all changes will be lost. LicensePage - - - Form - - <h1>License Agreement</h1> @@ -2081,33 +2056,27 @@ The installer will quit and all changes will be lost. - - + + No partitions are defined. - - - + + Encrypted rootfs setup error - + Root partition %1 is LUKS but no passphrase has been set. - + Could not create LUKS key file for root partition %1. - - - Could not configure LUKS key file on partition %1. - - MachineIdJob @@ -2582,18 +2551,13 @@ The installer will quit and all changes will be lost. - + Password is empty PackageChooserPage - - - Form - - Product Name @@ -2635,11 +2599,6 @@ The installer will quit and all changes will be lost. Page_Keyboard - - - Form - - Keyboard Model: @@ -2653,11 +2612,6 @@ The installer will quit and all changes will be lost. Page_UserSetup - - - Form - - What is your name? @@ -2834,11 +2788,6 @@ The installer will quit and all changes will be lost. PartitionPage - - - Form - - Storage de&vice: @@ -2948,72 +2897,72 @@ The installer will quit and all changes will be lost. - + No EFI system partition configured - + EFI system partition configured incorrectly - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem. - + The filesystem must be mounted on <strong>%1</strong>. - + The filesystem must have type FAT32. - + The filesystem must be at least %1 MiB in size. - + The filesystem must have flag <strong>%1</strong> set. - + You can continue without setting up an EFI system partition but your system may fail to start. - + Option to use GPT on BIOS - + A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>%2</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. - + Boot partition not encrypted - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. - + has at least one disk device available. - + There are no partitions to install on. @@ -3034,11 +2983,6 @@ The installer will quit and all changes will be lost. PlasmaLnfPage - - - Form - - Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. @@ -3800,11 +3744,6 @@ Output: TrackingPage - - - Form - - Placeholder @@ -3966,11 +3905,6 @@ Output: WelcomePage - - - Form - - diff --git a/lang/calamares_vi.ts b/lang/calamares_vi.ts index dedd4d29e..3ef160bcc 100644 --- a/lang/calamares_vi.ts +++ b/lang/calamares_vi.ts @@ -84,11 +84,6 @@ Calamares::DebugWindow - - - Form - Mẫu - GlobalStorage @@ -546,11 +541,6 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.< ChoicePage - - - Form - Biểu mẫu - Select storage de&vice: @@ -916,12 +906,12 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.< Chỉ cho phép các chữ cái, số, gạch dưới và gạch nối. - + Your passwords do not match! Mật khẩu nhập lại không khớp! - + OK! @@ -1458,11 +1448,6 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.< EncryptWidget - - - Form - Biểu mẫu - En&crypt system @@ -1568,11 +1553,6 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.< FinishedPage - - - Form - Biểu mẫu - &Restart now @@ -1923,11 +1903,6 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.< LicensePage - - - Form - Biểu mẫu - <h1>License Agreement</h1> @@ -2083,33 +2058,27 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.< Định cấu hình tệp khóa LUKS. - - + + No partitions are defined. Không có phân vùng nào được xác định. - - - + + Encrypted rootfs setup error Lỗi thiết lập rootfs mã hóa - + Root partition %1 is LUKS but no passphrase has been set. Phân vùng gốc %1 là LUKS nhưng không có cụm mật khẩu nào được đặt. - + Could not create LUKS key file for root partition %1. Không thể tạo tệp khóa LUKS cho phân vùng gốc %1. - - - Could not configure LUKS key file on partition %1. - Không thể định cấu hình tệp khóa LUKS trên phân vùng %1. - MachineIdJob @@ -2586,18 +2555,13 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.< Lỗi không xác định - + Password is empty Mật khẩu trống PackageChooserPage - - - Form - Biểu mẫu - Product Name @@ -2639,11 +2603,6 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.< Page_Keyboard - - - Form - Biểu mẫu - Keyboard Model: @@ -2657,11 +2616,6 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.< Page_UserSetup - - - Form - Mẫu - What is your name? @@ -2838,11 +2792,6 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.< PartitionPage - - - Form - Biểu mẫu - Storage de&vice: @@ -2952,72 +2901,72 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.< Sau: - + No EFI system partition configured Không có hệ thống phân vùng EFI được cài đặt - + EFI system partition configured incorrectly - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem. - + The filesystem must be mounted on <strong>%1</strong>. - + The filesystem must have type FAT32. - + The filesystem must be at least %1 MiB in size. - + The filesystem must have flag <strong>%1</strong> set. - + You can continue without setting up an EFI system partition but your system may fail to start. - + Option to use GPT on BIOS Lựa chọn dùng GPT trên BIOS - + A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>%2</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. - + Boot partition not encrypted Phân vùng khởi động không được mã hóa - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. Một phân vùng khởi động riêng biệt đã được thiết lập cùng với một phân vùng gốc được mã hóa, nhưng phân vùng khởi động không được mã hóa. <br/> <br/> Có những lo ngại về bảo mật với loại thiết lập này, vì các tệp hệ thống quan trọng được lưu giữ trên một phân vùng không được mã hóa . <br/> Bạn có thể tiếp tục nếu muốn, nhưng việc mở khóa hệ thống tệp sẽ diễn ra sau trong quá trình khởi động hệ thống. <br/> Để mã hóa phân vùng khởi động, hãy quay lại và tạo lại nó, chọn <strong> Mã hóa </strong> trong phân vùng cửa sổ tạo. - + has at least one disk device available. có sẵn ít nhất một thiết bị đĩa. - + There are no partitions to install on. Không có phân vùng để cài đặt. @@ -3038,11 +2987,6 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.< PlasmaLnfPage - - - Form - Biểu mẫu - Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. @@ -3810,11 +3754,6 @@ Output: TrackingPage - - - Form - Biểu mẫu - Placeholder @@ -3976,11 +3915,6 @@ Output: WelcomePage - - - Form - Biểu mẫu - diff --git a/lang/calamares_zh.ts b/lang/calamares_zh.ts index e5f93371e..0743cc6db 100644 --- a/lang/calamares_zh.ts +++ b/lang/calamares_zh.ts @@ -84,11 +84,6 @@ Calamares::DebugWindow - - - Form - - GlobalStorage @@ -544,11 +539,6 @@ The installer will quit and all changes will be lost. ChoicePage - - - Form - - Select storage de&vice: @@ -914,12 +904,12 @@ The installer will quit and all changes will be lost. - + Your passwords do not match! - + OK! @@ -1456,11 +1446,6 @@ The installer will quit and all changes will be lost. EncryptWidget - - - Form - - En&crypt system @@ -1566,11 +1551,6 @@ The installer will quit and all changes will be lost. FinishedPage - - - Form - - &Restart now @@ -1921,11 +1901,6 @@ The installer will quit and all changes will be lost. LicensePage - - - Form - - <h1>License Agreement</h1> @@ -2081,33 +2056,27 @@ The installer will quit and all changes will be lost. - - + + No partitions are defined. - - - + + Encrypted rootfs setup error - + Root partition %1 is LUKS but no passphrase has been set. - + Could not create LUKS key file for root partition %1. - - - Could not configure LUKS key file on partition %1. - - MachineIdJob @@ -2582,18 +2551,13 @@ The installer will quit and all changes will be lost. - + Password is empty PackageChooserPage - - - Form - - Product Name @@ -2635,11 +2599,6 @@ The installer will quit and all changes will be lost. Page_Keyboard - - - Form - - Keyboard Model: @@ -2653,11 +2612,6 @@ The installer will quit and all changes will be lost. Page_UserSetup - - - Form - - What is your name? @@ -2834,11 +2788,6 @@ The installer will quit and all changes will be lost. PartitionPage - - - Form - - Storage de&vice: @@ -2948,72 +2897,72 @@ The installer will quit and all changes will be lost. - + No EFI system partition configured - + EFI system partition configured incorrectly - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem. - + The filesystem must be mounted on <strong>%1</strong>. - + The filesystem must have type FAT32. - + The filesystem must be at least %1 MiB in size. - + The filesystem must have flag <strong>%1</strong> set. - + You can continue without setting up an EFI system partition but your system may fail to start. - + Option to use GPT on BIOS - + A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>%2</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. - + Boot partition not encrypted - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. - + has at least one disk device available. - + There are no partitions to install on. @@ -3034,11 +2983,6 @@ The installer will quit and all changes will be lost. PlasmaLnfPage - - - Form - - Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. @@ -3800,11 +3744,6 @@ Output: TrackingPage - - - Form - - Placeholder @@ -3966,11 +3905,6 @@ Output: WelcomePage - - - Form - - diff --git a/lang/calamares_zh_CN.ts b/lang/calamares_zh_CN.ts index 2a14ee6e5..50e2c0619 100644 --- a/lang/calamares_zh_CN.ts +++ b/lang/calamares_zh_CN.ts @@ -11,7 +11,7 @@ Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://app.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - + 感谢 <a href="https://calamares.io/team/">Calamares 团队</a> 和 <a href="https://app.transifex.com/calamares/calamares/">Calamares 翻译团队</a>。<br/> <br/> <a href="https://calamares.io/">Calamares</a> 项目由 <br/> <a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software 赞助开发。 @@ -85,11 +85,6 @@ Calamares::DebugWindow - - - Form - 表单 - GlobalStorage @@ -168,7 +163,7 @@ %p% Progress percentage indicator: %p is where the number 0..100 is placed - + %p% @@ -284,7 +279,7 @@ Requirements checking for module '%1' is complete. - + “%1”模块的需求检查完成。 @@ -311,7 +306,7 @@ Setup Failed - 安装失败 + 初始化失败 @@ -551,11 +546,6 @@ The installer will quit and all changes will be lost. ChoicePage - - - Form - 表单 - Select storage de&vice: @@ -838,17 +828,17 @@ The installer will quit and all changes will be lost. This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. - + 此计算机不满足安装 %1 的最低需求。<br/> 初始化无法继续。 This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. - + 此计算机木不满足安装 %1 的最低需求。<br/> 安装无法继续。 This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. - 此计算机不满足安装 %1 的部分推荐配置。<br/>安装可以继续,但是一些功能可能会被禁用。 + 此计算机不满足安装 %1 的部分推荐配置。<br/>初始化可以继续,但是一些功能可能会被禁用。 @@ -921,12 +911,12 @@ The installer will quit and all changes will be lost. 只允许字母、数组、下划线"_" 和 连字符"-" - + Your passwords do not match! 密码不匹配! - + OK! 确定 @@ -1464,11 +1454,6 @@ The installer will quit and all changes will be lost. EncryptWidget - - - Form - 表单 - En&crypt system @@ -1574,11 +1559,6 @@ The installer will quit and all changes will be lost. FinishedPage - - - Form - 表单 - &Restart now @@ -1929,11 +1909,6 @@ The installer will quit and all changes will be lost. LicensePage - - - Form - 表单 - <h1>License Agreement</h1> @@ -2089,33 +2064,27 @@ The installer will quit and all changes will be lost. 配置 LUKS key 文件。 - - + + No partitions are defined. 未定义分区。 - - - + + Encrypted rootfs setup error 加密根文件系时配置错误 - + Root partition %1 is LUKS but no passphrase has been set. 根分区%1为LUKS但没有设置密钥。 - + Could not create LUKS key file for root partition %1. 无法创建根分区%1的LUKS密钥文件。 - - - Could not configure LUKS key file on partition %1. - 无法配置根分区%1的LUKS密钥文件。 - MachineIdJob @@ -2592,18 +2561,13 @@ The installer will quit and all changes will be lost. 未知错误 - + Password is empty 密码是空 PackageChooserPage - - - Form - 表单 - Product Name @@ -2645,11 +2609,6 @@ The installer will quit and all changes will be lost. Page_Keyboard - - - Form - 窗体 - Keyboard Model: @@ -2663,11 +2622,6 @@ The installer will quit and all changes will be lost. Page_UserSetup - - - Form - 窗体 - What is your name? @@ -2844,11 +2798,6 @@ The installer will quit and all changes will be lost. PartitionPage - - - Form - 窗体 - Storage de&vice: @@ -2958,72 +2907,72 @@ The installer will quit and all changes will be lost. 之后: - + No EFI system partition configured 未配置 EFI 系统分区 - + EFI system partition configured incorrectly EFI系统分区配置错误 - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem. 启动 %1 必须需要 EFI 系統分区。<br/><br/>要設定 EFI 系统分区,返回并选择或者建立符合要求的分区。 - + The filesystem must be mounted on <strong>%1</strong>. 文件系统必须挂载于 <strong>%1</strong>。 - + The filesystem must have type FAT32. 此文件系统必须为FAT32 - + The filesystem must be at least %1 MiB in size. 文件系统必须要有%1 MiB 的大小。 - + The filesystem must have flag <strong>%1</strong> set. 文件系统必须设置 <strong>%1</strong> 标记。 - + You can continue without setting up an EFI system partition but your system may fail to start. 您可以在不设置EFI系统分区的情况下继续,但您的系統可能无法启动。 - + Option to use GPT on BIOS 在 BIOS 上使用 GPT - + A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>%2</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. GPT 分区表对所有系统都是最佳选项。此安装程序同时支持 BIOS 系统。<br/><br/>要在 BIOS 上配置 GPT 分区表(如果还没有完成的话),请回到上一步并将分区表设置为 GPT,然后创建 8 MB 的未格式化分区,并启用 <strong>%2</strong> 标记。<br/><br/>要在 BIOS 系统上使用 GPT 分区表启动 %1,必须要有该 8 MB 的未格式化分区。 - + Boot partition not encrypted 引导分区未加密 - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. 您尝试用单独的引导分区配合已加密的根分区使用,但引导分区未加密。<br/><br/>这种配置方式可能存在安全隐患,因为重要的系统文件存储在了未加密的分区上。<br/>您可以继续保持此配置,但是系统解密将在系统启动时而不是引导时进行。<br/>要加密引导分区,请返回上一步并重新创建此分区,并在分区创建窗口选中 <strong>加密</strong> 选项。 - + has at least one disk device available. 有至少一个可用的磁盘设备。 - + There are no partitions to install on. 无可用于安装的分区。 @@ -3044,11 +2993,6 @@ The installer will quit and all changes will be lost. PlasmaLnfPage - - - Form - 表单 - Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. @@ -3284,7 +3228,7 @@ Output: <p>This computer does not satisfy some of the recommended requirements for setting up %1.<br/> Setup can continue, but some features might be disabled.</p> <p>此计算机不满足安装 %1 的某些推荐配置。<br/> - 安装可以继续,但是一些特性可能被禁用。</p> + 初始化可以继续,但是一些特性可能被禁用。</p> @@ -3816,11 +3760,6 @@ Output: TrackingPage - - - Form - 表单 - Placeholder @@ -3982,11 +3921,6 @@ Output: WelcomePage - - - Form - 表单 - diff --git a/lang/calamares_zh_HK.ts b/lang/calamares_zh_HK.ts index d241c63ad..9540fd14b 100644 --- a/lang/calamares_zh_HK.ts +++ b/lang/calamares_zh_HK.ts @@ -84,11 +84,6 @@ Calamares::DebugWindow - - - Form - - GlobalStorage @@ -544,11 +539,6 @@ The installer will quit and all changes will be lost. ChoicePage - - - Form - - Select storage de&vice: @@ -914,12 +904,12 @@ The installer will quit and all changes will be lost. - + Your passwords do not match! - + OK! @@ -1456,11 +1446,6 @@ The installer will quit and all changes will be lost. EncryptWidget - - - Form - - En&crypt system @@ -1566,11 +1551,6 @@ The installer will quit and all changes will be lost. FinishedPage - - - Form - - &Restart now @@ -1921,11 +1901,6 @@ The installer will quit and all changes will be lost. LicensePage - - - Form - - <h1>License Agreement</h1> @@ -2081,33 +2056,27 @@ The installer will quit and all changes will be lost. - - + + No partitions are defined. - - - + + Encrypted rootfs setup error - + Root partition %1 is LUKS but no passphrase has been set. - + Could not create LUKS key file for root partition %1. - - - Could not configure LUKS key file on partition %1. - - MachineIdJob @@ -2582,18 +2551,13 @@ The installer will quit and all changes will be lost. - + Password is empty PackageChooserPage - - - Form - - Product Name @@ -2635,11 +2599,6 @@ The installer will quit and all changes will be lost. Page_Keyboard - - - Form - - Keyboard Model: @@ -2653,11 +2612,6 @@ The installer will quit and all changes will be lost. Page_UserSetup - - - Form - - What is your name? @@ -2834,11 +2788,6 @@ The installer will quit and all changes will be lost. PartitionPage - - - Form - - Storage de&vice: @@ -2948,72 +2897,72 @@ The installer will quit and all changes will be lost. - + No EFI system partition configured - + EFI system partition configured incorrectly - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem. - + The filesystem must be mounted on <strong>%1</strong>. - + The filesystem must have type FAT32. - + The filesystem must be at least %1 MiB in size. - + The filesystem must have flag <strong>%1</strong> set. - + You can continue without setting up an EFI system partition but your system may fail to start. - + Option to use GPT on BIOS - + A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>%2</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. - + Boot partition not encrypted - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. - + has at least one disk device available. - + There are no partitions to install on. @@ -3034,11 +2983,6 @@ The installer will quit and all changes will be lost. PlasmaLnfPage - - - Form - - Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. @@ -3800,11 +3744,6 @@ Output: TrackingPage - - - Form - - Placeholder @@ -3966,11 +3905,6 @@ Output: WelcomePage - - - Form - - diff --git a/lang/calamares_zh_TW.ts b/lang/calamares_zh_TW.ts index 992aa9f22..749114659 100644 --- a/lang/calamares_zh_TW.ts +++ b/lang/calamares_zh_TW.ts @@ -84,11 +84,6 @@ Calamares::DebugWindow - - - Form - 型式 - GlobalStorage @@ -550,11 +545,6 @@ The installer will quit and all changes will be lost. ChoicePage - - - Form - 表單 - Select storage de&vice: @@ -920,12 +910,12 @@ The installer will quit and all changes will be lost. 僅允許字母、數字、底線與連接號。 - + Your passwords do not match! 密碼不符! - + OK! 確定! @@ -1462,11 +1452,6 @@ The installer will quit and all changes will be lost. EncryptWidget - - - Form - 形式 - En&crypt system @@ -1572,11 +1557,6 @@ The installer will quit and all changes will be lost. FinishedPage - - - Form - 型式 - &Restart now @@ -1927,11 +1907,6 @@ The installer will quit and all changes will be lost. LicensePage - - - Form - 表單 - <h1>License Agreement</h1> @@ -2087,33 +2062,27 @@ The installer will quit and all changes will be lost. 正在設定 LUKS 金鑰檔案。 - - + + No partitions are defined. 沒有已定義的分割區。 - - - + + Encrypted rootfs setup error 已加密的 rootfs 設定錯誤 - + Root partition %1 is LUKS but no passphrase has been set. 根分割區 %1 為 LUKS 但沒有設定密碼。 - + Could not create LUKS key file for root partition %1. 無法為根分割區 %1 建立 LUKS 金鑰檔。 - - - Could not configure LUKS key file on partition %1. - 無法於分割區 %1 設定 LUKS 金鑰檔。 - MachineIdJob @@ -2590,18 +2559,13 @@ The installer will quit and all changes will be lost. 未知的錯誤 - + Password is empty 密碼為空 PackageChooserPage - - - Form - 形式 - Product Name @@ -2643,11 +2607,6 @@ The installer will quit and all changes will be lost. Page_Keyboard - - - Form - Form - Keyboard Model: @@ -2661,11 +2620,6 @@ The installer will quit and all changes will be lost. Page_UserSetup - - - Form - Form - What is your name? @@ -2842,11 +2796,6 @@ The installer will quit and all changes will be lost. PartitionPage - - - Form - Form - Storage de&vice: @@ -2956,72 +2905,72 @@ The installer will quit and all changes will be lost. 之後: - + No EFI system partition configured 未設定 EFI 系統分割區 - + EFI system partition configured incorrectly EFI 系統分割區設定不正確 - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem. 要啟動 %1 必須要有 EFI 系統分割區。<br/><br/>要設定 EFI 系統分割區,返回並選取或建立適合的檔案系統。 - + The filesystem must be mounted on <strong>%1</strong>. 檔案系統必須掛載於 <strong>%1</strong>。 - + The filesystem must have type FAT32. 檔案系統必須有類型 FAT32。 - + The filesystem must be at least %1 MiB in size. 檔案系統必須至少有 %1 MiB 的大小。 - + The filesystem must have flag <strong>%1</strong> set. 檔案系統必須有旗標 <strong>%1</strong> 設定。 - + You can continue without setting up an EFI system partition but your system may fail to start. 您可以在不設定 EFI 系統分割區的情況下繼續,但您的系統可能無法啟動。 - + Option to use GPT on BIOS 在 BIOS 上使用 GPT 的選項 - + A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>%2</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. GPT 分割表對所有系統都是最佳選項。此安裝程式同時也支援 BIOS 系統。<br/><br/>要在 BIOS 上設定 GPT 分割表,(如果還沒有完成的話)請回上一步並將分割表設定為 GPT,然後建立 8 MB 的未格式化分割區,並啟用 <strong>%2</strong> 旗標。<br/><br/>要在 BIOS 系統上使用 GPT 分割區啟動 %1 則必須使用未格式化的 8MB 分割區。 - + Boot partition not encrypted 開機分割區未加密 - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. 設定了單獨的開機分割區以及加密的根分割區,但是開機分割區並不會被加密。<br/><br/>這種設定可能會造成安全問題,因為重要的系統檔案是放在未加密的分割區中。<br/>您也可以繼續,但是檔案系統的解鎖會在系統啟動後才發生。<br/>要加密開機分割區,回到上一頁並重新建立它,並在分割區建立視窗選取<strong>加密</strong>。 - + has at least one disk device available. 有至少一個可用的磁碟裝置。 - + There are no partitions to install on. 沒有可用於安裝的分割區。 @@ -3042,11 +2991,6 @@ The installer will quit and all changes will be lost. PlasmaLnfPage - - - Form - 形式 - Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. @@ -3814,11 +3758,6 @@ Output: TrackingPage - - - Form - 形式 - Placeholder @@ -3980,11 +3919,6 @@ Output: WelcomePage - - - Form - 表單 - diff --git a/lang/python.pot b/lang/python.pot index 3f63ac700..ff75d12e7 100644 --- a/lang/python.pot +++ b/lang/python.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-08-28 23:53+0200\n" +"POT-Creation-Date: 2023-09-28 22:49+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -109,8 +109,8 @@ msgid "Writing fstab." msgstr "" #: src/modules/fstab/main.py:377 src/modules/fstab/main.py:383 -#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:267 -#: src/modules/initcpiocfg/main.py:271 src/modules/initramfscfg/main.py:85 +#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:256 +#: src/modules/initcpiocfg/main.py:260 src/modules/initramfscfg/main.py:85 #: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:140 #: src/modules/mount/main.py:329 src/modules/networkcfg/main.py:105 #: src/modules/openrcdmcryptcfg/main.py:72 @@ -146,11 +146,11 @@ msgstr "" msgid "Configuring mkinitcpio." msgstr "" -#: src/modules/initcpiocfg/main.py:268 +#: src/modules/initcpiocfg/main.py:257 msgid "No partitions are defined for
initcpiocfg
." msgstr "" -#: src/modules/initcpiocfg/main.py:272 +#: src/modules/initcpiocfg/main.py:261 msgid "No root mount point for
initcpiocfg
." msgstr "" diff --git a/lang/python/ar/LC_MESSAGES/python.po b/lang/python/ar/LC_MESSAGES/python.po index 5ac9e0035..d17af6636 100644 --- a/lang/python/ar/LC_MESSAGES/python.po +++ b/lang/python/ar/LC_MESSAGES/python.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-24 23:38+0200\n" +"POT-Creation-Date: 2023-08-28 23:53+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: aboodilankaboot, 2019\n" "Language-Team: Arabic (https://app.transifex.com/calamares/teams/20061/ar/)\n" @@ -26,63 +26,63 @@ msgstr "" msgid "Install bootloader." msgstr "تثبيت محمل الإقلاع" -#: src/modules/bootloader/main.py:640 +#: src/modules/bootloader/main.py:644 msgid "Failed to install grub, no partitions defined in global storage" msgstr "" -#: src/modules/bootloader/main.py:895 +#: src/modules/bootloader/main.py:899 msgid "Bootloader installation error" msgstr "" -#: src/modules/bootloader/main.py:896 +#: src/modules/bootloader/main.py:900 msgid "" "The bootloader could not be installed. The installation command " "
{!s}
returned error code {!s}." msgstr "" -#: src/modules/displaymanager/main.py:507 +#: src/modules/displaymanager/main.py:509 msgid "Cannot write LXDM configuration file" msgstr "فشلت كتابة ملف ضبط LXDM." -#: src/modules/displaymanager/main.py:508 +#: src/modules/displaymanager/main.py:510 msgid "LXDM config file {!s} does not exist" msgstr "ملف ضبط LXDM {!s} غير موجود" -#: src/modules/displaymanager/main.py:596 +#: src/modules/displaymanager/main.py:598 msgid "Cannot write LightDM configuration file" msgstr "فشلت كتابة ملف ضبط LightDM." -#: src/modules/displaymanager/main.py:597 +#: src/modules/displaymanager/main.py:599 msgid "LightDM config file {!s} does not exist" msgstr "ملف ضبط LightDM {!s} غير موجود" -#: src/modules/displaymanager/main.py:682 +#: src/modules/displaymanager/main.py:684 msgid "Cannot configure LightDM" msgstr "فشل ضبط LightDM" -#: src/modules/displaymanager/main.py:683 +#: src/modules/displaymanager/main.py:685 msgid "No LightDM greeter installed." msgstr "لم يتم تصيب LightDM" -#: src/modules/displaymanager/main.py:714 +#: src/modules/displaymanager/main.py:716 msgid "Cannot write SLIM configuration file" msgstr "فشلت كتابة ملف ضبط SLIM." -#: src/modules/displaymanager/main.py:715 +#: src/modules/displaymanager/main.py:717 msgid "SLIM config file {!s} does not exist" msgstr "ملف ضبط SLIM {!s} غير موجود" -#: src/modules/displaymanager/main.py:933 +#: src/modules/displaymanager/main.py:935 msgid "No display managers selected for the displaymanager module." msgstr "" -#: src/modules/displaymanager/main.py:934 +#: src/modules/displaymanager/main.py:936 msgid "" "The displaymanagers list is empty or undefined in both globalstorage and " "displaymanager.conf." msgstr "" -#: src/modules/displaymanager/main.py:1021 +#: src/modules/displaymanager/main.py:1023 msgid "Display manager configuration was incomplete" msgstr "إعداد مدير العرض لم يكتمل" @@ -113,8 +113,8 @@ msgid "Writing fstab." msgstr "" #: src/modules/fstab/main.py:377 src/modules/fstab/main.py:383 -#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:245 -#: src/modules/initcpiocfg/main.py:249 src/modules/initramfscfg/main.py:85 +#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:267 +#: src/modules/initcpiocfg/main.py:271 src/modules/initramfscfg/main.py:85 #: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:140 #: src/modules/mount/main.py:329 src/modules/networkcfg/main.py:105 #: src/modules/openrcdmcryptcfg/main.py:72 @@ -150,11 +150,11 @@ msgstr "جاري إعداد ساعة الهاردوير" msgid "Configuring mkinitcpio." msgstr "" -#: src/modules/initcpiocfg/main.py:246 +#: src/modules/initcpiocfg/main.py:268 msgid "No partitions are defined for
initcpiocfg
." msgstr "" -#: src/modules/initcpiocfg/main.py:250 +#: src/modules/initcpiocfg/main.py:272 msgid "No root mount point for
initcpiocfg
." msgstr "" @@ -242,24 +242,24 @@ msgstr[3] "" msgstr[4] "" msgstr[5] "" -#: src/modules/packages/main.py:725 src/modules/packages/main.py:737 -#: src/modules/packages/main.py:765 +#: src/modules/packages/main.py:740 src/modules/packages/main.py:752 +#: src/modules/packages/main.py:780 msgid "Package Manager error" msgstr "" -#: src/modules/packages/main.py:726 +#: src/modules/packages/main.py:741 msgid "" "The package manager could not prepare updates. The command
{!s}
" "returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:738 +#: src/modules/packages/main.py:753 msgid "" "The package manager could not update the system. The command
{!s}
" " returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:766 +#: src/modules/packages/main.py:781 msgid "" "The package manager could not make changes to the installed system. The " "command
{!s}
returned error code {!s}." diff --git a/lang/python/as/LC_MESSAGES/python.po b/lang/python/as/LC_MESSAGES/python.po index 0906db062..dfbf46ce7 100644 --- a/lang/python/as/LC_MESSAGES/python.po +++ b/lang/python/as/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-24 23:38+0200\n" +"POT-Creation-Date: 2023-08-28 23:53+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Deep Jyoti Choudhury , 2020\n" "Language-Team: Assamese (https://app.transifex.com/calamares/teams/20061/as/)\n" @@ -25,63 +25,63 @@ msgstr "" msgid "Install bootloader." msgstr "বুতলোডাৰ ইন্স্তল কৰক।" -#: src/modules/bootloader/main.py:640 +#: src/modules/bootloader/main.py:644 msgid "Failed to install grub, no partitions defined in global storage" msgstr "" -#: src/modules/bootloader/main.py:895 +#: src/modules/bootloader/main.py:899 msgid "Bootloader installation error" msgstr "" -#: src/modules/bootloader/main.py:896 +#: src/modules/bootloader/main.py:900 msgid "" "The bootloader could not be installed. The installation command " "
{!s}
returned error code {!s}." msgstr "" -#: src/modules/displaymanager/main.py:507 +#: src/modules/displaymanager/main.py:509 msgid "Cannot write LXDM configuration file" msgstr "LXDM কনফিগাৰেচন ফাইলত লিখিব নোৱাৰি" -#: src/modules/displaymanager/main.py:508 +#: src/modules/displaymanager/main.py:510 msgid "LXDM config file {!s} does not exist" msgstr "LXDM কনফিগ্ ফাইল {!s} উপস্থিত নাই" -#: src/modules/displaymanager/main.py:596 +#: src/modules/displaymanager/main.py:598 msgid "Cannot write LightDM configuration file" msgstr "LightDM কনফিগাৰেচন ফাইলত লিখিব নোৱাৰি" -#: src/modules/displaymanager/main.py:597 +#: src/modules/displaymanager/main.py:599 msgid "LightDM config file {!s} does not exist" msgstr "LightDM কনফিগ্ ফাইল {!s} উপস্থিত নাই" -#: src/modules/displaymanager/main.py:682 +#: src/modules/displaymanager/main.py:684 msgid "Cannot configure LightDM" msgstr "LightDM কনফিগাৰ কৰিব নোৱাৰি" -#: src/modules/displaymanager/main.py:683 +#: src/modules/displaymanager/main.py:685 msgid "No LightDM greeter installed." msgstr "কোনো LightDM স্ৱাগতকৰ্তা ইন্স্তল নাই।" -#: src/modules/displaymanager/main.py:714 +#: src/modules/displaymanager/main.py:716 msgid "Cannot write SLIM configuration file" msgstr "SLIM কনফিগাৰেচন ফাইলত লিখিব নোৱাৰি" -#: src/modules/displaymanager/main.py:715 +#: src/modules/displaymanager/main.py:717 msgid "SLIM config file {!s} does not exist" msgstr "SLIM কনফিগ্ ফাইল {!s} উপস্থিত নাই" -#: src/modules/displaymanager/main.py:933 +#: src/modules/displaymanager/main.py:935 msgid "No display managers selected for the displaymanager module." msgstr "displaymanager মডিউলৰ বাবে কোনো ডিস্প্লে প্ৰবন্ধক নাই।" -#: src/modules/displaymanager/main.py:934 +#: src/modules/displaymanager/main.py:936 msgid "" "The displaymanagers list is empty or undefined in both globalstorage and " "displaymanager.conf." msgstr "" -#: src/modules/displaymanager/main.py:1021 +#: src/modules/displaymanager/main.py:1023 msgid "Display manager configuration was incomplete" msgstr "ডিস্প্লে প্ৰবন্ধক কন্ফিগাৰেচন অসমাপ্ত" @@ -112,8 +112,8 @@ msgid "Writing fstab." msgstr "fstab লিখি আছে।" #: src/modules/fstab/main.py:377 src/modules/fstab/main.py:383 -#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:245 -#: src/modules/initcpiocfg/main.py:249 src/modules/initramfscfg/main.py:85 +#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:267 +#: src/modules/initcpiocfg/main.py:271 src/modules/initramfscfg/main.py:85 #: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:140 #: src/modules/mount/main.py:329 src/modules/networkcfg/main.py:105 #: src/modules/openrcdmcryptcfg/main.py:72 @@ -149,11 +149,11 @@ msgstr "হাৰ্ডৱেৰৰ ঘড়ী চেত্ কৰি আছ msgid "Configuring mkinitcpio." msgstr "mkinitcpio কনফিগাৰ কৰি আছে।" -#: src/modules/initcpiocfg/main.py:246 +#: src/modules/initcpiocfg/main.py:268 msgid "No partitions are defined for
initcpiocfg
." msgstr "" -#: src/modules/initcpiocfg/main.py:250 +#: src/modules/initcpiocfg/main.py:272 msgid "No root mount point for
initcpiocfg
." msgstr "" @@ -233,24 +233,24 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "Removing one package." msgstr[1] "%(num)d পেকেজবোৰ আতৰোৱা হৈ আছে।" -#: src/modules/packages/main.py:725 src/modules/packages/main.py:737 -#: src/modules/packages/main.py:765 +#: src/modules/packages/main.py:740 src/modules/packages/main.py:752 +#: src/modules/packages/main.py:780 msgid "Package Manager error" msgstr "" -#: src/modules/packages/main.py:726 +#: src/modules/packages/main.py:741 msgid "" "The package manager could not prepare updates. The command
{!s}
" "returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:738 +#: src/modules/packages/main.py:753 msgid "" "The package manager could not update the system. The command
{!s}
" " returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:766 +#: src/modules/packages/main.py:781 msgid "" "The package manager could not make changes to the installed system. The " "command
{!s}
returned error code {!s}." diff --git a/lang/python/ast/LC_MESSAGES/python.po b/lang/python/ast/LC_MESSAGES/python.po index bb805a60d..1c7f813b5 100644 --- a/lang/python/ast/LC_MESSAGES/python.po +++ b/lang/python/ast/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-24 23:38+0200\n" +"POT-Creation-Date: 2023-08-28 23:53+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: enolp , 2020\n" "Language-Team: Asturian (https://app.transifex.com/calamares/teams/20061/ast/)\n" @@ -25,63 +25,63 @@ msgstr "" msgid "Install bootloader." msgstr "Instalando'l xestor d'arrinque." -#: src/modules/bootloader/main.py:640 +#: src/modules/bootloader/main.py:644 msgid "Failed to install grub, no partitions defined in global storage" msgstr "" -#: src/modules/bootloader/main.py:895 +#: src/modules/bootloader/main.py:899 msgid "Bootloader installation error" msgstr "" -#: src/modules/bootloader/main.py:896 +#: src/modules/bootloader/main.py:900 msgid "" "The bootloader could not be installed. The installation command " "
{!s}
returned error code {!s}." msgstr "" -#: src/modules/displaymanager/main.py:507 +#: src/modules/displaymanager/main.py:509 msgid "Cannot write LXDM configuration file" msgstr "Nun pue escribise'l ficheru de configuración de LXDM" -#: src/modules/displaymanager/main.py:508 +#: src/modules/displaymanager/main.py:510 msgid "LXDM config file {!s} does not exist" msgstr "Nun esiste'l ficheru de configuración de LXDM {!s}" -#: src/modules/displaymanager/main.py:596 +#: src/modules/displaymanager/main.py:598 msgid "Cannot write LightDM configuration file" msgstr "Nun pue escribise'l ficheru de configuración de LightDM" -#: src/modules/displaymanager/main.py:597 +#: src/modules/displaymanager/main.py:599 msgid "LightDM config file {!s} does not exist" msgstr "Nun esiste'l ficheru de configuración de LightDM {!s}" -#: src/modules/displaymanager/main.py:682 +#: src/modules/displaymanager/main.py:684 msgid "Cannot configure LightDM" msgstr "Nun pue configurase LightDM" -#: src/modules/displaymanager/main.py:683 +#: src/modules/displaymanager/main.py:685 msgid "No LightDM greeter installed." msgstr "Nun s'instaló nengún saludador de LightDM." -#: src/modules/displaymanager/main.py:714 +#: src/modules/displaymanager/main.py:716 msgid "Cannot write SLIM configuration file" msgstr "Nun pue escribise'l ficheru de configuración de SLIM" -#: src/modules/displaymanager/main.py:715 +#: src/modules/displaymanager/main.py:717 msgid "SLIM config file {!s} does not exist" msgstr "Nun esiste'l ficheru de configuración de SLIM {!s}" -#: src/modules/displaymanager/main.py:933 +#: src/modules/displaymanager/main.py:935 msgid "No display managers selected for the displaymanager module." msgstr "Nun s'esbillaron xestores de pantalles pal módulu displaymanager." -#: src/modules/displaymanager/main.py:934 +#: src/modules/displaymanager/main.py:936 msgid "" "The displaymanagers list is empty or undefined in both globalstorage and " "displaymanager.conf." msgstr "" -#: src/modules/displaymanager/main.py:1021 +#: src/modules/displaymanager/main.py:1023 msgid "Display manager configuration was incomplete" msgstr "La configuración del xestor de pantalles nun se completó" @@ -112,8 +112,8 @@ msgid "Writing fstab." msgstr "" #: src/modules/fstab/main.py:377 src/modules/fstab/main.py:383 -#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:245 -#: src/modules/initcpiocfg/main.py:249 src/modules/initramfscfg/main.py:85 +#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:267 +#: src/modules/initcpiocfg/main.py:271 src/modules/initramfscfg/main.py:85 #: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:140 #: src/modules/mount/main.py:329 src/modules/networkcfg/main.py:105 #: src/modules/openrcdmcryptcfg/main.py:72 @@ -149,11 +149,11 @@ msgstr "Configurando'l reló de hardware." msgid "Configuring mkinitcpio." msgstr "Configurando mkinitcpio." -#: src/modules/initcpiocfg/main.py:246 +#: src/modules/initcpiocfg/main.py:268 msgid "No partitions are defined for
initcpiocfg
." msgstr "" -#: src/modules/initcpiocfg/main.py:250 +#: src/modules/initcpiocfg/main.py:272 msgid "No root mount point for
initcpiocfg
." msgstr "" @@ -233,24 +233,24 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "Desaniciando un paquete." msgstr[1] "Desaniciando %(num)d paquetes." -#: src/modules/packages/main.py:725 src/modules/packages/main.py:737 -#: src/modules/packages/main.py:765 +#: src/modules/packages/main.py:740 src/modules/packages/main.py:752 +#: src/modules/packages/main.py:780 msgid "Package Manager error" msgstr "" -#: src/modules/packages/main.py:726 +#: src/modules/packages/main.py:741 msgid "" "The package manager could not prepare updates. The command
{!s}
" "returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:738 +#: src/modules/packages/main.py:753 msgid "" "The package manager could not update the system. The command
{!s}
" " returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:766 +#: src/modules/packages/main.py:781 msgid "" "The package manager could not make changes to the installed system. The " "command
{!s}
returned error code {!s}." diff --git a/lang/python/az/LC_MESSAGES/python.po b/lang/python/az/LC_MESSAGES/python.po index cb0c06526..d616a4a98 100644 --- a/lang/python/az/LC_MESSAGES/python.po +++ b/lang/python/az/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-24 23:38+0200\n" +"POT-Creation-Date: 2023-08-28 23:53+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Xəyyam Qocayev , 2023\n" "Language-Team: Azerbaijani (https://app.transifex.com/calamares/teams/20061/az/)\n" @@ -25,15 +25,15 @@ msgstr "" msgid "Install bootloader." msgstr "Önyükləyici qurulur." -#: src/modules/bootloader/main.py:640 +#: src/modules/bootloader/main.py:644 msgid "Failed to install grub, no partitions defined in global storage" msgstr "Grub quraşdırılmadı, ümumi yaddaş üçün bölmələr təyin olunmayıb" -#: src/modules/bootloader/main.py:895 +#: src/modules/bootloader/main.py:899 msgid "Bootloader installation error" msgstr "Önyükləyicinin quraşdırılmasında xəta" -#: src/modules/bootloader/main.py:896 +#: src/modules/bootloader/main.py:900 msgid "" "The bootloader could not be installed. The installation command " "
{!s}
returned error code {!s}." @@ -41,43 +41,43 @@ msgstr "" "Önyükləyici quraşdırıla bilmədi. Quraşdırma əmri
{!s}
, xəta kodu " "{!s} ilə cavab verdi." -#: src/modules/displaymanager/main.py:507 +#: src/modules/displaymanager/main.py:509 msgid "Cannot write LXDM configuration file" msgstr "LXDM tənzimləmə faylı yazıla bilmir" -#: src/modules/displaymanager/main.py:508 +#: src/modules/displaymanager/main.py:510 msgid "LXDM config file {!s} does not exist" msgstr "LXDM tənzimləmə faylı {!s} mövcud deyil" -#: src/modules/displaymanager/main.py:596 +#: src/modules/displaymanager/main.py:598 msgid "Cannot write LightDM configuration file" msgstr "LightDM tənzimləmə faylı yazıla bilmir" -#: src/modules/displaymanager/main.py:597 +#: src/modules/displaymanager/main.py:599 msgid "LightDM config file {!s} does not exist" msgstr "LightDM tənzimləmə faylı {!s} mövcud deyil" -#: src/modules/displaymanager/main.py:682 +#: src/modules/displaymanager/main.py:684 msgid "Cannot configure LightDM" msgstr "LightDM tənzimlənə bilmir" -#: src/modules/displaymanager/main.py:683 +#: src/modules/displaymanager/main.py:685 msgid "No LightDM greeter installed." msgstr "LightDM qarşılama quraşdırılmayıb." -#: src/modules/displaymanager/main.py:714 +#: src/modules/displaymanager/main.py:716 msgid "Cannot write SLIM configuration file" msgstr "SLİM tənzimləmə faylı yazıla bilmir" -#: src/modules/displaymanager/main.py:715 +#: src/modules/displaymanager/main.py:717 msgid "SLIM config file {!s} does not exist" msgstr "SLİM tənzimləmə faylı {!s} mövcud deyil" -#: src/modules/displaymanager/main.py:933 +#: src/modules/displaymanager/main.py:935 msgid "No display managers selected for the displaymanager module." msgstr "displaymanager modulu üçün ekran menecerləri seçilməyib." -#: src/modules/displaymanager/main.py:934 +#: src/modules/displaymanager/main.py:936 msgid "" "The displaymanagers list is empty or undefined in both globalstorage and " "displaymanager.conf." @@ -85,7 +85,7 @@ msgstr "" "Ekran menecerləri siyahısı həm qlobal yaddaşda, həm də displaymanager.conf-" "da boşdur və ya təyin olunmamışdır." -#: src/modules/displaymanager/main.py:1021 +#: src/modules/displaymanager/main.py:1023 msgid "Display manager configuration was incomplete" msgstr "Ekran meneceri tənzimləmələri başa çatmadı" @@ -118,8 +118,8 @@ msgid "Writing fstab." msgstr "fstab yazılır." #: src/modules/fstab/main.py:377 src/modules/fstab/main.py:383 -#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:245 -#: src/modules/initcpiocfg/main.py:249 src/modules/initramfscfg/main.py:85 +#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:267 +#: src/modules/initcpiocfg/main.py:271 src/modules/initramfscfg/main.py:85 #: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:140 #: src/modules/mount/main.py:329 src/modules/networkcfg/main.py:105 #: src/modules/openrcdmcryptcfg/main.py:72 @@ -158,11 +158,11 @@ msgstr "Aparat saatını ayarlamaq." msgid "Configuring mkinitcpio." msgstr "mkinitcpio tənzimlənir." -#: src/modules/initcpiocfg/main.py:246 +#: src/modules/initcpiocfg/main.py:268 msgid "No partitions are defined for
initcpiocfg
." msgstr "
initcpiocfg
üçün bölmə müəyyən edilən bölmə yoxdur." -#: src/modules/initcpiocfg/main.py:250 +#: src/modules/initcpiocfg/main.py:272 msgid "No root mount point for
initcpiocfg
." msgstr "
initcpiocfg
üçün kök (root) qoşulma nöqtəsi yoxdur." @@ -242,12 +242,12 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "Bir paket silinir" msgstr[1] "%(num)d paket silinir." -#: src/modules/packages/main.py:725 src/modules/packages/main.py:737 -#: src/modules/packages/main.py:765 +#: src/modules/packages/main.py:740 src/modules/packages/main.py:752 +#: src/modules/packages/main.py:780 msgid "Package Manager error" msgstr "Paket meneceri xətası" -#: src/modules/packages/main.py:726 +#: src/modules/packages/main.py:741 msgid "" "The package manager could not prepare updates. The command
{!s}
" "returned error code {!s}." @@ -255,7 +255,7 @@ msgstr "" "Bu paket meneceri yenilənmələri hazırlaya bilmədi.
{!s}
əmri xəta" " kodu {!s} ilə cavab verdi." -#: src/modules/packages/main.py:738 +#: src/modules/packages/main.py:753 msgid "" "The package manager could not update the system. The command
{!s}
" " returned error code {!s}." @@ -263,7 +263,7 @@ msgstr "" "Paket meneceri sistemi yeniləyə bimədi.
{!s}
əmri xəta kodu {!s} " "ilə cavab verdi." -#: src/modules/packages/main.py:766 +#: src/modules/packages/main.py:781 msgid "" "The package manager could not make changes to the installed system. The " "command
{!s}
returned error code {!s}." diff --git a/lang/python/az_AZ/LC_MESSAGES/python.po b/lang/python/az_AZ/LC_MESSAGES/python.po index cb04c9f26..58dfd5421 100644 --- a/lang/python/az_AZ/LC_MESSAGES/python.po +++ b/lang/python/az_AZ/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-24 23:38+0200\n" +"POT-Creation-Date: 2023-08-28 23:53+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Xəyyam Qocayev , 2023\n" "Language-Team: Azerbaijani (Azerbaijan) (https://app.transifex.com/calamares/teams/20061/az_AZ/)\n" @@ -25,15 +25,15 @@ msgstr "" msgid "Install bootloader." msgstr "Önyükləyici qurulur." -#: src/modules/bootloader/main.py:640 +#: src/modules/bootloader/main.py:644 msgid "Failed to install grub, no partitions defined in global storage" msgstr "Grub quraşdırılmadı, ümumi yaddaş üçün bölmələr təyin olunmayıb" -#: src/modules/bootloader/main.py:895 +#: src/modules/bootloader/main.py:899 msgid "Bootloader installation error" msgstr "Önyükləyicinin quraşdırılmasında xəta" -#: src/modules/bootloader/main.py:896 +#: src/modules/bootloader/main.py:900 msgid "" "The bootloader could not be installed. The installation command " "
{!s}
returned error code {!s}." @@ -41,43 +41,43 @@ msgstr "" "Önyükləyici quraşdırıla bilmədi. Quraşdırma əmri
{!s}
, xəta kodu " "{!s} ilə cavab verdi." -#: src/modules/displaymanager/main.py:507 +#: src/modules/displaymanager/main.py:509 msgid "Cannot write LXDM configuration file" msgstr "LXDM tənzimləmə faylı yazıla bilmir" -#: src/modules/displaymanager/main.py:508 +#: src/modules/displaymanager/main.py:510 msgid "LXDM config file {!s} does not exist" msgstr "LXDM tənzimləmə faylı {!s} mövcud deyil" -#: src/modules/displaymanager/main.py:596 +#: src/modules/displaymanager/main.py:598 msgid "Cannot write LightDM configuration file" msgstr "LightDM tənzimləmə faylı yazıla bilmir" -#: src/modules/displaymanager/main.py:597 +#: src/modules/displaymanager/main.py:599 msgid "LightDM config file {!s} does not exist" msgstr "LightDM tənzimləmə faylı {!s} mövcud deyil" -#: src/modules/displaymanager/main.py:682 +#: src/modules/displaymanager/main.py:684 msgid "Cannot configure LightDM" msgstr "LightDM tənzimlənə bilmir" -#: src/modules/displaymanager/main.py:683 +#: src/modules/displaymanager/main.py:685 msgid "No LightDM greeter installed." msgstr "LightDM qarşılama quraşdırılmayıb." -#: src/modules/displaymanager/main.py:714 +#: src/modules/displaymanager/main.py:716 msgid "Cannot write SLIM configuration file" msgstr "SLİM tənzimləmə faylı yazıla bilmir" -#: src/modules/displaymanager/main.py:715 +#: src/modules/displaymanager/main.py:717 msgid "SLIM config file {!s} does not exist" msgstr "SLİM tənzimləmə faylı {!s} mövcud deyil" -#: src/modules/displaymanager/main.py:933 +#: src/modules/displaymanager/main.py:935 msgid "No display managers selected for the displaymanager module." msgstr "displaymanager modulu üçün ekran menecerləri seçilməyib." -#: src/modules/displaymanager/main.py:934 +#: src/modules/displaymanager/main.py:936 msgid "" "The displaymanagers list is empty or undefined in both globalstorage and " "displaymanager.conf." @@ -85,7 +85,7 @@ msgstr "" "Ekran menecerləri siyahısı həm qlobal yaddaşda, həm də displaymanager.conf-" "da boşdur və ya təyin olunmamışdır." -#: src/modules/displaymanager/main.py:1021 +#: src/modules/displaymanager/main.py:1023 msgid "Display manager configuration was incomplete" msgstr "Ekran meneceri tənzimləmələri başa çatmadı" @@ -118,8 +118,8 @@ msgid "Writing fstab." msgstr "fstab yazılır." #: src/modules/fstab/main.py:377 src/modules/fstab/main.py:383 -#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:245 -#: src/modules/initcpiocfg/main.py:249 src/modules/initramfscfg/main.py:85 +#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:267 +#: src/modules/initcpiocfg/main.py:271 src/modules/initramfscfg/main.py:85 #: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:140 #: src/modules/mount/main.py:329 src/modules/networkcfg/main.py:105 #: src/modules/openrcdmcryptcfg/main.py:72 @@ -158,11 +158,11 @@ msgstr "Aparat saatını ayarlamaq." msgid "Configuring mkinitcpio." msgstr "mkinitcpio tənzimlənir." -#: src/modules/initcpiocfg/main.py:246 +#: src/modules/initcpiocfg/main.py:268 msgid "No partitions are defined for
initcpiocfg
." msgstr "
initcpiocfg
üçün bölmə müəyyən edilən bölmə yoxdur." -#: src/modules/initcpiocfg/main.py:250 +#: src/modules/initcpiocfg/main.py:272 msgid "No root mount point for
initcpiocfg
." msgstr "
initcpiocfg
üçün kök (root) qoşulma nöqtəsi yoxdur." @@ -242,12 +242,12 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "Bir paket silinir" msgstr[1] "%(num)d paket silinir." -#: src/modules/packages/main.py:725 src/modules/packages/main.py:737 -#: src/modules/packages/main.py:765 +#: src/modules/packages/main.py:740 src/modules/packages/main.py:752 +#: src/modules/packages/main.py:780 msgid "Package Manager error" msgstr "Paket meneceri xətası" -#: src/modules/packages/main.py:726 +#: src/modules/packages/main.py:741 msgid "" "The package manager could not prepare updates. The command
{!s}
" "returned error code {!s}." @@ -255,7 +255,7 @@ msgstr "" "Bu paket meneceri yenilənmələri hazırlaya bilmədi.
{!s}
əmri xəta" " kodu {!s} ilə cavab verdi." -#: src/modules/packages/main.py:738 +#: src/modules/packages/main.py:753 msgid "" "The package manager could not update the system. The command
{!s}
" " returned error code {!s}." @@ -263,7 +263,7 @@ msgstr "" "Paket meneceri sistemi yeniləyə bimədi.
{!s}
əmri xəta kodu {!s} " "ilə cavab verdi." -#: src/modules/packages/main.py:766 +#: src/modules/packages/main.py:781 msgid "" "The package manager could not make changes to the installed system. The " "command
{!s}
returned error code {!s}." diff --git a/lang/python/be/LC_MESSAGES/python.po b/lang/python/be/LC_MESSAGES/python.po index 815c42806..0ba18e0bd 100644 --- a/lang/python/be/LC_MESSAGES/python.po +++ b/lang/python/be/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-24 23:38+0200\n" +"POT-Creation-Date: 2023-08-28 23:53+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Źmicier Turok , 2022\n" "Language-Team: Belarusian (https://app.transifex.com/calamares/teams/20061/be/)\n" @@ -25,16 +25,16 @@ msgstr "" msgid "Install bootloader." msgstr "Усталяваць загрузчык." -#: src/modules/bootloader/main.py:640 +#: src/modules/bootloader/main.py:644 msgid "Failed to install grub, no partitions defined in global storage" msgstr "" "Не ўдалося ўсталяваць grub, у глабальным сховішчы не вызначаны раздзелы" -#: src/modules/bootloader/main.py:895 +#: src/modules/bootloader/main.py:899 msgid "Bootloader installation error" msgstr "Не ўдалося ўсталяваць загрузчык" -#: src/modules/bootloader/main.py:896 +#: src/modules/bootloader/main.py:900 msgid "" "The bootloader could not be installed. The installation command " "
{!s}
returned error code {!s}." @@ -42,43 +42,43 @@ msgstr "" "Не ўдалося ўсталяваць загрузчык. Загад усталявання
{!s}
вярнуў " "код памылкі {!s}." -#: src/modules/displaymanager/main.py:507 +#: src/modules/displaymanager/main.py:509 msgid "Cannot write LXDM configuration file" msgstr "Немагчыма запісаць файл канфігурацыі LXDM" -#: src/modules/displaymanager/main.py:508 +#: src/modules/displaymanager/main.py:510 msgid "LXDM config file {!s} does not exist" msgstr "Файл канфігурацыі LXDM {!s} не існуе" -#: src/modules/displaymanager/main.py:596 +#: src/modules/displaymanager/main.py:598 msgid "Cannot write LightDM configuration file" msgstr "Немагчыма запісаць файл канфігурацыі LightDM" -#: src/modules/displaymanager/main.py:597 +#: src/modules/displaymanager/main.py:599 msgid "LightDM config file {!s} does not exist" msgstr "Файл канфігурацыі LightDM {!s} не існуе" -#: src/modules/displaymanager/main.py:682 +#: src/modules/displaymanager/main.py:684 msgid "Cannot configure LightDM" msgstr "Немагчыма наладзіць LightDM" -#: src/modules/displaymanager/main.py:683 +#: src/modules/displaymanager/main.py:685 msgid "No LightDM greeter installed." msgstr "LightDM greeter не ўсталяваны." -#: src/modules/displaymanager/main.py:714 +#: src/modules/displaymanager/main.py:716 msgid "Cannot write SLIM configuration file" msgstr "Немагчыма запісаць файл канфігурацыі SLIM" -#: src/modules/displaymanager/main.py:715 +#: src/modules/displaymanager/main.py:717 msgid "SLIM config file {!s} does not exist" msgstr "Файл канфігурацыі SLIM {!s} не існуе" -#: src/modules/displaymanager/main.py:933 +#: src/modules/displaymanager/main.py:935 msgid "No display managers selected for the displaymanager module." msgstr "У модулі кіраўнікоў дысплэяў нічога не абрана." -#: src/modules/displaymanager/main.py:934 +#: src/modules/displaymanager/main.py:936 msgid "" "The displaymanagers list is empty or undefined in both globalstorage and " "displaymanager.conf." @@ -86,7 +86,7 @@ msgstr "" "Спіс кіраўнікоў дысплэяў пусты альбо не вызначаны ў both globalstorage і " "displaymanager.conf." -#: src/modules/displaymanager/main.py:1021 +#: src/modules/displaymanager/main.py:1023 msgid "Display manager configuration was incomplete" msgstr "Наладжванне кіраўніка дысплэяў не завершана" @@ -117,8 +117,8 @@ msgid "Writing fstab." msgstr "Запіс fstab." #: src/modules/fstab/main.py:377 src/modules/fstab/main.py:383 -#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:245 -#: src/modules/initcpiocfg/main.py:249 src/modules/initramfscfg/main.py:85 +#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:267 +#: src/modules/initcpiocfg/main.py:271 src/modules/initramfscfg/main.py:85 #: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:140 #: src/modules/mount/main.py:329 src/modules/networkcfg/main.py:105 #: src/modules/openrcdmcryptcfg/main.py:72 @@ -155,11 +155,11 @@ msgstr "Наладжванне апаратнага гадзінніка." msgid "Configuring mkinitcpio." msgstr "Наладжванне mkinitcpio." -#: src/modules/initcpiocfg/main.py:246 +#: src/modules/initcpiocfg/main.py:268 msgid "No partitions are defined for
initcpiocfg
." msgstr "" -#: src/modules/initcpiocfg/main.py:250 +#: src/modules/initcpiocfg/main.py:272 msgid "No root mount point for
initcpiocfg
." msgstr "" @@ -243,12 +243,12 @@ msgstr[1] "Выдаленне %(num)d пакункаў." msgstr[2] "Выдаленне %(num)d пакункаў." msgstr[3] "Выдаленне %(num)d пакункаў." -#: src/modules/packages/main.py:725 src/modules/packages/main.py:737 -#: src/modules/packages/main.py:765 +#: src/modules/packages/main.py:740 src/modules/packages/main.py:752 +#: src/modules/packages/main.py:780 msgid "Package Manager error" msgstr "Памылка кіраўніка пакункаў" -#: src/modules/packages/main.py:726 +#: src/modules/packages/main.py:741 msgid "" "The package manager could not prepare updates. The command
{!s}
" "returned error code {!s}." @@ -256,7 +256,7 @@ msgstr "" "Кіраўніку пакункаў не ўдалося падрыхтаваць абнаўленні. Загад
{!s}
" " вярнуў код памылкі {!s}." -#: src/modules/packages/main.py:738 +#: src/modules/packages/main.py:753 msgid "" "The package manager could not update the system. The command
{!s}
" " returned error code {!s}." @@ -264,7 +264,7 @@ msgstr "" "Кіраўніку пакункаў не ўдалося абнавіць сістэму. Загад
{!s}
вярнуў" " код памылкі {!s}." -#: src/modules/packages/main.py:766 +#: src/modules/packages/main.py:781 msgid "" "The package manager could not make changes to the installed system. The " "command
{!s}
returned error code {!s}." diff --git a/lang/python/bg/LC_MESSAGES/python.po b/lang/python/bg/LC_MESSAGES/python.po index f54e24fa4..cfd14183f 100644 --- a/lang/python/bg/LC_MESSAGES/python.po +++ b/lang/python/bg/LC_MESSAGES/python.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-24 23:38+0200\n" +"POT-Creation-Date: 2023-08-28 23:53+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: mkkDr2010, 2022\n" "Language-Team: Bulgarian (https://app.transifex.com/calamares/teams/20061/bg/)\n" @@ -26,65 +26,65 @@ msgstr "" msgid "Install bootloader." msgstr "Инсталирай програма за начално зареждане." -#: src/modules/bootloader/main.py:640 +#: src/modules/bootloader/main.py:644 msgid "Failed to install grub, no partitions defined in global storage" msgstr "" "Инсталирането на grub е неуспешно – няма определени дялове в мястото за " "съхранение" -#: src/modules/bootloader/main.py:895 +#: src/modules/bootloader/main.py:899 msgid "Bootloader installation error" msgstr "Грешка при инсталирането на програмата за начално зареждане" -#: src/modules/bootloader/main.py:896 +#: src/modules/bootloader/main.py:900 msgid "" "The bootloader could not be installed. The installation command " "
{!s}
returned error code {!s}." msgstr "" -#: src/modules/displaymanager/main.py:507 +#: src/modules/displaymanager/main.py:509 msgid "Cannot write LXDM configuration file" msgstr "Конфигурационният файл на LXDM не може да бъде записан" -#: src/modules/displaymanager/main.py:508 +#: src/modules/displaymanager/main.py:510 msgid "LXDM config file {!s} does not exist" msgstr "Конфигурационният файл на LXDM {!s} не съществува" -#: src/modules/displaymanager/main.py:596 +#: src/modules/displaymanager/main.py:598 msgid "Cannot write LightDM configuration file" msgstr "Конфигурационният файл на LightDM не може да бъде записан" -#: src/modules/displaymanager/main.py:597 +#: src/modules/displaymanager/main.py:599 msgid "LightDM config file {!s} does not exist" msgstr "Конфигурационният файл на LightDM {!s} не съществува" -#: src/modules/displaymanager/main.py:682 +#: src/modules/displaymanager/main.py:684 msgid "Cannot configure LightDM" msgstr "" -#: src/modules/displaymanager/main.py:683 +#: src/modules/displaymanager/main.py:685 msgid "No LightDM greeter installed." msgstr "" -#: src/modules/displaymanager/main.py:714 +#: src/modules/displaymanager/main.py:716 msgid "Cannot write SLIM configuration file" msgstr "Конфигурационният файл на SLIM не може да бъде записан" -#: src/modules/displaymanager/main.py:715 +#: src/modules/displaymanager/main.py:717 msgid "SLIM config file {!s} does not exist" msgstr "Конфигурационният файл на SLIM {!s} не съществува" -#: src/modules/displaymanager/main.py:933 +#: src/modules/displaymanager/main.py:935 msgid "No display managers selected for the displaymanager module." msgstr "" -#: src/modules/displaymanager/main.py:934 +#: src/modules/displaymanager/main.py:936 msgid "" "The displaymanagers list is empty or undefined in both globalstorage and " "displaymanager.conf." msgstr "" -#: src/modules/displaymanager/main.py:1021 +#: src/modules/displaymanager/main.py:1023 msgid "Display manager configuration was incomplete" msgstr "" @@ -115,8 +115,8 @@ msgid "Writing fstab." msgstr "Записване на fstab." #: src/modules/fstab/main.py:377 src/modules/fstab/main.py:383 -#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:245 -#: src/modules/initcpiocfg/main.py:249 src/modules/initramfscfg/main.py:85 +#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:267 +#: src/modules/initcpiocfg/main.py:271 src/modules/initramfscfg/main.py:85 #: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:140 #: src/modules/mount/main.py:329 src/modules/networkcfg/main.py:105 #: src/modules/openrcdmcryptcfg/main.py:72 @@ -152,11 +152,11 @@ msgstr "" msgid "Configuring mkinitcpio." msgstr "Конфигуриране на mkinitcpio." -#: src/modules/initcpiocfg/main.py:246 +#: src/modules/initcpiocfg/main.py:268 msgid "No partitions are defined for
initcpiocfg
." msgstr "" -#: src/modules/initcpiocfg/main.py:250 +#: src/modules/initcpiocfg/main.py:272 msgid "No root mount point for
initcpiocfg
." msgstr "" @@ -236,24 +236,24 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "Премахване на пакета." msgstr[1] "Премахване на %(num)d пакета." -#: src/modules/packages/main.py:725 src/modules/packages/main.py:737 -#: src/modules/packages/main.py:765 +#: src/modules/packages/main.py:740 src/modules/packages/main.py:752 +#: src/modules/packages/main.py:780 msgid "Package Manager error" msgstr "" -#: src/modules/packages/main.py:726 +#: src/modules/packages/main.py:741 msgid "" "The package manager could not prepare updates. The command
{!s}
" "returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:738 +#: src/modules/packages/main.py:753 msgid "" "The package manager could not update the system. The command
{!s}
" " returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:766 +#: src/modules/packages/main.py:781 msgid "" "The package manager could not make changes to the installed system. The " "command
{!s}
returned error code {!s}." diff --git a/lang/python/bn/LC_MESSAGES/python.po b/lang/python/bn/LC_MESSAGES/python.po index 6e8ddbbb5..d926c348a 100644 --- a/lang/python/bn/LC_MESSAGES/python.po +++ b/lang/python/bn/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-24 23:38+0200\n" +"POT-Creation-Date: 2023-08-28 23:53+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: 508a8b0ef95404aa3dc5178f0ccada5e_017b8a4 , 2020\n" "Language-Team: Bengali (https://app.transifex.com/calamares/teams/20061/bn/)\n" @@ -25,63 +25,63 @@ msgstr "" msgid "Install bootloader." msgstr "" -#: src/modules/bootloader/main.py:640 +#: src/modules/bootloader/main.py:644 msgid "Failed to install grub, no partitions defined in global storage" msgstr "" -#: src/modules/bootloader/main.py:895 +#: src/modules/bootloader/main.py:899 msgid "Bootloader installation error" msgstr "" -#: src/modules/bootloader/main.py:896 +#: src/modules/bootloader/main.py:900 msgid "" "The bootloader could not be installed. The installation command " "
{!s}
returned error code {!s}." msgstr "" -#: src/modules/displaymanager/main.py:507 +#: src/modules/displaymanager/main.py:509 msgid "Cannot write LXDM configuration file" msgstr "" -#: src/modules/displaymanager/main.py:508 +#: src/modules/displaymanager/main.py:510 msgid "LXDM config file {!s} does not exist" msgstr "" -#: src/modules/displaymanager/main.py:596 +#: src/modules/displaymanager/main.py:598 msgid "Cannot write LightDM configuration file" msgstr "" -#: src/modules/displaymanager/main.py:597 +#: src/modules/displaymanager/main.py:599 msgid "LightDM config file {!s} does not exist" msgstr "" -#: src/modules/displaymanager/main.py:682 +#: src/modules/displaymanager/main.py:684 msgid "Cannot configure LightDM" msgstr "" -#: src/modules/displaymanager/main.py:683 +#: src/modules/displaymanager/main.py:685 msgid "No LightDM greeter installed." msgstr "" -#: src/modules/displaymanager/main.py:714 +#: src/modules/displaymanager/main.py:716 msgid "Cannot write SLIM configuration file" msgstr "" -#: src/modules/displaymanager/main.py:715 +#: src/modules/displaymanager/main.py:717 msgid "SLIM config file {!s} does not exist" msgstr "" -#: src/modules/displaymanager/main.py:933 +#: src/modules/displaymanager/main.py:935 msgid "No display managers selected for the displaymanager module." msgstr "" -#: src/modules/displaymanager/main.py:934 +#: src/modules/displaymanager/main.py:936 msgid "" "The displaymanagers list is empty or undefined in both globalstorage and " "displaymanager.conf." msgstr "" -#: src/modules/displaymanager/main.py:1021 +#: src/modules/displaymanager/main.py:1023 msgid "Display manager configuration was incomplete" msgstr "" @@ -112,8 +112,8 @@ msgid "Writing fstab." msgstr "" #: src/modules/fstab/main.py:377 src/modules/fstab/main.py:383 -#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:245 -#: src/modules/initcpiocfg/main.py:249 src/modules/initramfscfg/main.py:85 +#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:267 +#: src/modules/initcpiocfg/main.py:271 src/modules/initramfscfg/main.py:85 #: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:140 #: src/modules/mount/main.py:329 src/modules/networkcfg/main.py:105 #: src/modules/openrcdmcryptcfg/main.py:72 @@ -149,11 +149,11 @@ msgstr "" msgid "Configuring mkinitcpio." msgstr "" -#: src/modules/initcpiocfg/main.py:246 +#: src/modules/initcpiocfg/main.py:268 msgid "No partitions are defined for
initcpiocfg
." msgstr "" -#: src/modules/initcpiocfg/main.py:250 +#: src/modules/initcpiocfg/main.py:272 msgid "No root mount point for
initcpiocfg
." msgstr "" @@ -233,24 +233,24 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "" msgstr[1] "" -#: src/modules/packages/main.py:725 src/modules/packages/main.py:737 -#: src/modules/packages/main.py:765 +#: src/modules/packages/main.py:740 src/modules/packages/main.py:752 +#: src/modules/packages/main.py:780 msgid "Package Manager error" msgstr "" -#: src/modules/packages/main.py:726 +#: src/modules/packages/main.py:741 msgid "" "The package manager could not prepare updates. The command
{!s}
" "returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:738 +#: src/modules/packages/main.py:753 msgid "" "The package manager could not update the system. The command
{!s}
" " returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:766 +#: src/modules/packages/main.py:781 msgid "" "The package manager could not make changes to the installed system. The " "command
{!s}
returned error code {!s}." diff --git a/lang/python/bqi/LC_MESSAGES/python.po b/lang/python/bqi/LC_MESSAGES/python.po index 6e9d81e12..2bdeffc80 100644 --- a/lang/python/bqi/LC_MESSAGES/python.po +++ b/lang/python/bqi/LC_MESSAGES/python.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-24 23:38+0200\n" +"POT-Creation-Date: 2023-08-28 23:53+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Luri (Bakhtiari) (https://app.transifex.com/calamares/teams/20061/bqi/)\n" "MIME-Version: 1.0\n" @@ -21,63 +21,63 @@ msgstr "" msgid "Install bootloader." msgstr "" -#: src/modules/bootloader/main.py:640 +#: src/modules/bootloader/main.py:644 msgid "Failed to install grub, no partitions defined in global storage" msgstr "" -#: src/modules/bootloader/main.py:895 +#: src/modules/bootloader/main.py:899 msgid "Bootloader installation error" msgstr "" -#: src/modules/bootloader/main.py:896 +#: src/modules/bootloader/main.py:900 msgid "" "The bootloader could not be installed. The installation command " "
{!s}
returned error code {!s}." msgstr "" -#: src/modules/displaymanager/main.py:507 +#: src/modules/displaymanager/main.py:509 msgid "Cannot write LXDM configuration file" msgstr "" -#: src/modules/displaymanager/main.py:508 +#: src/modules/displaymanager/main.py:510 msgid "LXDM config file {!s} does not exist" msgstr "" -#: src/modules/displaymanager/main.py:596 +#: src/modules/displaymanager/main.py:598 msgid "Cannot write LightDM configuration file" msgstr "" -#: src/modules/displaymanager/main.py:597 +#: src/modules/displaymanager/main.py:599 msgid "LightDM config file {!s} does not exist" msgstr "" -#: src/modules/displaymanager/main.py:682 +#: src/modules/displaymanager/main.py:684 msgid "Cannot configure LightDM" msgstr "" -#: src/modules/displaymanager/main.py:683 +#: src/modules/displaymanager/main.py:685 msgid "No LightDM greeter installed." msgstr "" -#: src/modules/displaymanager/main.py:714 +#: src/modules/displaymanager/main.py:716 msgid "Cannot write SLIM configuration file" msgstr "" -#: src/modules/displaymanager/main.py:715 +#: src/modules/displaymanager/main.py:717 msgid "SLIM config file {!s} does not exist" msgstr "" -#: src/modules/displaymanager/main.py:933 +#: src/modules/displaymanager/main.py:935 msgid "No display managers selected for the displaymanager module." msgstr "" -#: src/modules/displaymanager/main.py:934 +#: src/modules/displaymanager/main.py:936 msgid "" "The displaymanagers list is empty or undefined in both globalstorage and " "displaymanager.conf." msgstr "" -#: src/modules/displaymanager/main.py:1021 +#: src/modules/displaymanager/main.py:1023 msgid "Display manager configuration was incomplete" msgstr "" @@ -108,8 +108,8 @@ msgid "Writing fstab." msgstr "" #: src/modules/fstab/main.py:377 src/modules/fstab/main.py:383 -#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:245 -#: src/modules/initcpiocfg/main.py:249 src/modules/initramfscfg/main.py:85 +#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:267 +#: src/modules/initcpiocfg/main.py:271 src/modules/initramfscfg/main.py:85 #: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:140 #: src/modules/mount/main.py:329 src/modules/networkcfg/main.py:105 #: src/modules/openrcdmcryptcfg/main.py:72 @@ -145,11 +145,11 @@ msgstr "" msgid "Configuring mkinitcpio." msgstr "" -#: src/modules/initcpiocfg/main.py:246 +#: src/modules/initcpiocfg/main.py:268 msgid "No partitions are defined for
initcpiocfg
." msgstr "" -#: src/modules/initcpiocfg/main.py:250 +#: src/modules/initcpiocfg/main.py:272 msgid "No root mount point for
initcpiocfg
." msgstr "" @@ -229,24 +229,24 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "" msgstr[1] "" -#: src/modules/packages/main.py:725 src/modules/packages/main.py:737 -#: src/modules/packages/main.py:765 +#: src/modules/packages/main.py:740 src/modules/packages/main.py:752 +#: src/modules/packages/main.py:780 msgid "Package Manager error" msgstr "" -#: src/modules/packages/main.py:726 +#: src/modules/packages/main.py:741 msgid "" "The package manager could not prepare updates. The command
{!s}
" "returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:738 +#: src/modules/packages/main.py:753 msgid "" "The package manager could not update the system. The command
{!s}
" " returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:766 +#: src/modules/packages/main.py:781 msgid "" "The package manager could not make changes to the installed system. The " "command
{!s}
returned error code {!s}." diff --git a/lang/python/ca/LC_MESSAGES/python.po b/lang/python/ca/LC_MESSAGES/python.po index bc0366032..d03eb98ad 100644 --- a/lang/python/ca/LC_MESSAGES/python.po +++ b/lang/python/ca/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-24 23:38+0200\n" +"POT-Creation-Date: 2023-08-28 23:53+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Davidmp , 2023\n" "Language-Team: Catalan (https://app.transifex.com/calamares/teams/20061/ca/)\n" @@ -25,17 +25,17 @@ msgstr "" msgid "Install bootloader." msgstr "S'instal·la el carregador d'arrencada." -#: src/modules/bootloader/main.py:640 +#: src/modules/bootloader/main.py:644 msgid "Failed to install grub, no partitions defined in global storage" msgstr "" "No s'ha pogut instal·lar el grub. No s'han definit particions a " "l'emmagatzematge global." -#: src/modules/bootloader/main.py:895 +#: src/modules/bootloader/main.py:899 msgid "Bootloader installation error" msgstr "Error d'instal·lació del carregador d'arrencada" -#: src/modules/bootloader/main.py:896 +#: src/modules/bootloader/main.py:900 msgid "" "The bootloader could not be installed. The installation command " "
{!s}
returned error code {!s}." @@ -43,44 +43,44 @@ msgstr "" "No s'ha pogut instal·lar el carregador d'arrencada. L'ordre d'instal·lació " "
{!s}
ha retornat el codi d'error {!s}." -#: src/modules/displaymanager/main.py:507 +#: src/modules/displaymanager/main.py:509 msgid "Cannot write LXDM configuration file" msgstr "No es pot escriure el fitxer de configuració de l'LXDM." -#: src/modules/displaymanager/main.py:508 +#: src/modules/displaymanager/main.py:510 msgid "LXDM config file {!s} does not exist" msgstr "El fitxer de configuració de l'LXDM {!s} no existeix." -#: src/modules/displaymanager/main.py:596 +#: src/modules/displaymanager/main.py:598 msgid "Cannot write LightDM configuration file" msgstr "No es pot escriure el fitxer de configuració del LightDM." -#: src/modules/displaymanager/main.py:597 +#: src/modules/displaymanager/main.py:599 msgid "LightDM config file {!s} does not exist" msgstr "El fitxer de configuració del LightDM {!s} no existeix." -#: src/modules/displaymanager/main.py:682 +#: src/modules/displaymanager/main.py:684 msgid "Cannot configure LightDM" msgstr "No es pot configurar el LightDM." -#: src/modules/displaymanager/main.py:683 +#: src/modules/displaymanager/main.py:685 msgid "No LightDM greeter installed." msgstr "No hi ha benvinguda instal·lada per al LightDM." -#: src/modules/displaymanager/main.py:714 +#: src/modules/displaymanager/main.py:716 msgid "Cannot write SLIM configuration file" msgstr "No es pot escriure el fitxer de configuració de l'SLIM." -#: src/modules/displaymanager/main.py:715 +#: src/modules/displaymanager/main.py:717 msgid "SLIM config file {!s} does not exist" msgstr "El fitxer de configuració de l'SLIM {!s} no existeix." -#: src/modules/displaymanager/main.py:933 +#: src/modules/displaymanager/main.py:935 msgid "No display managers selected for the displaymanager module." msgstr "" "No hi ha cap gestor de pantalla seleccionat per al mòdul displaymanager." -#: src/modules/displaymanager/main.py:934 +#: src/modules/displaymanager/main.py:936 msgid "" "The displaymanagers list is empty or undefined in both globalstorage and " "displaymanager.conf." @@ -88,7 +88,7 @@ msgstr "" "La llista de gestors de pantalla és buida o no definida ni a globalstorage " "ni a displaymanager.conf." -#: src/modules/displaymanager/main.py:1021 +#: src/modules/displaymanager/main.py:1023 msgid "Display manager configuration was incomplete" msgstr "La configuració del gestor de pantalla no era completa." @@ -121,8 +121,8 @@ msgid "Writing fstab." msgstr "S'escriu fstab." #: src/modules/fstab/main.py:377 src/modules/fstab/main.py:383 -#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:245 -#: src/modules/initcpiocfg/main.py:249 src/modules/initramfscfg/main.py:85 +#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:267 +#: src/modules/initcpiocfg/main.py:271 src/modules/initramfscfg/main.py:85 #: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:140 #: src/modules/mount/main.py:329 src/modules/networkcfg/main.py:105 #: src/modules/openrcdmcryptcfg/main.py:72 @@ -160,11 +160,11 @@ msgstr "S'estableix el rellotge del maquinari." msgid "Configuring mkinitcpio." msgstr "Es configura mkinitcpio." -#: src/modules/initcpiocfg/main.py:246 +#: src/modules/initcpiocfg/main.py:268 msgid "No partitions are defined for
initcpiocfg
." msgstr "No s'han definit particions per a
initcpiocfg
." -#: src/modules/initcpiocfg/main.py:250 +#: src/modules/initcpiocfg/main.py:272 msgid "No root mount point for
initcpiocfg
." msgstr "No hi ha punt de muntatge per a
initcpiocfg
." @@ -244,12 +244,12 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "Se suprimeix un paquet." msgstr[1] "Se suprimeixen %(num)d paquets." -#: src/modules/packages/main.py:725 src/modules/packages/main.py:737 -#: src/modules/packages/main.py:765 +#: src/modules/packages/main.py:740 src/modules/packages/main.py:752 +#: src/modules/packages/main.py:780 msgid "Package Manager error" msgstr "Error del gestor de paquets" -#: src/modules/packages/main.py:726 +#: src/modules/packages/main.py:741 msgid "" "The package manager could not prepare updates. The command
{!s}
" "returned error code {!s}." @@ -257,7 +257,7 @@ msgstr "" "El gestor de paquets no ha pogut preparar les actualitzacions. " "L'ordre
{!s}
ha retornat el codi d'error {!s}." -#: src/modules/packages/main.py:738 +#: src/modules/packages/main.py:753 msgid "" "The package manager could not update the system. The command
{!s}
" " returned error code {!s}." @@ -265,7 +265,7 @@ msgstr "" "El gestor de paquets no ha pogut actualitzar el sistema. L'ordre " "
{!s}
ha retornat el codi d'error {!s}." -#: src/modules/packages/main.py:766 +#: src/modules/packages/main.py:781 msgid "" "The package manager could not make changes to the installed system. The " "command
{!s}
returned error code {!s}." diff --git a/lang/python/ca@valencia/LC_MESSAGES/python.po b/lang/python/ca@valencia/LC_MESSAGES/python.po index 9c15f3d9c..87c5fd14c 100644 --- a/lang/python/ca@valencia/LC_MESSAGES/python.po +++ b/lang/python/ca@valencia/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-24 23:38+0200\n" +"POT-Creation-Date: 2023-08-28 23:53+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Raul , 2021\n" "Language-Team: Catalan (Valencian) (https://app.transifex.com/calamares/teams/20061/ca@valencia/)\n" @@ -25,58 +25,58 @@ msgstr "" msgid "Install bootloader." msgstr "Instal·la el carregador d'arrancada." -#: src/modules/bootloader/main.py:640 +#: src/modules/bootloader/main.py:644 msgid "Failed to install grub, no partitions defined in global storage" msgstr "" -#: src/modules/bootloader/main.py:895 +#: src/modules/bootloader/main.py:899 msgid "Bootloader installation error" msgstr "" -#: src/modules/bootloader/main.py:896 +#: src/modules/bootloader/main.py:900 msgid "" "The bootloader could not be installed. The installation command " "
{!s}
returned error code {!s}." msgstr "" -#: src/modules/displaymanager/main.py:507 +#: src/modules/displaymanager/main.py:509 msgid "Cannot write LXDM configuration file" msgstr "No es pot escriure el fitxer de configuració de l'LXDM." -#: src/modules/displaymanager/main.py:508 +#: src/modules/displaymanager/main.py:510 msgid "LXDM config file {!s} does not exist" msgstr "El fitxer de configuració de l'LXDM {!s} no existeix." -#: src/modules/displaymanager/main.py:596 +#: src/modules/displaymanager/main.py:598 msgid "Cannot write LightDM configuration file" msgstr "No es pot escriure el fitxer de configuració del LightDM." -#: src/modules/displaymanager/main.py:597 +#: src/modules/displaymanager/main.py:599 msgid "LightDM config file {!s} does not exist" msgstr "El fitxer de configuració del LightDM {!s} no existeix." -#: src/modules/displaymanager/main.py:682 +#: src/modules/displaymanager/main.py:684 msgid "Cannot configure LightDM" msgstr "No es pot configurar el LightDM." -#: src/modules/displaymanager/main.py:683 +#: src/modules/displaymanager/main.py:685 msgid "No LightDM greeter installed." msgstr "No hi ha benvinguda instal·lada per al LightDM." -#: src/modules/displaymanager/main.py:714 +#: src/modules/displaymanager/main.py:716 msgid "Cannot write SLIM configuration file" msgstr "No es pot escriure el fitxer de configuració de l'SLIM." -#: src/modules/displaymanager/main.py:715 +#: src/modules/displaymanager/main.py:717 msgid "SLIM config file {!s} does not exist" msgstr "El fitxer de configuració de l'SLIM {!s} no existeix." -#: src/modules/displaymanager/main.py:933 +#: src/modules/displaymanager/main.py:935 msgid "No display managers selected for the displaymanager module." msgstr "" "No hi ha cap gestor de pantalla seleccionat per al mòdul displaymanager." -#: src/modules/displaymanager/main.py:934 +#: src/modules/displaymanager/main.py:936 msgid "" "The displaymanagers list is empty or undefined in both globalstorage and " "displaymanager.conf." @@ -84,7 +84,7 @@ msgstr "" "La llista de gestors de pantalla està buida o no està definida ni en " "globalstorage ni en displaymanager.conf." -#: src/modules/displaymanager/main.py:1021 +#: src/modules/displaymanager/main.py:1023 msgid "Display manager configuration was incomplete" msgstr "La configuració del gestor de pantalla no era completa." @@ -115,8 +115,8 @@ msgid "Writing fstab." msgstr "Escriptura d’fstab." #: src/modules/fstab/main.py:377 src/modules/fstab/main.py:383 -#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:245 -#: src/modules/initcpiocfg/main.py:249 src/modules/initramfscfg/main.py:85 +#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:267 +#: src/modules/initcpiocfg/main.py:271 src/modules/initramfscfg/main.py:85 #: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:140 #: src/modules/mount/main.py:329 src/modules/networkcfg/main.py:105 #: src/modules/openrcdmcryptcfg/main.py:72 @@ -153,11 +153,11 @@ msgstr "Configuració del rellotge del maquinari." msgid "Configuring mkinitcpio." msgstr "S'està configurant mkinitcpio." -#: src/modules/initcpiocfg/main.py:246 +#: src/modules/initcpiocfg/main.py:268 msgid "No partitions are defined for
initcpiocfg
." msgstr "" -#: src/modules/initcpiocfg/main.py:250 +#: src/modules/initcpiocfg/main.py:272 msgid "No root mount point for
initcpiocfg
." msgstr "" @@ -237,24 +237,24 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "S’està eliminant un paquet." msgstr[1] "S’està eliminant %(num)d paquets." -#: src/modules/packages/main.py:725 src/modules/packages/main.py:737 -#: src/modules/packages/main.py:765 +#: src/modules/packages/main.py:740 src/modules/packages/main.py:752 +#: src/modules/packages/main.py:780 msgid "Package Manager error" msgstr "" -#: src/modules/packages/main.py:726 +#: src/modules/packages/main.py:741 msgid "" "The package manager could not prepare updates. The command
{!s}
" "returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:738 +#: src/modules/packages/main.py:753 msgid "" "The package manager could not update the system. The command
{!s}
" " returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:766 +#: src/modules/packages/main.py:781 msgid "" "The package manager could not make changes to the installed system. The " "command
{!s}
returned error code {!s}." diff --git a/lang/python/cs_CZ/LC_MESSAGES/python.po b/lang/python/cs_CZ/LC_MESSAGES/python.po index 84a3e0ef5..974517608 100644 --- a/lang/python/cs_CZ/LC_MESSAGES/python.po +++ b/lang/python/cs_CZ/LC_MESSAGES/python.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-24 23:38+0200\n" +"POT-Creation-Date: 2023-08-28 23:53+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Pavel Borecki , 2022\n" "Language-Team: Czech (Czech Republic) (https://app.transifex.com/calamares/teams/20061/cs_CZ/)\n" @@ -27,17 +27,17 @@ msgstr "" msgid "Install bootloader." msgstr "Instalace zavaděče systému." -#: src/modules/bootloader/main.py:640 +#: src/modules/bootloader/main.py:644 msgid "Failed to install grub, no partitions defined in global storage" msgstr "" "Nepodařilo se nainstalovat zavaděč grub – v globálním úložišti nejsou " "definovány žádné oddíly" -#: src/modules/bootloader/main.py:895 +#: src/modules/bootloader/main.py:899 msgid "Bootloader installation error" msgstr "Chyba při instalaci zavaděče systému" -#: src/modules/bootloader/main.py:896 +#: src/modules/bootloader/main.py:900 msgid "" "The bootloader could not be installed. The installation command " "
{!s}
returned error code {!s}." @@ -45,43 +45,43 @@ msgstr "" "Zavaděč systému se nepodařilo nainstalovat. Instalační příkaz
{!s} "
 "vrátil chybový kód {!s}."
 
-#: src/modules/displaymanager/main.py:507
+#: src/modules/displaymanager/main.py:509
 msgid "Cannot write LXDM configuration file"
 msgstr "Nedaří se zapsat soubor s nastaveními pro LXDM"
 
-#: src/modules/displaymanager/main.py:508
+#: src/modules/displaymanager/main.py:510
 msgid "LXDM config file {!s} does not exist"
 msgstr "Soubor s nastaveními pro LXDM {!s} neexistuje"
 
-#: src/modules/displaymanager/main.py:596
+#: src/modules/displaymanager/main.py:598
 msgid "Cannot write LightDM configuration file"
 msgstr "Nedaří se zapsat soubor s nastaveními pro LightDM"
 
-#: src/modules/displaymanager/main.py:597
+#: src/modules/displaymanager/main.py:599
 msgid "LightDM config file {!s} does not exist"
 msgstr "Soubor s nastaveními pro LightDM {!s} neexistuje"
 
-#: src/modules/displaymanager/main.py:682
+#: src/modules/displaymanager/main.py:684
 msgid "Cannot configure LightDM"
 msgstr "Nedaří se nastavit LightDM"
 
-#: src/modules/displaymanager/main.py:683
+#: src/modules/displaymanager/main.py:685
 msgid "No LightDM greeter installed."
 msgstr "Není nainstalovaný žádný LightDM přivítač"
 
-#: src/modules/displaymanager/main.py:714
+#: src/modules/displaymanager/main.py:716
 msgid "Cannot write SLIM configuration file"
 msgstr "Nedaří se zapsat soubor s nastaveními pro SLIM"
 
-#: src/modules/displaymanager/main.py:715
+#: src/modules/displaymanager/main.py:717
 msgid "SLIM config file {!s} does not exist"
 msgstr "Soubor s nastaveními pro SLIM {!s} neexistuje"
 
-#: src/modules/displaymanager/main.py:933
+#: src/modules/displaymanager/main.py:935
 msgid "No display managers selected for the displaymanager module."
 msgstr "Pro modul správce sezení nejsou vybrány žádní správci sezení."
 
-#: src/modules/displaymanager/main.py:934
+#: src/modules/displaymanager/main.py:936
 msgid ""
 "The displaymanagers list is empty or undefined in both globalstorage and "
 "displaymanager.conf."
@@ -89,7 +89,7 @@ msgstr ""
 "Seznam správců displejů je prázdný nebo není definován v jak globalstorage, "
 "tak v displaymanager.conf."
 
-#: src/modules/displaymanager/main.py:1021
+#: src/modules/displaymanager/main.py:1023
 msgid "Display manager configuration was incomplete"
 msgstr "Nastavení správce displeje nebylo úplné"
 
@@ -120,8 +120,8 @@ msgid "Writing fstab."
 msgstr "Zapisování fstab."
 
 #: src/modules/fstab/main.py:377 src/modules/fstab/main.py:383
-#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:245
-#: src/modules/initcpiocfg/main.py:249 src/modules/initramfscfg/main.py:85
+#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:267
+#: src/modules/initcpiocfg/main.py:271 src/modules/initramfscfg/main.py:85
 #: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:140
 #: src/modules/mount/main.py:329 src/modules/networkcfg/main.py:105
 #: src/modules/openrcdmcryptcfg/main.py:72
@@ -159,11 +159,11 @@ msgstr "Nastavování hardwarových hodin."
 msgid "Configuring mkinitcpio."
 msgstr "Nastavování mkinitcpio."
 
-#: src/modules/initcpiocfg/main.py:246
+#: src/modules/initcpiocfg/main.py:268
 msgid "No partitions are defined for 
initcpiocfg
." msgstr "" -#: src/modules/initcpiocfg/main.py:250 +#: src/modules/initcpiocfg/main.py:272 msgid "No root mount point for
initcpiocfg
." msgstr "" @@ -247,12 +247,12 @@ msgstr[1] "Odebírají se %(num)d balíčky." msgstr[2] "Odebírá se %(num)d balíčků." msgstr[3] "Odebírá se %(num)d balíčků." -#: src/modules/packages/main.py:725 src/modules/packages/main.py:737 -#: src/modules/packages/main.py:765 +#: src/modules/packages/main.py:740 src/modules/packages/main.py:752 +#: src/modules/packages/main.py:780 msgid "Package Manager error" msgstr "Chyba nástroje pro správu balíčků" -#: src/modules/packages/main.py:726 +#: src/modules/packages/main.py:741 msgid "" "The package manager could not prepare updates. The command
{!s}
" "returned error code {!s}." @@ -260,7 +260,7 @@ msgstr "" "Nástroji pro správu balíčků se nepodařilo připravit aktualizace. Příkaz " "
{!s}
vrátil chybový kód {!s}." -#: src/modules/packages/main.py:738 +#: src/modules/packages/main.py:753 msgid "" "The package manager could not update the system. The command
{!s}
" " returned error code {!s}." @@ -268,7 +268,7 @@ msgstr "" "Nástroji pro správu balíčků se nepodařilo aktualizovat systém. Příkaz " "
{!s}
vrátil chybový kód {!s}." -#: src/modules/packages/main.py:766 +#: src/modules/packages/main.py:781 msgid "" "The package manager could not make changes to the installed system. The " "command
{!s}
returned error code {!s}." diff --git a/lang/python/da/LC_MESSAGES/python.po b/lang/python/da/LC_MESSAGES/python.po index dc2b366d1..bbab74148 100644 --- a/lang/python/da/LC_MESSAGES/python.po +++ b/lang/python/da/LC_MESSAGES/python.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-24 23:38+0200\n" +"POT-Creation-Date: 2023-08-28 23:53+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: scootergrisen, 2020\n" "Language-Team: Danish (https://app.transifex.com/calamares/teams/20061/da/)\n" @@ -26,58 +26,58 @@ msgstr "" msgid "Install bootloader." msgstr "Installér bootloader." -#: src/modules/bootloader/main.py:640 +#: src/modules/bootloader/main.py:644 msgid "Failed to install grub, no partitions defined in global storage" msgstr "" -#: src/modules/bootloader/main.py:895 +#: src/modules/bootloader/main.py:899 msgid "Bootloader installation error" msgstr "" -#: src/modules/bootloader/main.py:896 +#: src/modules/bootloader/main.py:900 msgid "" "The bootloader could not be installed. The installation command " "
{!s}
returned error code {!s}." msgstr "" -#: src/modules/displaymanager/main.py:507 +#: src/modules/displaymanager/main.py:509 msgid "Cannot write LXDM configuration file" msgstr "Kan ikke skrive LXDM-konfigurationsfil" -#: src/modules/displaymanager/main.py:508 +#: src/modules/displaymanager/main.py:510 msgid "LXDM config file {!s} does not exist" msgstr "LXDM-konfigurationsfil {!s} findes ikke" -#: src/modules/displaymanager/main.py:596 +#: src/modules/displaymanager/main.py:598 msgid "Cannot write LightDM configuration file" msgstr "Kan ikke skrive LightDM-konfigurationsfil" -#: src/modules/displaymanager/main.py:597 +#: src/modules/displaymanager/main.py:599 msgid "LightDM config file {!s} does not exist" msgstr "LightDM-konfigurationsfil {!s} findes ikke" -#: src/modules/displaymanager/main.py:682 +#: src/modules/displaymanager/main.py:684 msgid "Cannot configure LightDM" msgstr "Kan ikke konfigurere LightDM" -#: src/modules/displaymanager/main.py:683 +#: src/modules/displaymanager/main.py:685 msgid "No LightDM greeter installed." msgstr "Der er ikke installeret nogen LightDM greeter." -#: src/modules/displaymanager/main.py:714 +#: src/modules/displaymanager/main.py:716 msgid "Cannot write SLIM configuration file" msgstr "Kan ikke skrive SLIM-konfigurationsfil" -#: src/modules/displaymanager/main.py:715 +#: src/modules/displaymanager/main.py:717 msgid "SLIM config file {!s} does not exist" msgstr "SLIM-konfigurationsfil {!s} findes ikke" -#: src/modules/displaymanager/main.py:933 +#: src/modules/displaymanager/main.py:935 msgid "No display managers selected for the displaymanager module." msgstr "" "Der er ikke valgt nogen displayhåndteringer til displayhåndtering-modulet." -#: src/modules/displaymanager/main.py:934 +#: src/modules/displaymanager/main.py:936 msgid "" "The displaymanagers list is empty or undefined in both globalstorage and " "displaymanager.conf." @@ -85,7 +85,7 @@ msgstr "" "Displayhåndteringerlisten er tom eller udefineret i både globalstorage og " "displaymanager.conf." -#: src/modules/displaymanager/main.py:1021 +#: src/modules/displaymanager/main.py:1023 msgid "Display manager configuration was incomplete" msgstr "Displayhåndtering-konfiguration er ikke komplet" @@ -116,8 +116,8 @@ msgid "Writing fstab." msgstr "Skriver fstab." #: src/modules/fstab/main.py:377 src/modules/fstab/main.py:383 -#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:245 -#: src/modules/initcpiocfg/main.py:249 src/modules/initramfscfg/main.py:85 +#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:267 +#: src/modules/initcpiocfg/main.py:271 src/modules/initramfscfg/main.py:85 #: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:140 #: src/modules/mount/main.py:329 src/modules/networkcfg/main.py:105 #: src/modules/openrcdmcryptcfg/main.py:72 @@ -154,11 +154,11 @@ msgstr "Indstiller hardwareur." msgid "Configuring mkinitcpio." msgstr "Konfigurerer mkinitcpio." -#: src/modules/initcpiocfg/main.py:246 +#: src/modules/initcpiocfg/main.py:268 msgid "No partitions are defined for
initcpiocfg
." msgstr "" -#: src/modules/initcpiocfg/main.py:250 +#: src/modules/initcpiocfg/main.py:272 msgid "No root mount point for
initcpiocfg
." msgstr "" @@ -238,24 +238,24 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "Fjerner én pakke." msgstr[1] "Fjerner %(num)d pakker." -#: src/modules/packages/main.py:725 src/modules/packages/main.py:737 -#: src/modules/packages/main.py:765 +#: src/modules/packages/main.py:740 src/modules/packages/main.py:752 +#: src/modules/packages/main.py:780 msgid "Package Manager error" msgstr "" -#: src/modules/packages/main.py:726 +#: src/modules/packages/main.py:741 msgid "" "The package manager could not prepare updates. The command
{!s}
" "returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:738 +#: src/modules/packages/main.py:753 msgid "" "The package manager could not update the system. The command
{!s}
" " returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:766 +#: src/modules/packages/main.py:781 msgid "" "The package manager could not make changes to the installed system. The " "command
{!s}
returned error code {!s}." diff --git a/lang/python/de/LC_MESSAGES/python.po b/lang/python/de/LC_MESSAGES/python.po index 6da7cc6e7..5df9bdee8 100644 --- a/lang/python/de/LC_MESSAGES/python.po +++ b/lang/python/de/LC_MESSAGES/python.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-24 23:38+0200\n" +"POT-Creation-Date: 2023-08-28 23:53+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Gustav Gyges, 2023\n" "Language-Team: German (https://app.transifex.com/calamares/teams/20061/de/)\n" @@ -27,17 +27,17 @@ msgstr "" msgid "Install bootloader." msgstr "Installiere Bootloader." -#: src/modules/bootloader/main.py:640 +#: src/modules/bootloader/main.py:644 msgid "Failed to install grub, no partitions defined in global storage" msgstr "" "Grub konnte nicht installiert werden, keine Partitionen im globalen Speicher" " definiert." -#: src/modules/bootloader/main.py:895 +#: src/modules/bootloader/main.py:899 msgid "Bootloader installation error" msgstr "Fehler beim Installieren des Bootloaders" -#: src/modules/bootloader/main.py:896 +#: src/modules/bootloader/main.py:900 msgid "" "The bootloader could not be installed. The installation command " "
{!s}
returned error code {!s}." @@ -45,43 +45,43 @@ msgstr "" "Der Bootloader konnte nicht installiert werden. Der Installationsbefehl " "
{!s}
erzeugte Fehlercode {!s}." -#: src/modules/displaymanager/main.py:507 +#: src/modules/displaymanager/main.py:509 msgid "Cannot write LXDM configuration file" msgstr "Schreiben der LXDM-Konfigurationsdatei nicht möglich" -#: src/modules/displaymanager/main.py:508 +#: src/modules/displaymanager/main.py:510 msgid "LXDM config file {!s} does not exist" msgstr "LXDM-Konfigurationsdatei {!s} existiert nicht" -#: src/modules/displaymanager/main.py:596 +#: src/modules/displaymanager/main.py:598 msgid "Cannot write LightDM configuration file" msgstr "Schreiben der LightDM-Konfigurationsdatei nicht möglich" -#: src/modules/displaymanager/main.py:597 +#: src/modules/displaymanager/main.py:599 msgid "LightDM config file {!s} does not exist" msgstr "LightDM-Konfigurationsdatei {!s} existiert nicht" -#: src/modules/displaymanager/main.py:682 +#: src/modules/displaymanager/main.py:684 msgid "Cannot configure LightDM" msgstr "Konfiguration von LightDM ist nicht möglich" -#: src/modules/displaymanager/main.py:683 +#: src/modules/displaymanager/main.py:685 msgid "No LightDM greeter installed." msgstr "Keine Benutzeroberfläche für LightDM installiert." -#: src/modules/displaymanager/main.py:714 +#: src/modules/displaymanager/main.py:716 msgid "Cannot write SLIM configuration file" msgstr "Schreiben der SLIM-Konfigurationsdatei nicht möglich" -#: src/modules/displaymanager/main.py:715 +#: src/modules/displaymanager/main.py:717 msgid "SLIM config file {!s} does not exist" msgstr "SLIM-Konfigurationsdatei {!s} existiert nicht" -#: src/modules/displaymanager/main.py:933 +#: src/modules/displaymanager/main.py:935 msgid "No display managers selected for the displaymanager module." msgstr "Keine Displaymanager für das Displaymanager-Modul ausgewählt." -#: src/modules/displaymanager/main.py:934 +#: src/modules/displaymanager/main.py:936 msgid "" "The displaymanagers list is empty or undefined in both globalstorage and " "displaymanager.conf." @@ -89,7 +89,7 @@ msgstr "" "Die Liste der Displaymanager ist leer oder weder in globalstorage noch in " "displaymanager.conf definiert." -#: src/modules/displaymanager/main.py:1021 +#: src/modules/displaymanager/main.py:1023 msgid "Display manager configuration was incomplete" msgstr "Die Konfiguration des Displaymanager war unvollständig." @@ -122,8 +122,8 @@ msgid "Writing fstab." msgstr "Schreibe fstab." #: src/modules/fstab/main.py:377 src/modules/fstab/main.py:383 -#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:245 -#: src/modules/initcpiocfg/main.py:249 src/modules/initramfscfg/main.py:85 +#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:267 +#: src/modules/initcpiocfg/main.py:271 src/modules/initramfscfg/main.py:85 #: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:140 #: src/modules/mount/main.py:329 src/modules/networkcfg/main.py:105 #: src/modules/openrcdmcryptcfg/main.py:72 @@ -163,11 +163,11 @@ msgstr "Einstellen der Hardware-Uhr." msgid "Configuring mkinitcpio." msgstr "Konfiguriere mkinitcpio. " -#: src/modules/initcpiocfg/main.py:246 +#: src/modules/initcpiocfg/main.py:268 msgid "No partitions are defined for
initcpiocfg
." msgstr "Es sind keine Partitionen definiert für
initcpiocfg
." -#: src/modules/initcpiocfg/main.py:250 +#: src/modules/initcpiocfg/main.py:272 msgid "No root mount point for
initcpiocfg
." msgstr "Kein Root-Einhängepunkt für
initcpiocfg
." @@ -247,12 +247,12 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "Entferne ein Paket" msgstr[1] "Entferne %(num)d Pakete." -#: src/modules/packages/main.py:725 src/modules/packages/main.py:737 -#: src/modules/packages/main.py:765 +#: src/modules/packages/main.py:740 src/modules/packages/main.py:752 +#: src/modules/packages/main.py:780 msgid "Package Manager error" msgstr "Fehler im Paketmanager" -#: src/modules/packages/main.py:726 +#: src/modules/packages/main.py:741 msgid "" "The package manager could not prepare updates. The command
{!s}
" "returned error code {!s}." @@ -260,7 +260,7 @@ msgstr "" "Der Paketmanager konnte die Aktualisierungen nicht vorbereiten. Der Befehl " "
{!s}
erzeugte Fehlercode {!s}." -#: src/modules/packages/main.py:738 +#: src/modules/packages/main.py:753 msgid "" "The package manager could not update the system. The command
{!s}
" " returned error code {!s}." @@ -268,7 +268,7 @@ msgstr "" "Der Paketmanager konnte das System nicht aktualisieren. Der Befehl " "
{!s}
erzeugte Fehlercode {!s}." -#: src/modules/packages/main.py:766 +#: src/modules/packages/main.py:781 msgid "" "The package manager could not make changes to the installed system. The " "command
{!s}
returned error code {!s}." diff --git a/lang/python/el/LC_MESSAGES/python.po b/lang/python/el/LC_MESSAGES/python.po index f45848f2c..0c7360e43 100644 --- a/lang/python/el/LC_MESSAGES/python.po +++ b/lang/python/el/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-24 23:38+0200\n" +"POT-Creation-Date: 2023-08-28 23:53+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Efstathios Iosifidis , 2022\n" "Language-Team: Greek (https://app.transifex.com/calamares/teams/20061/el/)\n" @@ -25,63 +25,63 @@ msgstr "" msgid "Install bootloader." msgstr "" -#: src/modules/bootloader/main.py:640 +#: src/modules/bootloader/main.py:644 msgid "Failed to install grub, no partitions defined in global storage" msgstr "" -#: src/modules/bootloader/main.py:895 +#: src/modules/bootloader/main.py:899 msgid "Bootloader installation error" msgstr "" -#: src/modules/bootloader/main.py:896 +#: src/modules/bootloader/main.py:900 msgid "" "The bootloader could not be installed. The installation command " "
{!s}
returned error code {!s}." msgstr "" -#: src/modules/displaymanager/main.py:507 +#: src/modules/displaymanager/main.py:509 msgid "Cannot write LXDM configuration file" msgstr "" -#: src/modules/displaymanager/main.py:508 +#: src/modules/displaymanager/main.py:510 msgid "LXDM config file {!s} does not exist" msgstr "" -#: src/modules/displaymanager/main.py:596 +#: src/modules/displaymanager/main.py:598 msgid "Cannot write LightDM configuration file" msgstr "" -#: src/modules/displaymanager/main.py:597 +#: src/modules/displaymanager/main.py:599 msgid "LightDM config file {!s} does not exist" msgstr "" -#: src/modules/displaymanager/main.py:682 +#: src/modules/displaymanager/main.py:684 msgid "Cannot configure LightDM" msgstr "Αδυναμία ρύθμισης LightDM" -#: src/modules/displaymanager/main.py:683 +#: src/modules/displaymanager/main.py:685 msgid "No LightDM greeter installed." msgstr "" -#: src/modules/displaymanager/main.py:714 +#: src/modules/displaymanager/main.py:716 msgid "Cannot write SLIM configuration file" msgstr "" -#: src/modules/displaymanager/main.py:715 +#: src/modules/displaymanager/main.py:717 msgid "SLIM config file {!s} does not exist" msgstr "" -#: src/modules/displaymanager/main.py:933 +#: src/modules/displaymanager/main.py:935 msgid "No display managers selected for the displaymanager module." msgstr "" -#: src/modules/displaymanager/main.py:934 +#: src/modules/displaymanager/main.py:936 msgid "" "The displaymanagers list is empty or undefined in both globalstorage and " "displaymanager.conf." msgstr "" -#: src/modules/displaymanager/main.py:1021 +#: src/modules/displaymanager/main.py:1023 msgid "Display manager configuration was incomplete" msgstr "" @@ -112,8 +112,8 @@ msgid "Writing fstab." msgstr "Εγγραγή fstab." #: src/modules/fstab/main.py:377 src/modules/fstab/main.py:383 -#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:245 -#: src/modules/initcpiocfg/main.py:249 src/modules/initramfscfg/main.py:85 +#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:267 +#: src/modules/initcpiocfg/main.py:271 src/modules/initramfscfg/main.py:85 #: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:140 #: src/modules/mount/main.py:329 src/modules/networkcfg/main.py:105 #: src/modules/openrcdmcryptcfg/main.py:72 @@ -149,11 +149,11 @@ msgstr "" msgid "Configuring mkinitcpio." msgstr "" -#: src/modules/initcpiocfg/main.py:246 +#: src/modules/initcpiocfg/main.py:268 msgid "No partitions are defined for
initcpiocfg
." msgstr "" -#: src/modules/initcpiocfg/main.py:250 +#: src/modules/initcpiocfg/main.py:272 msgid "No root mount point for
initcpiocfg
." msgstr "" @@ -233,24 +233,24 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "" msgstr[1] "" -#: src/modules/packages/main.py:725 src/modules/packages/main.py:737 -#: src/modules/packages/main.py:765 +#: src/modules/packages/main.py:740 src/modules/packages/main.py:752 +#: src/modules/packages/main.py:780 msgid "Package Manager error" msgstr "Σφάλμα διαχειριστή πακέτων" -#: src/modules/packages/main.py:726 +#: src/modules/packages/main.py:741 msgid "" "The package manager could not prepare updates. The command
{!s}
" "returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:738 +#: src/modules/packages/main.py:753 msgid "" "The package manager could not update the system. The command
{!s}
" " returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:766 +#: src/modules/packages/main.py:781 msgid "" "The package manager could not make changes to the installed system. The " "command
{!s}
returned error code {!s}." diff --git a/lang/python/en_GB/LC_MESSAGES/python.po b/lang/python/en_GB/LC_MESSAGES/python.po index 271fcd80e..49b72e2ca 100644 --- a/lang/python/en_GB/LC_MESSAGES/python.po +++ b/lang/python/en_GB/LC_MESSAGES/python.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-24 23:38+0200\n" +"POT-Creation-Date: 2023-08-28 23:53+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Karthik Balan , 2021\n" "Language-Team: English (United Kingdom) (https://app.transifex.com/calamares/teams/20061/en_GB/)\n" @@ -26,63 +26,63 @@ msgstr "" msgid "Install bootloader." msgstr "" -#: src/modules/bootloader/main.py:640 +#: src/modules/bootloader/main.py:644 msgid "Failed to install grub, no partitions defined in global storage" msgstr "" -#: src/modules/bootloader/main.py:895 +#: src/modules/bootloader/main.py:899 msgid "Bootloader installation error" msgstr "Bootloader installation error" -#: src/modules/bootloader/main.py:896 +#: src/modules/bootloader/main.py:900 msgid "" "The bootloader could not be installed. The installation command " "
{!s}
returned error code {!s}." msgstr "" -#: src/modules/displaymanager/main.py:507 +#: src/modules/displaymanager/main.py:509 msgid "Cannot write LXDM configuration file" msgstr "" -#: src/modules/displaymanager/main.py:508 +#: src/modules/displaymanager/main.py:510 msgid "LXDM config file {!s} does not exist" msgstr "" -#: src/modules/displaymanager/main.py:596 +#: src/modules/displaymanager/main.py:598 msgid "Cannot write LightDM configuration file" msgstr "" -#: src/modules/displaymanager/main.py:597 +#: src/modules/displaymanager/main.py:599 msgid "LightDM config file {!s} does not exist" msgstr "" -#: src/modules/displaymanager/main.py:682 +#: src/modules/displaymanager/main.py:684 msgid "Cannot configure LightDM" msgstr "" -#: src/modules/displaymanager/main.py:683 +#: src/modules/displaymanager/main.py:685 msgid "No LightDM greeter installed." msgstr "" -#: src/modules/displaymanager/main.py:714 +#: src/modules/displaymanager/main.py:716 msgid "Cannot write SLIM configuration file" msgstr "" -#: src/modules/displaymanager/main.py:715 +#: src/modules/displaymanager/main.py:717 msgid "SLIM config file {!s} does not exist" msgstr "" -#: src/modules/displaymanager/main.py:933 +#: src/modules/displaymanager/main.py:935 msgid "No display managers selected for the displaymanager module." msgstr "" -#: src/modules/displaymanager/main.py:934 +#: src/modules/displaymanager/main.py:936 msgid "" "The displaymanagers list is empty or undefined in both globalstorage and " "displaymanager.conf." msgstr "" -#: src/modules/displaymanager/main.py:1021 +#: src/modules/displaymanager/main.py:1023 msgid "Display manager configuration was incomplete" msgstr "" @@ -113,8 +113,8 @@ msgid "Writing fstab." msgstr "" #: src/modules/fstab/main.py:377 src/modules/fstab/main.py:383 -#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:245 -#: src/modules/initcpiocfg/main.py:249 src/modules/initramfscfg/main.py:85 +#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:267 +#: src/modules/initcpiocfg/main.py:271 src/modules/initramfscfg/main.py:85 #: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:140 #: src/modules/mount/main.py:329 src/modules/networkcfg/main.py:105 #: src/modules/openrcdmcryptcfg/main.py:72 @@ -150,11 +150,11 @@ msgstr "" msgid "Configuring mkinitcpio." msgstr "" -#: src/modules/initcpiocfg/main.py:246 +#: src/modules/initcpiocfg/main.py:268 msgid "No partitions are defined for
initcpiocfg
." msgstr "" -#: src/modules/initcpiocfg/main.py:250 +#: src/modules/initcpiocfg/main.py:272 msgid "No root mount point for
initcpiocfg
." msgstr "" @@ -234,24 +234,24 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "Removing one package." msgstr[1] "Removing %(num)d packages." -#: src/modules/packages/main.py:725 src/modules/packages/main.py:737 -#: src/modules/packages/main.py:765 +#: src/modules/packages/main.py:740 src/modules/packages/main.py:752 +#: src/modules/packages/main.py:780 msgid "Package Manager error" msgstr "Package Manager error" -#: src/modules/packages/main.py:726 +#: src/modules/packages/main.py:741 msgid "" "The package manager could not prepare updates. The command
{!s}
" "returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:738 +#: src/modules/packages/main.py:753 msgid "" "The package manager could not update the system. The command
{!s}
" " returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:766 +#: src/modules/packages/main.py:781 msgid "" "The package manager could not make changes to the installed system. The " "command
{!s}
returned error code {!s}." diff --git a/lang/python/eo/LC_MESSAGES/python.po b/lang/python/eo/LC_MESSAGES/python.po index bdf107318..2c23789df 100644 --- a/lang/python/eo/LC_MESSAGES/python.po +++ b/lang/python/eo/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-24 23:38+0200\n" +"POT-Creation-Date: 2023-08-28 23:53+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Kurt Ankh Phoenix , 2018\n" "Language-Team: Esperanto (https://app.transifex.com/calamares/teams/20061/eo/)\n" @@ -25,63 +25,63 @@ msgstr "" msgid "Install bootloader." msgstr "" -#: src/modules/bootloader/main.py:640 +#: src/modules/bootloader/main.py:644 msgid "Failed to install grub, no partitions defined in global storage" msgstr "" -#: src/modules/bootloader/main.py:895 +#: src/modules/bootloader/main.py:899 msgid "Bootloader installation error" msgstr "" -#: src/modules/bootloader/main.py:896 +#: src/modules/bootloader/main.py:900 msgid "" "The bootloader could not be installed. The installation command " "
{!s}
returned error code {!s}." msgstr "" -#: src/modules/displaymanager/main.py:507 +#: src/modules/displaymanager/main.py:509 msgid "Cannot write LXDM configuration file" msgstr "" -#: src/modules/displaymanager/main.py:508 +#: src/modules/displaymanager/main.py:510 msgid "LXDM config file {!s} does not exist" msgstr "" -#: src/modules/displaymanager/main.py:596 +#: src/modules/displaymanager/main.py:598 msgid "Cannot write LightDM configuration file" msgstr "" -#: src/modules/displaymanager/main.py:597 +#: src/modules/displaymanager/main.py:599 msgid "LightDM config file {!s} does not exist" msgstr "" -#: src/modules/displaymanager/main.py:682 +#: src/modules/displaymanager/main.py:684 msgid "Cannot configure LightDM" msgstr "" -#: src/modules/displaymanager/main.py:683 +#: src/modules/displaymanager/main.py:685 msgid "No LightDM greeter installed." msgstr "" -#: src/modules/displaymanager/main.py:714 +#: src/modules/displaymanager/main.py:716 msgid "Cannot write SLIM configuration file" msgstr "" -#: src/modules/displaymanager/main.py:715 +#: src/modules/displaymanager/main.py:717 msgid "SLIM config file {!s} does not exist" msgstr "" -#: src/modules/displaymanager/main.py:933 +#: src/modules/displaymanager/main.py:935 msgid "No display managers selected for the displaymanager module." msgstr "" -#: src/modules/displaymanager/main.py:934 +#: src/modules/displaymanager/main.py:936 msgid "" "The displaymanagers list is empty or undefined in both globalstorage and " "displaymanager.conf." msgstr "" -#: src/modules/displaymanager/main.py:1021 +#: src/modules/displaymanager/main.py:1023 msgid "Display manager configuration was incomplete" msgstr "" @@ -112,8 +112,8 @@ msgid "Writing fstab." msgstr "" #: src/modules/fstab/main.py:377 src/modules/fstab/main.py:383 -#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:245 -#: src/modules/initcpiocfg/main.py:249 src/modules/initramfscfg/main.py:85 +#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:267 +#: src/modules/initcpiocfg/main.py:271 src/modules/initramfscfg/main.py:85 #: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:140 #: src/modules/mount/main.py:329 src/modules/networkcfg/main.py:105 #: src/modules/openrcdmcryptcfg/main.py:72 @@ -149,11 +149,11 @@ msgstr "" msgid "Configuring mkinitcpio." msgstr "" -#: src/modules/initcpiocfg/main.py:246 +#: src/modules/initcpiocfg/main.py:268 msgid "No partitions are defined for
initcpiocfg
." msgstr "" -#: src/modules/initcpiocfg/main.py:250 +#: src/modules/initcpiocfg/main.py:272 msgid "No root mount point for
initcpiocfg
." msgstr "" @@ -233,24 +233,24 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "Forigante unu pakaĵo." msgstr[1] "Forigante %(num)d pakaĵoj." -#: src/modules/packages/main.py:725 src/modules/packages/main.py:737 -#: src/modules/packages/main.py:765 +#: src/modules/packages/main.py:740 src/modules/packages/main.py:752 +#: src/modules/packages/main.py:780 msgid "Package Manager error" msgstr "" -#: src/modules/packages/main.py:726 +#: src/modules/packages/main.py:741 msgid "" "The package manager could not prepare updates. The command
{!s}
" "returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:738 +#: src/modules/packages/main.py:753 msgid "" "The package manager could not update the system. The command
{!s}
" " returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:766 +#: src/modules/packages/main.py:781 msgid "" "The package manager could not make changes to the installed system. The " "command
{!s}
returned error code {!s}." diff --git a/lang/python/es/LC_MESSAGES/python.po b/lang/python/es/LC_MESSAGES/python.po index 20112cb14..3212a9137 100644 --- a/lang/python/es/LC_MESSAGES/python.po +++ b/lang/python/es/LC_MESSAGES/python.po @@ -9,17 +9,17 @@ # Adolfo Jayme-Barrientos, 2019 # Miguel Mayol , 2020 # Pier Jose Gotta Perez , 2020 -# Swyter , 2022 # Casper, 2023 +# Swyter , 2023 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-24 23:38+0200\n" +"POT-Creation-Date: 2023-08-28 23:53+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" -"Last-Translator: Casper, 2023\n" +"Last-Translator: Swyter , 2023\n" "Language-Team: Spanish (https://app.transifex.com/calamares/teams/20061/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -31,17 +31,17 @@ msgstr "" msgid "Install bootloader." msgstr "Instalar gestor de arranque." -#: src/modules/bootloader/main.py:640 +#: src/modules/bootloader/main.py:644 msgid "Failed to install grub, no partitions defined in global storage" msgstr "" "Hubo un error al instalar «grub»; no hay particiones definidas en el " "almacenamiento global" -#: src/modules/bootloader/main.py:895 +#: src/modules/bootloader/main.py:899 msgid "Bootloader installation error" msgstr "Hubo un error al instalar el cargador de arranque" -#: src/modules/bootloader/main.py:896 +#: src/modules/bootloader/main.py:900 msgid "" "The bootloader could not be installed. The installation command " "
{!s}
returned error code {!s}." @@ -49,44 +49,44 @@ msgstr "" "No se pudo instalar el cargador de arranque; la orden de instalación " "
{!s}
devolvió el código de error {!s}." -#: src/modules/displaymanager/main.py:507 +#: src/modules/displaymanager/main.py:509 msgid "Cannot write LXDM configuration file" msgstr "No se puede escribir el archivo de configuración LXDM" -#: src/modules/displaymanager/main.py:508 +#: src/modules/displaymanager/main.py:510 msgid "LXDM config file {!s} does not exist" msgstr "El archivo de configuracion {!s} de LXDM no existe" -#: src/modules/displaymanager/main.py:596 +#: src/modules/displaymanager/main.py:598 msgid "Cannot write LightDM configuration file" msgstr "No se puede escribir el archivo de configuración de LightDM" -#: src/modules/displaymanager/main.py:597 +#: src/modules/displaymanager/main.py:599 msgid "LightDM config file {!s} does not exist" msgstr "El archivo de configuración {!s} de LightDM no existe" -#: src/modules/displaymanager/main.py:682 +#: src/modules/displaymanager/main.py:684 msgid "Cannot configure LightDM" msgstr "No se puede configurar LightDM" -#: src/modules/displaymanager/main.py:683 +#: src/modules/displaymanager/main.py:685 msgid "No LightDM greeter installed." msgstr "No hay ningún menú de bienvenida («greeter») de LightDM instalado." -#: src/modules/displaymanager/main.py:714 +#: src/modules/displaymanager/main.py:716 msgid "Cannot write SLIM configuration file" msgstr "No se puede escribir el archivo de configuración de SLIM" -#: src/modules/displaymanager/main.py:715 +#: src/modules/displaymanager/main.py:717 msgid "SLIM config file {!s} does not exist" msgstr "El archivo de configuración {!s} de SLIM no existe" -#: src/modules/displaymanager/main.py:933 +#: src/modules/displaymanager/main.py:935 msgid "No display managers selected for the displaymanager module." msgstr "" "No se ha elegido ningún gestor de pantalla para el módulo «displaymanager»." -#: src/modules/displaymanager/main.py:934 +#: src/modules/displaymanager/main.py:936 msgid "" "The displaymanagers list is empty or undefined in both globalstorage and " "displaymanager.conf." @@ -94,7 +94,7 @@ msgstr "" "La lista de gestores de pantalla está vacía o sin definir tanto en " "«globalstorage» como en «displaymanager.conf»." -#: src/modules/displaymanager/main.py:1021 +#: src/modules/displaymanager/main.py:1023 msgid "Display manager configuration was incomplete" msgstr "" "La configuración del gestor de pantalla («display manager») estaba " @@ -129,8 +129,8 @@ msgid "Writing fstab." msgstr "Escribiendo el «fstab»." #: src/modules/fstab/main.py:377 src/modules/fstab/main.py:383 -#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:245 -#: src/modules/initcpiocfg/main.py:249 src/modules/initramfscfg/main.py:85 +#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:267 +#: src/modules/initcpiocfg/main.py:271 src/modules/initramfscfg/main.py:85 #: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:140 #: src/modules/mount/main.py:329 src/modules/networkcfg/main.py:105 #: src/modules/openrcdmcryptcfg/main.py:72 @@ -168,11 +168,11 @@ msgstr "Ajustando el reloj interno del equipo." msgid "Configuring mkinitcpio." msgstr "Configurando «mkinitcpio»." -#: src/modules/initcpiocfg/main.py:246 +#: src/modules/initcpiocfg/main.py:268 msgid "No partitions are defined for
initcpiocfg
." msgstr "No se definen particiones para
initcpiocfg
." -#: src/modules/initcpiocfg/main.py:250 +#: src/modules/initcpiocfg/main.py:272 msgid "No root mount point for
initcpiocfg
." msgstr "Sin punto de montaje raíz para
initcpiocfg
." @@ -256,12 +256,12 @@ msgstr[0] "Eliminando un paquete." msgstr[1] "Eliminando %(num)d paquetes." msgstr[2] "Eliminando %(num)d paquetes." -#: src/modules/packages/main.py:725 src/modules/packages/main.py:737 -#: src/modules/packages/main.py:765 +#: src/modules/packages/main.py:740 src/modules/packages/main.py:752 +#: src/modules/packages/main.py:780 msgid "Package Manager error" msgstr "Hubo un error del gestor de paquetes" -#: src/modules/packages/main.py:726 +#: src/modules/packages/main.py:741 msgid "" "The package manager could not prepare updates. The command
{!s}
" "returned error code {!s}." @@ -269,7 +269,7 @@ msgstr "" "El gestor de paquetes no pudo preparar las actualizaciones; la orden " "
{!s}
devolvió el código de error {!s}." -#: src/modules/packages/main.py:738 +#: src/modules/packages/main.py:753 msgid "" "The package manager could not update the system. The command
{!s}
" " returned error code {!s}." @@ -277,7 +277,7 @@ msgstr "" "El gestor de paquetes no pudo actualizar el sistema; la orden " "
{!s}
devolvió el código de error {!s}." -#: src/modules/packages/main.py:766 +#: src/modules/packages/main.py:781 msgid "" "The package manager could not make changes to the installed system. The " "command
{!s}
returned error code {!s}." @@ -300,22 +300,22 @@ msgstr "Configurar servicios de OpenRC" #: src/modules/services-openrc/main.py:57 msgid "Cannot add service {name!s} to run-level {level!s}." msgstr "" -"No se puede/n añadir {name!s} de servicio/s al rango de ejecución " +"No se puede añadir el servicio {name!s} al nivel de ejecución («run-level») " "{level!s}." #: src/modules/services-openrc/main.py:59 msgid "Cannot remove service {name!s} from run-level {level!s}." msgstr "" -"No se puede/n borrar el/los servicio/s {name!s} de los rangos de ejecución " -"{level!s}." +"No se puede borrar el servicio {name!s} del nivel de ejecución («run-level»)" +" {level!s}." #: src/modules/services-openrc/main.py:61 msgid "" "Unknown service-action {arg!s} for service {name!s} in run-" "level {level!s}." msgstr "" -"Acción desconocida d/e el/los servicio/s {arg!s} para el/los " -"servicio/s {name!s} en el/los rango/s de ejecución {level!s}." +"Acción del servicio («service-action») desconocida {arg!s} para" +" el servicio {name!s} en el nivel de ejecución («run-level») {level!s}." #: src/modules/services-openrc/main.py:93 msgid "Cannot modify service" diff --git a/lang/python/es_MX/LC_MESSAGES/python.po b/lang/python/es_MX/LC_MESSAGES/python.po index 3f79c9eec..70813d261 100644 --- a/lang/python/es_MX/LC_MESSAGES/python.po +++ b/lang/python/es_MX/LC_MESSAGES/python.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-24 23:38+0200\n" +"POT-Creation-Date: 2023-08-28 23:53+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Erland Huaman , 2021\n" "Language-Team: Spanish (Mexico) (https://app.transifex.com/calamares/teams/20061/es_MX/)\n" @@ -27,57 +27,57 @@ msgstr "" msgid "Install bootloader." msgstr "Instalar el cargador de arranque." -#: src/modules/bootloader/main.py:640 +#: src/modules/bootloader/main.py:644 msgid "Failed to install grub, no partitions defined in global storage" msgstr "" -#: src/modules/bootloader/main.py:895 +#: src/modules/bootloader/main.py:899 msgid "Bootloader installation error" msgstr "" -#: src/modules/bootloader/main.py:896 +#: src/modules/bootloader/main.py:900 msgid "" "The bootloader could not be installed. The installation command " "
{!s}
returned error code {!s}." msgstr "" -#: src/modules/displaymanager/main.py:507 +#: src/modules/displaymanager/main.py:509 msgid "Cannot write LXDM configuration file" msgstr "No se puede escribir el archivo de configuración de LXDM" -#: src/modules/displaymanager/main.py:508 +#: src/modules/displaymanager/main.py:510 msgid "LXDM config file {!s} does not exist" msgstr "El archivo de configuración de LXDM {!s} no existe" -#: src/modules/displaymanager/main.py:596 +#: src/modules/displaymanager/main.py:598 msgid "Cannot write LightDM configuration file" msgstr "No se puede escribir el archivo de configuración de LightDM" -#: src/modules/displaymanager/main.py:597 +#: src/modules/displaymanager/main.py:599 msgid "LightDM config file {!s} does not exist" msgstr "El archivo de configuración de LightDM {!s} no existe" -#: src/modules/displaymanager/main.py:682 +#: src/modules/displaymanager/main.py:684 msgid "Cannot configure LightDM" msgstr "No se puede configurar LightDM" -#: src/modules/displaymanager/main.py:683 +#: src/modules/displaymanager/main.py:685 msgid "No LightDM greeter installed." msgstr "LightDM greeter no está instalado." -#: src/modules/displaymanager/main.py:714 +#: src/modules/displaymanager/main.py:716 msgid "Cannot write SLIM configuration file" msgstr "No se puede escribir el archivo de configuración de SLIM" -#: src/modules/displaymanager/main.py:715 +#: src/modules/displaymanager/main.py:717 msgid "SLIM config file {!s} does not exist" msgstr "" -#: src/modules/displaymanager/main.py:933 +#: src/modules/displaymanager/main.py:935 msgid "No display managers selected for the displaymanager module." msgstr "No se seleccionaron gestores para el módulo de gestor de pantalla." -#: src/modules/displaymanager/main.py:934 +#: src/modules/displaymanager/main.py:936 msgid "" "The displaymanagers list is empty or undefined in both globalstorage and " "displaymanager.conf." @@ -85,7 +85,7 @@ 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:1021 +#: src/modules/displaymanager/main.py:1023 msgid "Display manager configuration was incomplete" msgstr "La configuración del gestor de pantalla estaba incompleta" @@ -116,8 +116,8 @@ msgid "Writing fstab." msgstr "Escribiento fstab." #: src/modules/fstab/main.py:377 src/modules/fstab/main.py:383 -#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:245 -#: src/modules/initcpiocfg/main.py:249 src/modules/initramfscfg/main.py:85 +#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:267 +#: src/modules/initcpiocfg/main.py:271 src/modules/initramfscfg/main.py:85 #: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:140 #: src/modules/mount/main.py:329 src/modules/networkcfg/main.py:105 #: src/modules/openrcdmcryptcfg/main.py:72 @@ -153,11 +153,11 @@ msgstr "Configurando el reloj del hardware." msgid "Configuring mkinitcpio." msgstr "Configurando mkinitcpio" -#: src/modules/initcpiocfg/main.py:246 +#: src/modules/initcpiocfg/main.py:268 msgid "No partitions are defined for
initcpiocfg
." msgstr "" -#: src/modules/initcpiocfg/main.py:250 +#: src/modules/initcpiocfg/main.py:272 msgid "No root mount point for
initcpiocfg
." msgstr "" @@ -239,24 +239,24 @@ msgstr[0] "Removiendo un paquete." msgstr[1] "Removiendo %(num)dpaquetes." msgstr[2] "Removiendo %(num)dpaquetes." -#: src/modules/packages/main.py:725 src/modules/packages/main.py:737 -#: src/modules/packages/main.py:765 +#: src/modules/packages/main.py:740 src/modules/packages/main.py:752 +#: src/modules/packages/main.py:780 msgid "Package Manager error" msgstr "" -#: src/modules/packages/main.py:726 +#: src/modules/packages/main.py:741 msgid "" "The package manager could not prepare updates. The command
{!s}
" "returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:738 +#: src/modules/packages/main.py:753 msgid "" "The package manager could not update the system. The command
{!s}
" " returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:766 +#: src/modules/packages/main.py:781 msgid "" "The package manager could not make changes to the installed system. The " "command
{!s}
returned error code {!s}." diff --git a/lang/python/es_PR/LC_MESSAGES/python.po b/lang/python/es_PR/LC_MESSAGES/python.po index f494d182b..80698cd54 100644 --- a/lang/python/es_PR/LC_MESSAGES/python.po +++ b/lang/python/es_PR/LC_MESSAGES/python.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-24 23:38+0200\n" +"POT-Creation-Date: 2023-08-28 23:53+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Spanish (Puerto Rico) (https://app.transifex.com/calamares/teams/20061/es_PR/)\n" "MIME-Version: 1.0\n" @@ -21,63 +21,63 @@ msgstr "" msgid "Install bootloader." msgstr "" -#: src/modules/bootloader/main.py:640 +#: src/modules/bootloader/main.py:644 msgid "Failed to install grub, no partitions defined in global storage" msgstr "" -#: src/modules/bootloader/main.py:895 +#: src/modules/bootloader/main.py:899 msgid "Bootloader installation error" msgstr "" -#: src/modules/bootloader/main.py:896 +#: src/modules/bootloader/main.py:900 msgid "" "The bootloader could not be installed. The installation command " "
{!s}
returned error code {!s}." msgstr "" -#: src/modules/displaymanager/main.py:507 +#: src/modules/displaymanager/main.py:509 msgid "Cannot write LXDM configuration file" msgstr "" -#: src/modules/displaymanager/main.py:508 +#: src/modules/displaymanager/main.py:510 msgid "LXDM config file {!s} does not exist" msgstr "" -#: src/modules/displaymanager/main.py:596 +#: src/modules/displaymanager/main.py:598 msgid "Cannot write LightDM configuration file" msgstr "" -#: src/modules/displaymanager/main.py:597 +#: src/modules/displaymanager/main.py:599 msgid "LightDM config file {!s} does not exist" msgstr "" -#: src/modules/displaymanager/main.py:682 +#: src/modules/displaymanager/main.py:684 msgid "Cannot configure LightDM" msgstr "" -#: src/modules/displaymanager/main.py:683 +#: src/modules/displaymanager/main.py:685 msgid "No LightDM greeter installed." msgstr "" -#: src/modules/displaymanager/main.py:714 +#: src/modules/displaymanager/main.py:716 msgid "Cannot write SLIM configuration file" msgstr "" -#: src/modules/displaymanager/main.py:715 +#: src/modules/displaymanager/main.py:717 msgid "SLIM config file {!s} does not exist" msgstr "" -#: src/modules/displaymanager/main.py:933 +#: src/modules/displaymanager/main.py:935 msgid "No display managers selected for the displaymanager module." msgstr "" -#: src/modules/displaymanager/main.py:934 +#: src/modules/displaymanager/main.py:936 msgid "" "The displaymanagers list is empty or undefined in both globalstorage and " "displaymanager.conf." msgstr "" -#: src/modules/displaymanager/main.py:1021 +#: src/modules/displaymanager/main.py:1023 msgid "Display manager configuration was incomplete" msgstr "" @@ -108,8 +108,8 @@ msgid "Writing fstab." msgstr "" #: src/modules/fstab/main.py:377 src/modules/fstab/main.py:383 -#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:245 -#: src/modules/initcpiocfg/main.py:249 src/modules/initramfscfg/main.py:85 +#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:267 +#: src/modules/initcpiocfg/main.py:271 src/modules/initramfscfg/main.py:85 #: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:140 #: src/modules/mount/main.py:329 src/modules/networkcfg/main.py:105 #: src/modules/openrcdmcryptcfg/main.py:72 @@ -145,11 +145,11 @@ msgstr "" msgid "Configuring mkinitcpio." msgstr "" -#: src/modules/initcpiocfg/main.py:246 +#: src/modules/initcpiocfg/main.py:268 msgid "No partitions are defined for
initcpiocfg
." msgstr "" -#: src/modules/initcpiocfg/main.py:250 +#: src/modules/initcpiocfg/main.py:272 msgid "No root mount point for
initcpiocfg
." msgstr "" @@ -231,24 +231,24 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/modules/packages/main.py:725 src/modules/packages/main.py:737 -#: src/modules/packages/main.py:765 +#: src/modules/packages/main.py:740 src/modules/packages/main.py:752 +#: src/modules/packages/main.py:780 msgid "Package Manager error" msgstr "" -#: src/modules/packages/main.py:726 +#: src/modules/packages/main.py:741 msgid "" "The package manager could not prepare updates. The command
{!s}
" "returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:738 +#: src/modules/packages/main.py:753 msgid "" "The package manager could not update the system. The command
{!s}
" " returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:766 +#: src/modules/packages/main.py:781 msgid "" "The package manager could not make changes to the installed system. The " "command
{!s}
returned error code {!s}." diff --git a/lang/python/et/LC_MESSAGES/python.po b/lang/python/et/LC_MESSAGES/python.po index a17f66cca..1e0905feb 100644 --- a/lang/python/et/LC_MESSAGES/python.po +++ b/lang/python/et/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-24 23:38+0200\n" +"POT-Creation-Date: 2023-08-28 23:53+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Madis Otenurm, 2019\n" "Language-Team: Estonian (https://app.transifex.com/calamares/teams/20061/et/)\n" @@ -25,63 +25,63 @@ msgstr "" msgid "Install bootloader." msgstr "" -#: src/modules/bootloader/main.py:640 +#: src/modules/bootloader/main.py:644 msgid "Failed to install grub, no partitions defined in global storage" msgstr "" -#: src/modules/bootloader/main.py:895 +#: src/modules/bootloader/main.py:899 msgid "Bootloader installation error" msgstr "" -#: src/modules/bootloader/main.py:896 +#: src/modules/bootloader/main.py:900 msgid "" "The bootloader could not be installed. The installation command " "
{!s}
returned error code {!s}." msgstr "" -#: src/modules/displaymanager/main.py:507 +#: src/modules/displaymanager/main.py:509 msgid "Cannot write LXDM configuration file" msgstr "LXDM-konfiguratsioonifaili ei saa kirjutada" -#: src/modules/displaymanager/main.py:508 +#: src/modules/displaymanager/main.py:510 msgid "LXDM config file {!s} does not exist" msgstr "LXDM-konfiguratsioonifail {!s} puudub" -#: src/modules/displaymanager/main.py:596 +#: src/modules/displaymanager/main.py:598 msgid "Cannot write LightDM configuration file" msgstr "LightDM-konfiguratsioonifaili ei saa kirjutada" -#: src/modules/displaymanager/main.py:597 +#: src/modules/displaymanager/main.py:599 msgid "LightDM config file {!s} does not exist" msgstr "LightDM-konfiguratsioonifail {!s} puudub" -#: src/modules/displaymanager/main.py:682 +#: src/modules/displaymanager/main.py:684 msgid "Cannot configure LightDM" msgstr "LightDM seadistamine ebaõnnestus" -#: src/modules/displaymanager/main.py:683 +#: src/modules/displaymanager/main.py:685 msgid "No LightDM greeter installed." msgstr "" -#: src/modules/displaymanager/main.py:714 +#: src/modules/displaymanager/main.py:716 msgid "Cannot write SLIM configuration file" msgstr "SLIM-konfiguratsioonifaili ei saa kirjutada" -#: src/modules/displaymanager/main.py:715 +#: src/modules/displaymanager/main.py:717 msgid "SLIM config file {!s} does not exist" msgstr "SLIM-konfiguratsioonifail {!s} puudub" -#: src/modules/displaymanager/main.py:933 +#: src/modules/displaymanager/main.py:935 msgid "No display managers selected for the displaymanager module." msgstr "" -#: src/modules/displaymanager/main.py:934 +#: src/modules/displaymanager/main.py:936 msgid "" "The displaymanagers list is empty or undefined in both globalstorage and " "displaymanager.conf." msgstr "" -#: src/modules/displaymanager/main.py:1021 +#: src/modules/displaymanager/main.py:1023 msgid "Display manager configuration was incomplete" msgstr "" @@ -112,8 +112,8 @@ msgid "Writing fstab." msgstr "" #: src/modules/fstab/main.py:377 src/modules/fstab/main.py:383 -#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:245 -#: src/modules/initcpiocfg/main.py:249 src/modules/initramfscfg/main.py:85 +#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:267 +#: src/modules/initcpiocfg/main.py:271 src/modules/initramfscfg/main.py:85 #: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:140 #: src/modules/mount/main.py:329 src/modules/networkcfg/main.py:105 #: src/modules/openrcdmcryptcfg/main.py:72 @@ -149,11 +149,11 @@ msgstr "" msgid "Configuring mkinitcpio." msgstr "" -#: src/modules/initcpiocfg/main.py:246 +#: src/modules/initcpiocfg/main.py:268 msgid "No partitions are defined for
initcpiocfg
." msgstr "" -#: src/modules/initcpiocfg/main.py:250 +#: src/modules/initcpiocfg/main.py:272 msgid "No root mount point for
initcpiocfg
." msgstr "" @@ -233,24 +233,24 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "Eemaldan ühe paketi." msgstr[1] "Eemaldan %(num)d paketti." -#: src/modules/packages/main.py:725 src/modules/packages/main.py:737 -#: src/modules/packages/main.py:765 +#: src/modules/packages/main.py:740 src/modules/packages/main.py:752 +#: src/modules/packages/main.py:780 msgid "Package Manager error" msgstr "" -#: src/modules/packages/main.py:726 +#: src/modules/packages/main.py:741 msgid "" "The package manager could not prepare updates. The command
{!s}
" "returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:738 +#: src/modules/packages/main.py:753 msgid "" "The package manager could not update the system. The command
{!s}
" " returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:766 +#: src/modules/packages/main.py:781 msgid "" "The package manager could not make changes to the installed system. The " "command
{!s}
returned error code {!s}." diff --git a/lang/python/eu/LC_MESSAGES/python.po b/lang/python/eu/LC_MESSAGES/python.po index a1c4e0a40..7d3a749be 100644 --- a/lang/python/eu/LC_MESSAGES/python.po +++ b/lang/python/eu/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-24 23:38+0200\n" +"POT-Creation-Date: 2023-08-28 23:53+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Ander Elortondo, 2019\n" "Language-Team: Basque (https://app.transifex.com/calamares/teams/20061/eu/)\n" @@ -25,64 +25,64 @@ msgstr "" msgid "Install bootloader." msgstr "" -#: src/modules/bootloader/main.py:640 +#: src/modules/bootloader/main.py:644 msgid "Failed to install grub, no partitions defined in global storage" msgstr "" -#: src/modules/bootloader/main.py:895 +#: src/modules/bootloader/main.py:899 msgid "Bootloader installation error" msgstr "" -#: src/modules/bootloader/main.py:896 +#: src/modules/bootloader/main.py:900 msgid "" "The bootloader could not be installed. The installation command " "
{!s}
returned error code {!s}." msgstr "" -#: src/modules/displaymanager/main.py:507 +#: src/modules/displaymanager/main.py:509 msgid "Cannot write LXDM configuration file" msgstr "Ezin da LXDM konfigurazio fitxategia idatzi" -#: src/modules/displaymanager/main.py:508 +#: src/modules/displaymanager/main.py:510 msgid "LXDM config file {!s} does not exist" msgstr "LXDM konfigurazio fitxategia {!s} ez da existitzen" -#: src/modules/displaymanager/main.py:596 +#: src/modules/displaymanager/main.py:598 msgid "Cannot write LightDM configuration file" msgstr "Ezin da LightDM konfigurazio fitxategia idatzi" -#: src/modules/displaymanager/main.py:597 +#: src/modules/displaymanager/main.py:599 msgid "LightDM config file {!s} does not exist" msgstr "LightDM konfigurazio fitxategia {!s} ez da existitzen" -#: src/modules/displaymanager/main.py:682 +#: src/modules/displaymanager/main.py:684 msgid "Cannot configure LightDM" msgstr "Ezin da LightDM konfiguratu" -#: src/modules/displaymanager/main.py:683 +#: src/modules/displaymanager/main.py:685 msgid "No LightDM greeter installed." msgstr "Ez dago LightDM harrera instalatua." -#: src/modules/displaymanager/main.py:714 +#: src/modules/displaymanager/main.py:716 msgid "Cannot write SLIM configuration file" msgstr "Ezin da SLIM konfigurazio fitxategia idatzi" -#: src/modules/displaymanager/main.py:715 +#: src/modules/displaymanager/main.py:717 msgid "SLIM config file {!s} does not exist" msgstr "SLIM konfigurazio fitxategia {!s} ez da existitzen" -#: src/modules/displaymanager/main.py:933 +#: src/modules/displaymanager/main.py:935 msgid "No display managers selected for the displaymanager module." msgstr "" "Ez da pantaila kudeatzailerik aukeratu pantaila-kudeatzaile modulurako." -#: src/modules/displaymanager/main.py:934 +#: src/modules/displaymanager/main.py:936 msgid "" "The displaymanagers list is empty or undefined in both globalstorage and " "displaymanager.conf." msgstr "" -#: src/modules/displaymanager/main.py:1021 +#: src/modules/displaymanager/main.py:1023 msgid "Display manager configuration was incomplete" msgstr "Pantaila kudeatzaile konfigurazioa osotu gabe" @@ -113,8 +113,8 @@ msgid "Writing fstab." msgstr "" #: src/modules/fstab/main.py:377 src/modules/fstab/main.py:383 -#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:245 -#: src/modules/initcpiocfg/main.py:249 src/modules/initramfscfg/main.py:85 +#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:267 +#: src/modules/initcpiocfg/main.py:271 src/modules/initramfscfg/main.py:85 #: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:140 #: src/modules/mount/main.py:329 src/modules/networkcfg/main.py:105 #: src/modules/openrcdmcryptcfg/main.py:72 @@ -150,11 +150,11 @@ msgstr "" msgid "Configuring mkinitcpio." msgstr "" -#: src/modules/initcpiocfg/main.py:246 +#: src/modules/initcpiocfg/main.py:268 msgid "No partitions are defined for
initcpiocfg
." msgstr "" -#: src/modules/initcpiocfg/main.py:250 +#: src/modules/initcpiocfg/main.py:272 msgid "No root mount point for
initcpiocfg
." msgstr "" @@ -234,24 +234,24 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "Pakete bat kentzen." msgstr[1] "%(num)dpakete kentzen." -#: src/modules/packages/main.py:725 src/modules/packages/main.py:737 -#: src/modules/packages/main.py:765 +#: src/modules/packages/main.py:740 src/modules/packages/main.py:752 +#: src/modules/packages/main.py:780 msgid "Package Manager error" msgstr "" -#: src/modules/packages/main.py:726 +#: src/modules/packages/main.py:741 msgid "" "The package manager could not prepare updates. The command
{!s}
" "returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:738 +#: src/modules/packages/main.py:753 msgid "" "The package manager could not update the system. The command
{!s}
" " returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:766 +#: src/modules/packages/main.py:781 msgid "" "The package manager could not make changes to the installed system. The " "command
{!s}
returned error code {!s}." diff --git a/lang/python/fa/LC_MESSAGES/python.po b/lang/python/fa/LC_MESSAGES/python.po index 1e689719f..df59dedf5 100644 --- a/lang/python/fa/LC_MESSAGES/python.po +++ b/lang/python/fa/LC_MESSAGES/python.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-24 23:38+0200\n" +"POT-Creation-Date: 2023-08-28 23:53+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Mahdy Mirzade , 2021\n" "Language-Team: Persian (https://app.transifex.com/calamares/teams/20061/fa/)\n" @@ -27,15 +27,15 @@ msgstr "" msgid "Install bootloader." msgstr "نصب بارکنندهٔ راه‌اندازی." -#: src/modules/bootloader/main.py:640 +#: src/modules/bootloader/main.py:644 msgid "Failed to install grub, no partitions defined in global storage" msgstr "" -#: src/modules/bootloader/main.py:895 +#: src/modules/bootloader/main.py:899 msgid "Bootloader installation error" msgstr "خطای نصب بوت لودر" -#: src/modules/bootloader/main.py:896 +#: src/modules/bootloader/main.py:900 msgid "" "The bootloader could not be installed. The installation command " "
{!s}
returned error code {!s}." @@ -43,43 +43,43 @@ msgstr "" "بوت لودر نتوانست نصب شود. دستور
{!s}
برای نصب با خطای {!s} مواجه " "شد." -#: src/modules/displaymanager/main.py:507 +#: src/modules/displaymanager/main.py:509 msgid "Cannot write LXDM configuration file" msgstr "نمی‌توان پروندهٔ پیکربندی LXDM را نوشت" -#: src/modules/displaymanager/main.py:508 +#: src/modules/displaymanager/main.py:510 msgid "LXDM config file {!s} does not exist" msgstr "پروندهٔ پیکربندی {!s} وجود ندارد" -#: src/modules/displaymanager/main.py:596 +#: src/modules/displaymanager/main.py:598 msgid "Cannot write LightDM configuration file" msgstr "نمی‌توان پروندهٔ پیکربندی LightDM را نوشت" -#: src/modules/displaymanager/main.py:597 +#: src/modules/displaymanager/main.py:599 msgid "LightDM config file {!s} does not exist" msgstr "پروندهٔ پیکربندی {!s} وجود ندارد" -#: src/modules/displaymanager/main.py:682 +#: src/modules/displaymanager/main.py:684 msgid "Cannot configure LightDM" msgstr "نمی‌توان LightDM را پیکربندی کرد" -#: src/modules/displaymanager/main.py:683 +#: src/modules/displaymanager/main.py:685 msgid "No LightDM greeter installed." msgstr "هیچ خوش‌آمدگوی LightDMای نصب نشده." -#: src/modules/displaymanager/main.py:714 +#: src/modules/displaymanager/main.py:716 msgid "Cannot write SLIM configuration file" msgstr "نمی‌توان پروندهٔ پیکربندی LightDM را نوشت" -#: src/modules/displaymanager/main.py:715 +#: src/modules/displaymanager/main.py:717 msgid "SLIM config file {!s} does not exist" msgstr "پروندهٔ پیکربندی {!s} وجود ندارد" -#: src/modules/displaymanager/main.py:933 +#: src/modules/displaymanager/main.py:935 msgid "No display managers selected for the displaymanager module." msgstr "هیچ مدیر نمایشی برای پیمانهٔ displaymanager گزیده نشده." -#: src/modules/displaymanager/main.py:934 +#: src/modules/displaymanager/main.py:936 msgid "" "The displaymanagers list is empty or undefined in both globalstorage and " "displaymanager.conf." @@ -87,7 +87,7 @@ msgstr "" "فهرست مدیریت صفحه نمایش ها خالی بوده یا در محل ذخیره داده و " "displaymanager.conf تعریف نشده است." -#: src/modules/displaymanager/main.py:1021 +#: src/modules/displaymanager/main.py:1023 msgid "Display manager configuration was incomplete" msgstr "پیکربندی مدیر نمایش کامل نبود" @@ -118,8 +118,8 @@ msgid "Writing fstab." msgstr "در حال نوشتن fstab." #: src/modules/fstab/main.py:377 src/modules/fstab/main.py:383 -#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:245 -#: src/modules/initcpiocfg/main.py:249 src/modules/initramfscfg/main.py:85 +#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:267 +#: src/modules/initcpiocfg/main.py:271 src/modules/initramfscfg/main.py:85 #: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:140 #: src/modules/mount/main.py:329 src/modules/networkcfg/main.py:105 #: src/modules/openrcdmcryptcfg/main.py:72 @@ -156,11 +156,11 @@ msgstr "در حال تنظیم ساعت سخت‌افزاری." msgid "Configuring mkinitcpio." msgstr "پیکربندی mkinitcpio." -#: src/modules/initcpiocfg/main.py:246 +#: src/modules/initcpiocfg/main.py:268 msgid "No partitions are defined for
initcpiocfg
." msgstr "" -#: src/modules/initcpiocfg/main.py:250 +#: src/modules/initcpiocfg/main.py:272 msgid "No root mount point for
initcpiocfg
." msgstr "" @@ -240,12 +240,12 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "در حال برداشتن یک بسته." msgstr[1] "در حال برداشتن %(num)d بسته." -#: src/modules/packages/main.py:725 src/modules/packages/main.py:737 -#: src/modules/packages/main.py:765 +#: src/modules/packages/main.py:740 src/modules/packages/main.py:752 +#: src/modules/packages/main.py:780 msgid "Package Manager error" msgstr "خطای مدیر بسته" -#: src/modules/packages/main.py:726 +#: src/modules/packages/main.py:741 msgid "" "The package manager could not prepare updates. The command
{!s}
" "returned error code {!s}." @@ -253,7 +253,7 @@ msgstr "" "مدیر بسته نتوانست برای بروزرسانی ها آماده شود، دستور
{!s}
با خطای" " {!s} مواجه شد." -#: src/modules/packages/main.py:738 +#: src/modules/packages/main.py:753 msgid "" "The package manager could not update the system. The command
{!s}
" " returned error code {!s}." @@ -261,7 +261,7 @@ msgstr "" "مدیر بسته نتوانست سامانه را بروز کند. دستور
{!s}
با خطای {!s} " "مواجه شد." -#: src/modules/packages/main.py:766 +#: src/modules/packages/main.py:781 msgid "" "The package manager could not make changes to the installed system. The " "command
{!s}
returned error code {!s}." diff --git a/lang/python/fi_FI/LC_MESSAGES/python.po b/lang/python/fi_FI/LC_MESSAGES/python.po index 048cd801a..b99da7fe2 100644 --- a/lang/python/fi_FI/LC_MESSAGES/python.po +++ b/lang/python/fi_FI/LC_MESSAGES/python.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-24 23:38+0200\n" +"POT-Creation-Date: 2023-08-28 23:53+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Kimmo Kujansuu , 2023\n" "Language-Team: Finnish (Finland) (https://app.transifex.com/calamares/teams/20061/fi_FI/)\n" @@ -26,16 +26,16 @@ msgstr "" msgid "Install bootloader." msgstr "Asenna käynnistyslatain." -#: src/modules/bootloader/main.py:640 +#: src/modules/bootloader/main.py:644 msgid "Failed to install grub, no partitions defined in global storage" msgstr "" "Grubin asennus epäonnistui, yleisessä levytilassa ei ole määritetty osioita" -#: src/modules/bootloader/main.py:895 +#: src/modules/bootloader/main.py:899 msgid "Bootloader installation error" msgstr "Käynnistyslataimen asennusvirhe" -#: src/modules/bootloader/main.py:896 +#: src/modules/bootloader/main.py:900 msgid "" "The bootloader could not be installed. The installation command " "
{!s}
returned error code {!s}." @@ -43,43 +43,43 @@ msgstr "" "Käynnistyslatainta ei voitu asentaa. Asennuskomento
{!s}
palautti" " virhekoodin {!s}." -#: src/modules/displaymanager/main.py:507 +#: src/modules/displaymanager/main.py:509 msgid "Cannot write LXDM configuration file" msgstr "LXDM-määritystiedostoa ei voi kirjoittaa" -#: src/modules/displaymanager/main.py:508 +#: src/modules/displaymanager/main.py:510 msgid "LXDM config file {!s} does not exist" msgstr "LXDM-määritystiedostoa {!s} ei ole olemassa" -#: src/modules/displaymanager/main.py:596 +#: src/modules/displaymanager/main.py:598 msgid "Cannot write LightDM configuration file" msgstr "LightDM-määritystiedostoa ei voi kirjoittaa" -#: src/modules/displaymanager/main.py:597 +#: src/modules/displaymanager/main.py:599 msgid "LightDM config file {!s} does not exist" msgstr "LightDM-määritystiedostoa {!s} ei ole olemassa" -#: src/modules/displaymanager/main.py:682 +#: src/modules/displaymanager/main.py:684 msgid "Cannot configure LightDM" msgstr "LightDM-määritysvirhe" -#: src/modules/displaymanager/main.py:683 +#: src/modules/displaymanager/main.py:685 msgid "No LightDM greeter installed." msgstr "LightDM:ää ei ole asennettu." -#: src/modules/displaymanager/main.py:714 +#: src/modules/displaymanager/main.py:716 msgid "Cannot write SLIM configuration file" msgstr "SLIM-määritystiedostoa ei voi kirjoittaa" -#: src/modules/displaymanager/main.py:715 +#: src/modules/displaymanager/main.py:717 msgid "SLIM config file {!s} does not exist" msgstr "SLIM-määritystiedostoa {!s} ei ole olemassa" -#: src/modules/displaymanager/main.py:933 +#: src/modules/displaymanager/main.py:935 msgid "No display managers selected for the displaymanager module." msgstr "Displaymanager-moduulia varten ei ole valittu näytönhallintaa." -#: src/modules/displaymanager/main.py:934 +#: src/modules/displaymanager/main.py:936 msgid "" "The displaymanagers list is empty or undefined in both globalstorage and " "displaymanager.conf." @@ -87,7 +87,7 @@ msgstr "" "Luettelo on tyhjä tai määrittelemätön, sekä globalstorage, että " "displaymanager.conf tiedostossa." -#: src/modules/displaymanager/main.py:1021 +#: src/modules/displaymanager/main.py:1023 msgid "Display manager configuration was incomplete" msgstr "Näytönhallinnan kokoonpano oli puutteellinen" @@ -118,8 +118,8 @@ msgid "Writing fstab." msgstr "Kirjoitetaan fstabiin." #: src/modules/fstab/main.py:377 src/modules/fstab/main.py:383 -#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:245 -#: src/modules/initcpiocfg/main.py:249 src/modules/initramfscfg/main.py:85 +#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:267 +#: src/modules/initcpiocfg/main.py:271 src/modules/initramfscfg/main.py:85 #: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:140 #: src/modules/mount/main.py:329 src/modules/networkcfg/main.py:105 #: src/modules/openrcdmcryptcfg/main.py:72 @@ -157,11 +157,11 @@ msgstr "Asetetaan laitteiston kelloa." msgid "Configuring mkinitcpio." msgstr "Määritetään mkinitcpio." -#: src/modules/initcpiocfg/main.py:246 +#: src/modules/initcpiocfg/main.py:268 msgid "No partitions are defined for
initcpiocfg
." msgstr "Osiota ei ole määritetty käytettäväksi
initcpiocfg
." -#: src/modules/initcpiocfg/main.py:250 +#: src/modules/initcpiocfg/main.py:272 msgid "No root mount point for
initcpiocfg
." msgstr "Ei root liitospistettä käytettäväksi
initcpiocfg
." @@ -241,12 +241,12 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "Poistetaan yhtä pakettia." msgstr[1] "Poistetaan %(num)d pakettia." -#: src/modules/packages/main.py:725 src/modules/packages/main.py:737 -#: src/modules/packages/main.py:765 +#: src/modules/packages/main.py:740 src/modules/packages/main.py:752 +#: src/modules/packages/main.py:780 msgid "Package Manager error" msgstr "Paketinhallinnan virhe" -#: src/modules/packages/main.py:726 +#: src/modules/packages/main.py:741 msgid "" "The package manager could not prepare updates. The command
{!s}
" "returned error code {!s}." @@ -254,7 +254,7 @@ msgstr "" "Paketinhallinta ei voinut valmistella päivityksiä. Komento
{!s}
" "palautti virhekoodin {!s}." -#: src/modules/packages/main.py:738 +#: src/modules/packages/main.py:753 msgid "" "The package manager could not update the system. The command
{!s}
" " returned error code {!s}." @@ -262,7 +262,7 @@ msgstr "" "Paketinhallinta ei voinut päivittää järjestelmää. Komento
{!s}
" "palautti virhekoodin {!s}." -#: src/modules/packages/main.py:766 +#: src/modules/packages/main.py:781 msgid "" "The package manager could not make changes to the installed system. The " "command
{!s}
returned error code {!s}." diff --git a/lang/python/fr/LC_MESSAGES/python.po b/lang/python/fr/LC_MESSAGES/python.po index be3795414..61833f0a8 100644 --- a/lang/python/fr/LC_MESSAGES/python.po +++ b/lang/python/fr/LC_MESSAGES/python.po @@ -19,7 +19,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-24 23:38+0200\n" +"POT-Creation-Date: 2023-08-28 23:53+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: roxfr , 2022\n" "Language-Team: French (https://app.transifex.com/calamares/teams/20061/fr/)\n" @@ -33,17 +33,17 @@ msgstr "" msgid "Install bootloader." msgstr "Installation du bootloader." -#: src/modules/bootloader/main.py:640 +#: src/modules/bootloader/main.py:644 msgid "Failed to install grub, no partitions defined in global storage" msgstr "" "Échec de l'installation de grub, aucune partition définie dans le stockage " "global" -#: src/modules/bootloader/main.py:895 +#: src/modules/bootloader/main.py:899 msgid "Bootloader installation error" msgstr "Erreur d'installation du chargeur de démarrage" -#: src/modules/bootloader/main.py:896 +#: src/modules/bootloader/main.py:900 msgid "" "The bootloader could not be installed. The installation command " "
{!s}
returned error code {!s}." @@ -51,45 +51,45 @@ msgstr "" "Le chargeur de démarrage n'a pas pu être installé. La commande " "d'installation
{!s}
a renvoyé le code d'erreur {!s}." -#: src/modules/displaymanager/main.py:507 +#: src/modules/displaymanager/main.py:509 msgid "Cannot write LXDM configuration file" msgstr "Impossible d'écrire le fichier de configuration LXDM" -#: src/modules/displaymanager/main.py:508 +#: src/modules/displaymanager/main.py:510 msgid "LXDM config file {!s} does not exist" msgstr "Le fichier de configuration LXDM n'existe pas" -#: src/modules/displaymanager/main.py:596 +#: src/modules/displaymanager/main.py:598 msgid "Cannot write LightDM configuration file" msgstr "Impossible d'écrire le fichier de configuration LightDM" -#: src/modules/displaymanager/main.py:597 +#: src/modules/displaymanager/main.py:599 msgid "LightDM config file {!s} does not exist" msgstr "Le fichier de configuration LightDM {!S} n'existe pas" -#: src/modules/displaymanager/main.py:682 +#: src/modules/displaymanager/main.py:684 msgid "Cannot configure LightDM" msgstr "Impossible de configurer LightDM" -#: src/modules/displaymanager/main.py:683 +#: src/modules/displaymanager/main.py:685 msgid "No LightDM greeter installed." msgstr "Aucun hôte LightDM est installé" -#: src/modules/displaymanager/main.py:714 +#: src/modules/displaymanager/main.py:716 msgid "Cannot write SLIM configuration file" msgstr "Impossible d'écrire le fichier de configuration SLIM" -#: src/modules/displaymanager/main.py:715 +#: src/modules/displaymanager/main.py:717 msgid "SLIM config file {!s} does not exist" msgstr "Le fichier de configuration SLIM {!S} n'existe pas" -#: src/modules/displaymanager/main.py:933 +#: src/modules/displaymanager/main.py:935 msgid "No display managers selected for the displaymanager module." msgstr "" "Aucun gestionnaire d'affichage n'a été sélectionné pour le module de " "gestionnaire d'affichage" -#: src/modules/displaymanager/main.py:934 +#: src/modules/displaymanager/main.py:936 msgid "" "The displaymanagers list is empty or undefined in both globalstorage and " "displaymanager.conf." @@ -97,7 +97,7 @@ msgstr "" "La liste des gestionnaires d'affichage est vide ou indéfinie à la fois dans " "globalstorage et displaymanager.conf." -#: src/modules/displaymanager/main.py:1021 +#: src/modules/displaymanager/main.py:1023 msgid "Display manager configuration was incomplete" msgstr "La configuration du gestionnaire d'affichage était incomplète" @@ -128,8 +128,8 @@ msgid "Writing fstab." msgstr "Écriture du fstab." #: src/modules/fstab/main.py:377 src/modules/fstab/main.py:383 -#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:245 -#: src/modules/initcpiocfg/main.py:249 src/modules/initramfscfg/main.py:85 +#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:267 +#: src/modules/initcpiocfg/main.py:271 src/modules/initramfscfg/main.py:85 #: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:140 #: src/modules/mount/main.py:329 src/modules/networkcfg/main.py:105 #: src/modules/openrcdmcryptcfg/main.py:72 @@ -170,11 +170,11 @@ msgstr "Configuration de l'horloge matériel." msgid "Configuring mkinitcpio." msgstr "Configuration de mkinitcpio." -#: src/modules/initcpiocfg/main.py:246 +#: src/modules/initcpiocfg/main.py:268 msgid "No partitions are defined for
initcpiocfg
." msgstr "" -#: src/modules/initcpiocfg/main.py:250 +#: src/modules/initcpiocfg/main.py:272 msgid "No root mount point for
initcpiocfg
." msgstr "" @@ -256,12 +256,12 @@ msgstr[0] "Suppression d'un paquet." msgstr[1] "Suppression de %(num)d paquets." msgstr[2] "Suppression de %(num)d paquets." -#: src/modules/packages/main.py:725 src/modules/packages/main.py:737 -#: src/modules/packages/main.py:765 +#: src/modules/packages/main.py:740 src/modules/packages/main.py:752 +#: src/modules/packages/main.py:780 msgid "Package Manager error" msgstr "Erreur du gestionnaire de paquets" -#: src/modules/packages/main.py:726 +#: src/modules/packages/main.py:741 msgid "" "The package manager could not prepare updates. The command
{!s}
" "returned error code {!s}." @@ -269,7 +269,7 @@ msgstr "" "Le gestionnaire de paquets n'a pas pu préparer les mises à jour. La commande" "
{!s}
a renvoyé le code d'erreur {!s}." -#: src/modules/packages/main.py:738 +#: src/modules/packages/main.py:753 msgid "" "The package manager could not update the system. The command
{!s}
" " returned error code {!s}." @@ -277,7 +277,7 @@ msgstr "" "Le gestionnaire de paquets n'a pas pu mettre à jour le système. La commande " "
{!s}
a renvoyé le code d'erreur {!s}." -#: src/modules/packages/main.py:766 +#: src/modules/packages/main.py:781 msgid "" "The package manager could not make changes to the installed system. The " "command
{!s}
returned error code {!s}." diff --git a/lang/python/fur/LC_MESSAGES/python.po b/lang/python/fur/LC_MESSAGES/python.po index 5d251d865..826ba97c2 100644 --- a/lang/python/fur/LC_MESSAGES/python.po +++ b/lang/python/fur/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-24 23:38+0200\n" +"POT-Creation-Date: 2023-08-28 23:53+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Fabio Tomat , 2020\n" "Language-Team: Friulian (https://app.transifex.com/calamares/teams/20061/fur/)\n" @@ -25,57 +25,57 @@ msgstr "" msgid "Install bootloader." msgstr "Instale il bootloader." -#: src/modules/bootloader/main.py:640 +#: src/modules/bootloader/main.py:644 msgid "Failed to install grub, no partitions defined in global storage" msgstr "" -#: src/modules/bootloader/main.py:895 +#: src/modules/bootloader/main.py:899 msgid "Bootloader installation error" msgstr "" -#: src/modules/bootloader/main.py:896 +#: src/modules/bootloader/main.py:900 msgid "" "The bootloader could not be installed. The installation command " "
{!s}
returned error code {!s}." msgstr "" -#: src/modules/displaymanager/main.py:507 +#: src/modules/displaymanager/main.py:509 msgid "Cannot write LXDM configuration file" msgstr "Impussibil scrivi il file di configurazion di LXDM" -#: src/modules/displaymanager/main.py:508 +#: src/modules/displaymanager/main.py:510 msgid "LXDM config file {!s} does not exist" msgstr "Il file di configurazion di LXDM {!s} nol esist" -#: src/modules/displaymanager/main.py:596 +#: src/modules/displaymanager/main.py:598 msgid "Cannot write LightDM configuration file" msgstr "Impussibil scrivi il file di configurazion di LightDM" -#: src/modules/displaymanager/main.py:597 +#: src/modules/displaymanager/main.py:599 msgid "LightDM config file {!s} does not exist" msgstr "Il file di configurazion di LightDM {!s} nol esist" -#: src/modules/displaymanager/main.py:682 +#: src/modules/displaymanager/main.py:684 msgid "Cannot configure LightDM" msgstr "Impussibil configurâ LightDM" -#: src/modules/displaymanager/main.py:683 +#: src/modules/displaymanager/main.py:685 msgid "No LightDM greeter installed." msgstr "Nissun menù di benvignût par LightDM instalât." -#: src/modules/displaymanager/main.py:714 +#: src/modules/displaymanager/main.py:716 msgid "Cannot write SLIM configuration file" msgstr "Impussibil scrivi il file di configurazion SLIM" -#: src/modules/displaymanager/main.py:715 +#: src/modules/displaymanager/main.py:717 msgid "SLIM config file {!s} does not exist" msgstr "Il file di configurazion di SLIM {!s} nol esist" -#: src/modules/displaymanager/main.py:933 +#: src/modules/displaymanager/main.py:935 msgid "No display managers selected for the displaymanager module." msgstr "Nissun gjestôr di visôrs selezionât pal modul displaymanager." -#: src/modules/displaymanager/main.py:934 +#: src/modules/displaymanager/main.py:936 msgid "" "The displaymanagers list is empty or undefined in both globalstorage and " "displaymanager.conf." @@ -83,7 +83,7 @@ msgstr "" "La liste dai gjestôrs di visôrs e je vueide o no je definide sedi in " "globalstorage che in displaymanager.conf." -#: src/modules/displaymanager/main.py:1021 +#: src/modules/displaymanager/main.py:1023 msgid "Display manager configuration was incomplete" msgstr "La configurazion dal gjestôr dai visôrs no jere complete" @@ -114,8 +114,8 @@ msgid "Writing fstab." msgstr "Daûr a scrivi fstab." #: src/modules/fstab/main.py:377 src/modules/fstab/main.py:383 -#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:245 -#: src/modules/initcpiocfg/main.py:249 src/modules/initramfscfg/main.py:85 +#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:267 +#: src/modules/initcpiocfg/main.py:271 src/modules/initramfscfg/main.py:85 #: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:140 #: src/modules/mount/main.py:329 src/modules/networkcfg/main.py:105 #: src/modules/openrcdmcryptcfg/main.py:72 @@ -152,11 +152,11 @@ msgstr "Daûr a configurâ l'orloi hardware." msgid "Configuring mkinitcpio." msgstr "Daûr a configurâ di mkinitcpio." -#: src/modules/initcpiocfg/main.py:246 +#: src/modules/initcpiocfg/main.py:268 msgid "No partitions are defined for
initcpiocfg
." msgstr "" -#: src/modules/initcpiocfg/main.py:250 +#: src/modules/initcpiocfg/main.py:272 msgid "No root mount point for
initcpiocfg
." msgstr "" @@ -236,24 +236,24 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "Daûr a gjavâ un pachet." msgstr[1] "Daûr a gjavâ %(num)d pachets." -#: src/modules/packages/main.py:725 src/modules/packages/main.py:737 -#: src/modules/packages/main.py:765 +#: src/modules/packages/main.py:740 src/modules/packages/main.py:752 +#: src/modules/packages/main.py:780 msgid "Package Manager error" msgstr "" -#: src/modules/packages/main.py:726 +#: src/modules/packages/main.py:741 msgid "" "The package manager could not prepare updates. The command
{!s}
" "returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:738 +#: src/modules/packages/main.py:753 msgid "" "The package manager could not update the system. The command
{!s}
" " returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:766 +#: src/modules/packages/main.py:781 msgid "" "The package manager could not make changes to the installed system. The " "command
{!s}
returned error code {!s}." diff --git a/lang/python/gl/LC_MESSAGES/python.po b/lang/python/gl/LC_MESSAGES/python.po index e091edea2..3c13d081b 100644 --- a/lang/python/gl/LC_MESSAGES/python.po +++ b/lang/python/gl/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-24 23:38+0200\n" +"POT-Creation-Date: 2023-08-28 23:53+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Xosé, 2018\n" "Language-Team: Galician (https://app.transifex.com/calamares/teams/20061/gl/)\n" @@ -25,64 +25,64 @@ msgstr "" msgid "Install bootloader." msgstr "" -#: src/modules/bootloader/main.py:640 +#: src/modules/bootloader/main.py:644 msgid "Failed to install grub, no partitions defined in global storage" msgstr "" -#: src/modules/bootloader/main.py:895 +#: src/modules/bootloader/main.py:899 msgid "Bootloader installation error" msgstr "" -#: src/modules/bootloader/main.py:896 +#: src/modules/bootloader/main.py:900 msgid "" "The bootloader could not be installed. The installation command " "
{!s}
returned error code {!s}." msgstr "" -#: src/modules/displaymanager/main.py:507 +#: src/modules/displaymanager/main.py:509 msgid "Cannot write LXDM configuration file" msgstr "Non é posíbel escribir o ficheiro de configuración de LXDM" -#: src/modules/displaymanager/main.py:508 +#: src/modules/displaymanager/main.py:510 msgid "LXDM config file {!s} does not exist" msgstr "O ficheiro de configuración de LXDM {!s} non existe" -#: src/modules/displaymanager/main.py:596 +#: src/modules/displaymanager/main.py:598 msgid "Cannot write LightDM configuration file" msgstr "Non é posíbel escribir o ficheiro de configuración de LightDM" -#: src/modules/displaymanager/main.py:597 +#: src/modules/displaymanager/main.py:599 msgid "LightDM config file {!s} does not exist" msgstr "O ficheiro de configuración de LightDM {!s} non existe" -#: src/modules/displaymanager/main.py:682 +#: src/modules/displaymanager/main.py:684 msgid "Cannot configure LightDM" msgstr "Non é posíbel configurar LightDM" -#: src/modules/displaymanager/main.py:683 +#: src/modules/displaymanager/main.py:685 msgid "No LightDM greeter installed." msgstr "Non se instalou o saudador de LightDM." -#: src/modules/displaymanager/main.py:714 +#: src/modules/displaymanager/main.py:716 msgid "Cannot write SLIM configuration file" msgstr "Non é posíbel escribir o ficheiro de configuración de SLIM" -#: src/modules/displaymanager/main.py:715 +#: src/modules/displaymanager/main.py:717 msgid "SLIM config file {!s} does not exist" msgstr "O ficheiro de configuración de SLIM {!s} non existe" -#: src/modules/displaymanager/main.py:933 +#: src/modules/displaymanager/main.py:935 msgid "No display managers selected for the displaymanager module." msgstr "" "Non hai xestores de pantalla seleccionados para o módulo displaymanager." -#: src/modules/displaymanager/main.py:934 +#: src/modules/displaymanager/main.py:936 msgid "" "The displaymanagers list is empty or undefined in both globalstorage and " "displaymanager.conf." msgstr "" -#: src/modules/displaymanager/main.py:1021 +#: src/modules/displaymanager/main.py:1023 msgid "Display manager configuration was incomplete" msgstr "A configuración do xestor de pantalla foi incompleta" @@ -113,8 +113,8 @@ msgid "Writing fstab." msgstr "" #: src/modules/fstab/main.py:377 src/modules/fstab/main.py:383 -#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:245 -#: src/modules/initcpiocfg/main.py:249 src/modules/initramfscfg/main.py:85 +#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:267 +#: src/modules/initcpiocfg/main.py:271 src/modules/initramfscfg/main.py:85 #: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:140 #: src/modules/mount/main.py:329 src/modules/networkcfg/main.py:105 #: src/modules/openrcdmcryptcfg/main.py:72 @@ -150,11 +150,11 @@ msgstr "" msgid "Configuring mkinitcpio." msgstr "" -#: src/modules/initcpiocfg/main.py:246 +#: src/modules/initcpiocfg/main.py:268 msgid "No partitions are defined for
initcpiocfg
." msgstr "" -#: src/modules/initcpiocfg/main.py:250 +#: src/modules/initcpiocfg/main.py:272 msgid "No root mount point for
initcpiocfg
." msgstr "" @@ -234,24 +234,24 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "A retirar un paquete." msgstr[1] "A retirar %(num)d paquetes." -#: src/modules/packages/main.py:725 src/modules/packages/main.py:737 -#: src/modules/packages/main.py:765 +#: src/modules/packages/main.py:740 src/modules/packages/main.py:752 +#: src/modules/packages/main.py:780 msgid "Package Manager error" msgstr "" -#: src/modules/packages/main.py:726 +#: src/modules/packages/main.py:741 msgid "" "The package manager could not prepare updates. The command
{!s}
" "returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:738 +#: src/modules/packages/main.py:753 msgid "" "The package manager could not update the system. The command
{!s}
" " returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:766 +#: src/modules/packages/main.py:781 msgid "" "The package manager could not make changes to the installed system. The " "command
{!s}
returned error code {!s}." diff --git a/lang/python/gu/LC_MESSAGES/python.po b/lang/python/gu/LC_MESSAGES/python.po index b62591307..b171c2438 100644 --- a/lang/python/gu/LC_MESSAGES/python.po +++ b/lang/python/gu/LC_MESSAGES/python.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-24 23:38+0200\n" +"POT-Creation-Date: 2023-08-28 23:53+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Gujarati (https://app.transifex.com/calamares/teams/20061/gu/)\n" "MIME-Version: 1.0\n" @@ -21,63 +21,63 @@ msgstr "" msgid "Install bootloader." msgstr "" -#: src/modules/bootloader/main.py:640 +#: src/modules/bootloader/main.py:644 msgid "Failed to install grub, no partitions defined in global storage" msgstr "" -#: src/modules/bootloader/main.py:895 +#: src/modules/bootloader/main.py:899 msgid "Bootloader installation error" msgstr "" -#: src/modules/bootloader/main.py:896 +#: src/modules/bootloader/main.py:900 msgid "" "The bootloader could not be installed. The installation command " "
{!s}
returned error code {!s}." msgstr "" -#: src/modules/displaymanager/main.py:507 +#: src/modules/displaymanager/main.py:509 msgid "Cannot write LXDM configuration file" msgstr "" -#: src/modules/displaymanager/main.py:508 +#: src/modules/displaymanager/main.py:510 msgid "LXDM config file {!s} does not exist" msgstr "" -#: src/modules/displaymanager/main.py:596 +#: src/modules/displaymanager/main.py:598 msgid "Cannot write LightDM configuration file" msgstr "" -#: src/modules/displaymanager/main.py:597 +#: src/modules/displaymanager/main.py:599 msgid "LightDM config file {!s} does not exist" msgstr "" -#: src/modules/displaymanager/main.py:682 +#: src/modules/displaymanager/main.py:684 msgid "Cannot configure LightDM" msgstr "" -#: src/modules/displaymanager/main.py:683 +#: src/modules/displaymanager/main.py:685 msgid "No LightDM greeter installed." msgstr "" -#: src/modules/displaymanager/main.py:714 +#: src/modules/displaymanager/main.py:716 msgid "Cannot write SLIM configuration file" msgstr "" -#: src/modules/displaymanager/main.py:715 +#: src/modules/displaymanager/main.py:717 msgid "SLIM config file {!s} does not exist" msgstr "" -#: src/modules/displaymanager/main.py:933 +#: src/modules/displaymanager/main.py:935 msgid "No display managers selected for the displaymanager module." msgstr "" -#: src/modules/displaymanager/main.py:934 +#: src/modules/displaymanager/main.py:936 msgid "" "The displaymanagers list is empty or undefined in both globalstorage and " "displaymanager.conf." msgstr "" -#: src/modules/displaymanager/main.py:1021 +#: src/modules/displaymanager/main.py:1023 msgid "Display manager configuration was incomplete" msgstr "" @@ -108,8 +108,8 @@ msgid "Writing fstab." msgstr "" #: src/modules/fstab/main.py:377 src/modules/fstab/main.py:383 -#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:245 -#: src/modules/initcpiocfg/main.py:249 src/modules/initramfscfg/main.py:85 +#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:267 +#: src/modules/initcpiocfg/main.py:271 src/modules/initramfscfg/main.py:85 #: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:140 #: src/modules/mount/main.py:329 src/modules/networkcfg/main.py:105 #: src/modules/openrcdmcryptcfg/main.py:72 @@ -145,11 +145,11 @@ msgstr "" msgid "Configuring mkinitcpio." msgstr "" -#: src/modules/initcpiocfg/main.py:246 +#: src/modules/initcpiocfg/main.py:268 msgid "No partitions are defined for
initcpiocfg
." msgstr "" -#: src/modules/initcpiocfg/main.py:250 +#: src/modules/initcpiocfg/main.py:272 msgid "No root mount point for
initcpiocfg
." msgstr "" @@ -229,24 +229,24 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "" msgstr[1] "" -#: src/modules/packages/main.py:725 src/modules/packages/main.py:737 -#: src/modules/packages/main.py:765 +#: src/modules/packages/main.py:740 src/modules/packages/main.py:752 +#: src/modules/packages/main.py:780 msgid "Package Manager error" msgstr "" -#: src/modules/packages/main.py:726 +#: src/modules/packages/main.py:741 msgid "" "The package manager could not prepare updates. The command
{!s}
" "returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:738 +#: src/modules/packages/main.py:753 msgid "" "The package manager could not update the system. The command
{!s}
" " returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:766 +#: src/modules/packages/main.py:781 msgid "" "The package manager could not make changes to the installed system. The " "command
{!s}
returned error code {!s}." diff --git a/lang/python/he/LC_MESSAGES/python.po b/lang/python/he/LC_MESSAGES/python.po index f9eee8841..c96761870 100644 --- a/lang/python/he/LC_MESSAGES/python.po +++ b/lang/python/he/LC_MESSAGES/python.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-24 23:38+0200\n" +"POT-Creation-Date: 2023-08-28 23:53+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Yaron Shahrabani , 2023\n" "Language-Team: Hebrew (https://app.transifex.com/calamares/teams/20061/he/)\n" @@ -27,15 +27,15 @@ msgstr "" msgid "Install bootloader." msgstr "התקנת מנהל אתחול." -#: src/modules/bootloader/main.py:640 +#: src/modules/bootloader/main.py:644 msgid "Failed to install grub, no partitions defined in global storage" msgstr "ההתקנה של grub נכשלה, לא הוגדרו מחיצות באחסון הכללי" -#: src/modules/bootloader/main.py:895 +#: src/modules/bootloader/main.py:899 msgid "Bootloader installation error" msgstr "שגיאת התקנת מנהל אתחול" -#: src/modules/bootloader/main.py:896 +#: src/modules/bootloader/main.py:900 msgid "" "The bootloader could not be installed. The installation command " "
{!s}
returned error code {!s}." @@ -43,43 +43,43 @@ msgstr "" "לא ניתן להתקין את מנהל האתחול. פקודת ההתקנה
{!s}
החזירה את קוד " "השגיאה {!s}." -#: src/modules/displaymanager/main.py:507 +#: src/modules/displaymanager/main.py:509 msgid "Cannot write LXDM configuration file" msgstr "לא ניתן לכתוב את קובץ התצורה של LXDM" -#: src/modules/displaymanager/main.py:508 +#: src/modules/displaymanager/main.py:510 msgid "LXDM config file {!s} does not exist" msgstr "קובץ התצורה של LXDM ‏{!s} אינו קיים" -#: src/modules/displaymanager/main.py:596 +#: src/modules/displaymanager/main.py:598 msgid "Cannot write LightDM configuration file" msgstr "לא ניתן לכתוב את קובץ התצורה של LightDM" -#: src/modules/displaymanager/main.py:597 +#: src/modules/displaymanager/main.py:599 msgid "LightDM config file {!s} does not exist" msgstr "קובץ התצורה של LightDM ‏{!s} אינו קיים" -#: src/modules/displaymanager/main.py:682 +#: src/modules/displaymanager/main.py:684 msgid "Cannot configure LightDM" msgstr "לא ניתן להגדיר את LightDM" -#: src/modules/displaymanager/main.py:683 +#: src/modules/displaymanager/main.py:685 msgid "No LightDM greeter installed." msgstr "לא מותקן מקבל פנים מסוג LightDM." -#: src/modules/displaymanager/main.py:714 +#: src/modules/displaymanager/main.py:716 msgid "Cannot write SLIM configuration file" msgstr "לא ניתן לכתוב קובץ תצורה של SLIM." -#: src/modules/displaymanager/main.py:715 +#: src/modules/displaymanager/main.py:717 msgid "SLIM config file {!s} does not exist" msgstr "קובץ התצורה {!s} של SLIM אינו קיים" -#: src/modules/displaymanager/main.py:933 +#: src/modules/displaymanager/main.py:935 msgid "No display managers selected for the displaymanager module." msgstr "לא נבחרו מנהלי תצוגה למודול displaymanager." -#: src/modules/displaymanager/main.py:934 +#: src/modules/displaymanager/main.py:936 msgid "" "The displaymanagers list is empty or undefined in both globalstorage and " "displaymanager.conf." @@ -87,7 +87,7 @@ msgstr "" "רשימת מנהלי התצוגה ריקה או שאינה מוגדרת גם באחסון הכללי (globalstorage) וגם " "ב־displaymanager.conf." -#: src/modules/displaymanager/main.py:1021 +#: src/modules/displaymanager/main.py:1023 msgid "Display manager configuration was incomplete" msgstr "תצורת מנהל התצוגה אינה שלמה" @@ -118,8 +118,8 @@ msgid "Writing fstab." msgstr "fstab נכתב." #: src/modules/fstab/main.py:377 src/modules/fstab/main.py:383 -#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:245 -#: src/modules/initcpiocfg/main.py:249 src/modules/initramfscfg/main.py:85 +#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:267 +#: src/modules/initcpiocfg/main.py:271 src/modules/initramfscfg/main.py:85 #: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:140 #: src/modules/mount/main.py:329 src/modules/networkcfg/main.py:105 #: src/modules/openrcdmcryptcfg/main.py:72 @@ -155,11 +155,11 @@ msgstr "שעון החומרה מוגדר." msgid "Configuring mkinitcpio." msgstr "mkinitcpio מותקן." -#: src/modules/initcpiocfg/main.py:246 +#: src/modules/initcpiocfg/main.py:268 msgid "No partitions are defined for
initcpiocfg
." msgstr "לא מוגדרות מחיצות עבור
initcpiocfg
." -#: src/modules/initcpiocfg/main.py:250 +#: src/modules/initcpiocfg/main.py:272 msgid "No root mount point for
initcpiocfg
." msgstr "אין נקודת עגינת שורש עבור
initcpiocfg
." @@ -243,12 +243,12 @@ msgstr[1] "מתבצעת הסרה של %(num)d חבילות." msgstr[2] "מתבצעת הסרה של %(num)d חבילות." msgstr[3] "מתבצעת הסרה של %(num)d חבילות." -#: src/modules/packages/main.py:725 src/modules/packages/main.py:737 -#: src/modules/packages/main.py:765 +#: src/modules/packages/main.py:740 src/modules/packages/main.py:752 +#: src/modules/packages/main.py:780 msgid "Package Manager error" msgstr "שגיאת מנהל חבילות" -#: src/modules/packages/main.py:726 +#: src/modules/packages/main.py:741 msgid "" "The package manager could not prepare updates. The command
{!s}
" "returned error code {!s}." @@ -256,7 +256,7 @@ msgstr "" "מנהל החבילות לא הצליח להכין את העדכונים. הפקודה
{!s}
החזירה את " "קוד השגיאה {!s}." -#: src/modules/packages/main.py:738 +#: src/modules/packages/main.py:753 msgid "" "The package manager could not update the system. The command
{!s}
" " returned error code {!s}." @@ -264,7 +264,7 @@ msgstr "" "מנהל החבילות לא הצליח לעדכן את המערכת. הפקודה
{!s}
החזירה את קוד " "השגיאה {!s}." -#: src/modules/packages/main.py:766 +#: src/modules/packages/main.py:781 msgid "" "The package manager could not make changes to the installed system. The " "command
{!s}
returned error code {!s}." diff --git a/lang/python/hi/LC_MESSAGES/python.po b/lang/python/hi/LC_MESSAGES/python.po index dfbb4564e..942e04c8e 100644 --- a/lang/python/hi/LC_MESSAGES/python.po +++ b/lang/python/hi/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-24 23:38+0200\n" +"POT-Creation-Date: 2023-08-28 23:53+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Panwar108 , 2022\n" "Language-Team: Hindi (https://app.transifex.com/calamares/teams/20061/hi/)\n" @@ -25,15 +25,15 @@ msgstr "" msgid "Install bootloader." msgstr "बूट लोडर इंस्टॉल करना।" -#: src/modules/bootloader/main.py:640 +#: src/modules/bootloader/main.py:644 msgid "Failed to install grub, no partitions defined in global storage" msgstr "grub इंस्टॉल करना विफल, सर्वत्र संचयन में कोई विभाजन परिभाषित नहीं है" -#: src/modules/bootloader/main.py:895 +#: src/modules/bootloader/main.py:899 msgid "Bootloader installation error" msgstr "बूट लोडर इंस्टॉल त्रुटि" -#: src/modules/bootloader/main.py:896 +#: src/modules/bootloader/main.py:900 msgid "" "The bootloader could not be installed. The installation command " "
{!s}
returned error code {!s}." @@ -41,43 +41,43 @@ msgstr "" "बूट लोडर इंस्टॉल करना विफल। इंस्टॉल कमांड
{!s}
हेतु त्रुटि कोड " "{!s} प्राप्त।" -#: src/modules/displaymanager/main.py:507 +#: src/modules/displaymanager/main.py:509 msgid "Cannot write LXDM configuration file" msgstr "LXDM विन्यास फ़ाइल राइट नहीं की जा सकती" -#: src/modules/displaymanager/main.py:508 +#: src/modules/displaymanager/main.py:510 msgid "LXDM config file {!s} does not exist" msgstr "LXDM विन्यास फ़ाइल {!s} मौजूद नहीं है" -#: src/modules/displaymanager/main.py:596 +#: src/modules/displaymanager/main.py:598 msgid "Cannot write LightDM configuration file" msgstr "LightDM विन्यास फ़ाइल राइट नहीं की जा सकती" -#: src/modules/displaymanager/main.py:597 +#: src/modules/displaymanager/main.py:599 msgid "LightDM config file {!s} does not exist" msgstr "LightDM विन्यास फ़ाइल {!s} मौजूद नहीं है" -#: src/modules/displaymanager/main.py:682 +#: src/modules/displaymanager/main.py:684 msgid "Cannot configure LightDM" msgstr "LightDM को विन्यस्त नहीं किया जा सकता" -#: src/modules/displaymanager/main.py:683 +#: src/modules/displaymanager/main.py:685 msgid "No LightDM greeter installed." msgstr "कोई LightDM लॉगिन स्क्रीन इंस्टॉल नहीं है।" -#: src/modules/displaymanager/main.py:714 +#: src/modules/displaymanager/main.py:716 msgid "Cannot write SLIM configuration file" msgstr "SLIM विन्यास फ़ाइल राइट नहीं की जा सकती" -#: src/modules/displaymanager/main.py:715 +#: src/modules/displaymanager/main.py:717 msgid "SLIM config file {!s} does not exist" msgstr "SLIM विन्यास फ़ाइल {!s} मौजूद नहीं है" -#: src/modules/displaymanager/main.py:933 +#: src/modules/displaymanager/main.py:935 msgid "No display managers selected for the displaymanager module." msgstr "चयनित डिस्प्ले प्रबंधक मॉड्यूल हेतु कोई डिस्प्ले प्रबंधक नहीं मिला।" -#: src/modules/displaymanager/main.py:934 +#: src/modules/displaymanager/main.py:936 msgid "" "The displaymanagers list is empty or undefined in both globalstorage and " "displaymanager.conf." @@ -85,7 +85,7 @@ msgstr "" "globalstorage व displaymanager.conf में डिस्प्ले प्रबंधक सूची रिक्त या " "अपरिभाषित है।" -#: src/modules/displaymanager/main.py:1021 +#: src/modules/displaymanager/main.py:1023 msgid "Display manager configuration was incomplete" msgstr "डिस्प्ले प्रबंधक विन्यास अधूरा था" @@ -116,8 +116,8 @@ msgid "Writing fstab." msgstr "fstab पर राइट करना।" #: src/modules/fstab/main.py:377 src/modules/fstab/main.py:383 -#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:245 -#: src/modules/initcpiocfg/main.py:249 src/modules/initramfscfg/main.py:85 +#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:267 +#: src/modules/initcpiocfg/main.py:271 src/modules/initramfscfg/main.py:85 #: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:140 #: src/modules/mount/main.py:329 src/modules/networkcfg/main.py:105 #: src/modules/openrcdmcryptcfg/main.py:72 @@ -156,11 +156,11 @@ msgstr "हार्डवेयर घड़ी सेट करना।" msgid "Configuring mkinitcpio." msgstr "mkinitcpio को विन्यस्त करना।" -#: src/modules/initcpiocfg/main.py:246 +#: src/modules/initcpiocfg/main.py:268 msgid "No partitions are defined for
initcpiocfg
." msgstr "" -#: src/modules/initcpiocfg/main.py:250 +#: src/modules/initcpiocfg/main.py:272 msgid "No root mount point for
initcpiocfg
." msgstr "" @@ -240,12 +240,12 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "एक पैकेज हटाया जा रहा है।" msgstr[1] "%(num)d पैकेज हटाए जा रहे हैं।" -#: src/modules/packages/main.py:725 src/modules/packages/main.py:737 -#: src/modules/packages/main.py:765 +#: src/modules/packages/main.py:740 src/modules/packages/main.py:752 +#: src/modules/packages/main.py:780 msgid "Package Manager error" msgstr "पैकेज प्रबंधक त्रुटि" -#: src/modules/packages/main.py:726 +#: src/modules/packages/main.py:741 msgid "" "The package manager could not prepare updates. The command
{!s}
" "returned error code {!s}." @@ -253,7 +253,7 @@ msgstr "" "पैकेज प्रबंधक द्वारा अपडेट तैयार करना विफल। कमांड
{!s}
हेतु " "त्रुटि कोड {!s} प्राप्त।" -#: src/modules/packages/main.py:738 +#: src/modules/packages/main.py:753 msgid "" "The package manager could not update the system. The command
{!s}
" " returned error code {!s}." @@ -261,7 +261,7 @@ msgstr "" "पैकेज प्रबंधक द्वारा सिस्टम अपडेट करना विफल। कमांड
{!s}
हेतु " "त्रुटि कोड {!s} प्राप्त।" -#: src/modules/packages/main.py:766 +#: src/modules/packages/main.py:781 msgid "" "The package manager could not make changes to the installed system. The " "command
{!s}
returned error code {!s}." diff --git a/lang/python/hr/LC_MESSAGES/python.po b/lang/python/hr/LC_MESSAGES/python.po index 51e222c8e..df8518004 100644 --- a/lang/python/hr/LC_MESSAGES/python.po +++ b/lang/python/hr/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-24 23:38+0200\n" +"POT-Creation-Date: 2023-08-28 23:53+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Lovro Kudelić , 2023\n" "Language-Team: Croatian (https://app.transifex.com/calamares/teams/20061/hr/)\n" @@ -25,17 +25,17 @@ msgstr "" msgid "Install bootloader." msgstr "Instaliram bootloader." -#: src/modules/bootloader/main.py:640 +#: src/modules/bootloader/main.py:644 msgid "Failed to install grub, no partitions defined in global storage" msgstr "" "Instalacija gruba nije uspjela, nema definiranih particija u globalnoj " "pohrani" -#: src/modules/bootloader/main.py:895 +#: src/modules/bootloader/main.py:899 msgid "Bootloader installation error" msgstr "Greška prilikom instalacije bootloadera" -#: src/modules/bootloader/main.py:896 +#: src/modules/bootloader/main.py:900 msgid "" "The bootloader could not be installed. The installation command " "
{!s}
returned error code {!s}." @@ -43,43 +43,43 @@ msgstr "" "Bootloader nije mogao biti instaliran. Instalacijska naredba
{!s}
" " je vratila kod pogreške {!s}." -#: src/modules/displaymanager/main.py:507 +#: src/modules/displaymanager/main.py:509 msgid "Cannot write LXDM configuration file" msgstr "Ne mogu zapisati LXDM konfiguracijsku datoteku" -#: src/modules/displaymanager/main.py:508 +#: src/modules/displaymanager/main.py:510 msgid "LXDM config file {!s} does not exist" msgstr "LXDM konfiguracijska datoteka {!s} ne postoji" -#: src/modules/displaymanager/main.py:596 +#: src/modules/displaymanager/main.py:598 msgid "Cannot write LightDM configuration file" msgstr "Ne moku zapisati LightDM konfiguracijsku datoteku" -#: src/modules/displaymanager/main.py:597 +#: src/modules/displaymanager/main.py:599 msgid "LightDM config file {!s} does not exist" msgstr "LightDM konfiguracijska datoteka {!s} ne postoji" -#: src/modules/displaymanager/main.py:682 +#: src/modules/displaymanager/main.py:684 msgid "Cannot configure LightDM" msgstr "Ne mogu konfigurirati LightDM" -#: src/modules/displaymanager/main.py:683 +#: src/modules/displaymanager/main.py:685 msgid "No LightDM greeter installed." msgstr "Nije instaliran LightDM pozdravnik." -#: src/modules/displaymanager/main.py:714 +#: src/modules/displaymanager/main.py:716 msgid "Cannot write SLIM configuration file" msgstr "Ne mogu zapisati SLIM konfiguracijsku datoteku" -#: src/modules/displaymanager/main.py:715 +#: src/modules/displaymanager/main.py:717 msgid "SLIM config file {!s} does not exist" msgstr "SLIM konfiguracijska datoteka {!s} ne postoji" -#: src/modules/displaymanager/main.py:933 +#: src/modules/displaymanager/main.py:935 msgid "No display managers selected for the displaymanager module." msgstr "Nisu odabrani upravitelji zaslona za modul displaymanager." -#: src/modules/displaymanager/main.py:934 +#: src/modules/displaymanager/main.py:936 msgid "" "The displaymanagers list is empty or undefined in both globalstorage and " "displaymanager.conf." @@ -87,7 +87,7 @@ msgstr "" "Popis upravitelja zaslona je prazan ili nedefiniran u oba globalstorage i " "displaymanager.conf." -#: src/modules/displaymanager/main.py:1021 +#: src/modules/displaymanager/main.py:1023 msgid "Display manager configuration was incomplete" msgstr "Konfiguracija upravitelja zaslona nije bila potpuna" @@ -118,8 +118,8 @@ msgid "Writing fstab." msgstr "Zapisujem fstab." #: src/modules/fstab/main.py:377 src/modules/fstab/main.py:383 -#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:245 -#: src/modules/initcpiocfg/main.py:249 src/modules/initramfscfg/main.py:85 +#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:267 +#: src/modules/initcpiocfg/main.py:271 src/modules/initramfscfg/main.py:85 #: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:140 #: src/modules/mount/main.py:329 src/modules/networkcfg/main.py:105 #: src/modules/openrcdmcryptcfg/main.py:72 @@ -156,11 +156,11 @@ msgstr "Postavljanje hardverskog sata." msgid "Configuring mkinitcpio." msgstr "Konfiguriranje mkinitcpio." -#: src/modules/initcpiocfg/main.py:246 +#: src/modules/initcpiocfg/main.py:268 msgid "No partitions are defined for
initcpiocfg
." msgstr "Nema definiranih particija za
initcpiocfg
." -#: src/modules/initcpiocfg/main.py:250 +#: src/modules/initcpiocfg/main.py:272 msgid "No root mount point for
initcpiocfg
." msgstr "Nema root točke montiranja za
initcpiocfg
." @@ -242,12 +242,12 @@ msgstr[0] "Uklanjam paket." msgstr[1] "Uklanjam %(num)d pakete." msgstr[2] "Uklanjam %(num)d pakete." -#: src/modules/packages/main.py:725 src/modules/packages/main.py:737 -#: src/modules/packages/main.py:765 +#: src/modules/packages/main.py:740 src/modules/packages/main.py:752 +#: src/modules/packages/main.py:780 msgid "Package Manager error" msgstr "Pogreška upravitelja paketa" -#: src/modules/packages/main.py:726 +#: src/modules/packages/main.py:741 msgid "" "The package manager could not prepare updates. The command
{!s}
" "returned error code {!s}." @@ -255,7 +255,7 @@ msgstr "" "Upravitelj paketa nije mogao pripremiti ažuriranja. Naredba
{!s}
" "je vratila kôd pogreške {!s}." -#: src/modules/packages/main.py:738 +#: src/modules/packages/main.py:753 msgid "" "The package manager could not update the system. The command
{!s}
" " returned error code {!s}." @@ -263,7 +263,7 @@ msgstr "" "Upravitelj paketa nije mogao ažurirati sustav. Naredba
{!s}
je " "vratila kod pogreške {!s}." -#: src/modules/packages/main.py:766 +#: src/modules/packages/main.py:781 msgid "" "The package manager could not make changes to the installed system. The " "command
{!s}
returned error code {!s}." diff --git a/lang/python/hu/LC_MESSAGES/python.po b/lang/python/hu/LC_MESSAGES/python.po index d989d9b4e..84f1faa02 100644 --- a/lang/python/hu/LC_MESSAGES/python.po +++ b/lang/python/hu/LC_MESSAGES/python.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-24 23:38+0200\n" +"POT-Creation-Date: 2023-08-28 23:53+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Lajos Pasztor , 2019\n" "Language-Team: Hungarian (https://app.transifex.com/calamares/teams/20061/hu/)\n" @@ -28,63 +28,63 @@ msgstr "" msgid "Install bootloader." msgstr "Rendszerbetöltő telepítése." -#: src/modules/bootloader/main.py:640 +#: src/modules/bootloader/main.py:644 msgid "Failed to install grub, no partitions defined in global storage" msgstr "" -#: src/modules/bootloader/main.py:895 +#: src/modules/bootloader/main.py:899 msgid "Bootloader installation error" msgstr "" -#: src/modules/bootloader/main.py:896 +#: src/modules/bootloader/main.py:900 msgid "" "The bootloader could not be installed. The installation command " "
{!s}
returned error code {!s}." msgstr "" -#: src/modules/displaymanager/main.py:507 +#: src/modules/displaymanager/main.py:509 msgid "Cannot write LXDM configuration file" msgstr "Az LXDM konfigurációs fájl nem írható" -#: src/modules/displaymanager/main.py:508 +#: src/modules/displaymanager/main.py:510 msgid "LXDM config file {!s} does not exist" msgstr "A(z) {!s} LXDM konfigurációs fájl nem létezik" -#: src/modules/displaymanager/main.py:596 +#: src/modules/displaymanager/main.py:598 msgid "Cannot write LightDM configuration file" msgstr "A LightDM konfigurációs fájl nem írható" -#: src/modules/displaymanager/main.py:597 +#: src/modules/displaymanager/main.py:599 msgid "LightDM config file {!s} does not exist" msgstr "A(z) {!s} LightDM konfigurációs fájl nem létezik" -#: src/modules/displaymanager/main.py:682 +#: src/modules/displaymanager/main.py:684 msgid "Cannot configure LightDM" msgstr "A LightDM nem állítható be" -#: src/modules/displaymanager/main.py:683 +#: src/modules/displaymanager/main.py:685 msgid "No LightDM greeter installed." msgstr "Nincs LightDM üdvözlő telepítve." -#: src/modules/displaymanager/main.py:714 +#: src/modules/displaymanager/main.py:716 msgid "Cannot write SLIM configuration file" msgstr "A SLIM konfigurációs fájl nem írható" -#: src/modules/displaymanager/main.py:715 +#: src/modules/displaymanager/main.py:717 msgid "SLIM config file {!s} does not exist" msgstr "A(z) {!s} SLIM konfigurációs fájl nem létezik" -#: src/modules/displaymanager/main.py:933 +#: src/modules/displaymanager/main.py:935 msgid "No display managers selected for the displaymanager module." msgstr "Nincs kijelzőkezelő kiválasztva a kijelzőkezelő modulhoz." -#: src/modules/displaymanager/main.py:934 +#: src/modules/displaymanager/main.py:936 msgid "" "The displaymanagers list is empty or undefined in both globalstorage and " "displaymanager.conf." msgstr "" -#: src/modules/displaymanager/main.py:1021 +#: src/modules/displaymanager/main.py:1023 msgid "Display manager configuration was incomplete" msgstr "A kijelzőkezelő konfigurációja hiányos volt" @@ -115,8 +115,8 @@ msgid "Writing fstab." msgstr "fstab írása." #: src/modules/fstab/main.py:377 src/modules/fstab/main.py:383 -#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:245 -#: src/modules/initcpiocfg/main.py:249 src/modules/initramfscfg/main.py:85 +#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:267 +#: src/modules/initcpiocfg/main.py:271 src/modules/initramfscfg/main.py:85 #: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:140 #: src/modules/mount/main.py:329 src/modules/networkcfg/main.py:105 #: src/modules/openrcdmcryptcfg/main.py:72 @@ -152,11 +152,11 @@ msgstr "Rendszeridő beállítása." msgid "Configuring mkinitcpio." msgstr "mkinitcpio konfigurálása." -#: src/modules/initcpiocfg/main.py:246 +#: src/modules/initcpiocfg/main.py:268 msgid "No partitions are defined for
initcpiocfg
." msgstr "" -#: src/modules/initcpiocfg/main.py:250 +#: src/modules/initcpiocfg/main.py:272 msgid "No root mount point for
initcpiocfg
." msgstr "" @@ -236,24 +236,24 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "Egy csomag eltávolítása." msgstr[1] "%(num)d csomag eltávolítása." -#: src/modules/packages/main.py:725 src/modules/packages/main.py:737 -#: src/modules/packages/main.py:765 +#: src/modules/packages/main.py:740 src/modules/packages/main.py:752 +#: src/modules/packages/main.py:780 msgid "Package Manager error" msgstr "" -#: src/modules/packages/main.py:726 +#: src/modules/packages/main.py:741 msgid "" "The package manager could not prepare updates. The command
{!s}
" "returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:738 +#: src/modules/packages/main.py:753 msgid "" "The package manager could not update the system. The command
{!s}
" " returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:766 +#: src/modules/packages/main.py:781 msgid "" "The package manager could not make changes to the installed system. The " "command
{!s}
returned error code {!s}." diff --git a/lang/python/id/LC_MESSAGES/python.po b/lang/python/id/LC_MESSAGES/python.po index fcd85649c..7af6cff94 100644 --- a/lang/python/id/LC_MESSAGES/python.po +++ b/lang/python/id/LC_MESSAGES/python.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-24 23:38+0200\n" +"POT-Creation-Date: 2023-08-28 23:53+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Drajat Hasan , 2021\n" "Language-Team: Indonesian (https://app.transifex.com/calamares/teams/20061/id/)\n" @@ -27,63 +27,63 @@ msgstr "" msgid "Install bootloader." msgstr "" -#: src/modules/bootloader/main.py:640 +#: src/modules/bootloader/main.py:644 msgid "Failed to install grub, no partitions defined in global storage" msgstr "" -#: src/modules/bootloader/main.py:895 +#: src/modules/bootloader/main.py:899 msgid "Bootloader installation error" msgstr "" -#: src/modules/bootloader/main.py:896 +#: src/modules/bootloader/main.py:900 msgid "" "The bootloader could not be installed. The installation command " "
{!s}
returned error code {!s}." msgstr "" -#: src/modules/displaymanager/main.py:507 +#: src/modules/displaymanager/main.py:509 msgid "Cannot write LXDM configuration file" msgstr "Gak bisa menulis file konfigurasi LXDM" -#: src/modules/displaymanager/main.py:508 +#: src/modules/displaymanager/main.py:510 msgid "LXDM config file {!s} does not exist" msgstr "File {!s} config LXDM enggak ada" -#: src/modules/displaymanager/main.py:596 +#: src/modules/displaymanager/main.py:598 msgid "Cannot write LightDM configuration file" msgstr "Gak bisa menulis file konfigurasi LightDM" -#: src/modules/displaymanager/main.py:597 +#: src/modules/displaymanager/main.py:599 msgid "LightDM config file {!s} does not exist" msgstr "File {!s} config LightDM belum ada" -#: src/modules/displaymanager/main.py:682 +#: src/modules/displaymanager/main.py:684 msgid "Cannot configure LightDM" msgstr "Gak bisa mengkonfigurasi LightDM" -#: src/modules/displaymanager/main.py:683 +#: src/modules/displaymanager/main.py:685 msgid "No LightDM greeter installed." msgstr "Tiada LightDM greeter yang terinstal." -#: src/modules/displaymanager/main.py:714 +#: src/modules/displaymanager/main.py:716 msgid "Cannot write SLIM configuration file" msgstr "Gak bisa menulis file konfigurasi SLIM" -#: src/modules/displaymanager/main.py:715 +#: src/modules/displaymanager/main.py:717 msgid "SLIM config file {!s} does not exist" msgstr "File {!s} config SLIM belum ada" -#: src/modules/displaymanager/main.py:933 +#: src/modules/displaymanager/main.py:935 msgid "No display managers selected for the displaymanager module." msgstr "Tiada display manager yang dipilih untuk modul displaymanager." -#: src/modules/displaymanager/main.py:934 +#: src/modules/displaymanager/main.py:936 msgid "" "The displaymanagers list is empty or undefined in both globalstorage and " "displaymanager.conf." msgstr "" -#: src/modules/displaymanager/main.py:1021 +#: src/modules/displaymanager/main.py:1023 msgid "Display manager configuration was incomplete" msgstr "Konfigurasi display manager belum rampung" @@ -114,8 +114,8 @@ msgid "Writing fstab." msgstr "" #: src/modules/fstab/main.py:377 src/modules/fstab/main.py:383 -#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:245 -#: src/modules/initcpiocfg/main.py:249 src/modules/initramfscfg/main.py:85 +#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:267 +#: src/modules/initcpiocfg/main.py:271 src/modules/initramfscfg/main.py:85 #: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:140 #: src/modules/mount/main.py:329 src/modules/networkcfg/main.py:105 #: src/modules/openrcdmcryptcfg/main.py:72 @@ -151,11 +151,11 @@ msgstr "" msgid "Configuring mkinitcpio." msgstr "" -#: src/modules/initcpiocfg/main.py:246 +#: src/modules/initcpiocfg/main.py:268 msgid "No partitions are defined for
initcpiocfg
." msgstr "" -#: src/modules/initcpiocfg/main.py:250 +#: src/modules/initcpiocfg/main.py:272 msgid "No root mount point for
initcpiocfg
." msgstr "" @@ -233,24 +233,24 @@ msgid "Removing one package." msgid_plural "Removing %(num)d packages." msgstr[0] "mencopot %(num)d paket" -#: src/modules/packages/main.py:725 src/modules/packages/main.py:737 -#: src/modules/packages/main.py:765 +#: src/modules/packages/main.py:740 src/modules/packages/main.py:752 +#: src/modules/packages/main.py:780 msgid "Package Manager error" msgstr "" -#: src/modules/packages/main.py:726 +#: src/modules/packages/main.py:741 msgid "" "The package manager could not prepare updates. The command
{!s}
" "returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:738 +#: src/modules/packages/main.py:753 msgid "" "The package manager could not update the system. The command
{!s}
" " returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:766 +#: src/modules/packages/main.py:781 msgid "" "The package manager could not make changes to the installed system. The " "command
{!s}
returned error code {!s}." diff --git a/lang/python/ie/LC_MESSAGES/python.po b/lang/python/ie/LC_MESSAGES/python.po index 5ad57e53f..f571291f5 100644 --- a/lang/python/ie/LC_MESSAGES/python.po +++ b/lang/python/ie/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-24 23:38+0200\n" +"POT-Creation-Date: 2023-08-28 23:53+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Caarmi, 2020\n" "Language-Team: Interlingue (https://app.transifex.com/calamares/teams/20061/ie/)\n" @@ -25,63 +25,63 @@ msgstr "" msgid "Install bootloader." msgstr "Installante li bootloader." -#: src/modules/bootloader/main.py:640 +#: src/modules/bootloader/main.py:644 msgid "Failed to install grub, no partitions defined in global storage" msgstr "" -#: src/modules/bootloader/main.py:895 +#: src/modules/bootloader/main.py:899 msgid "Bootloader installation error" msgstr "" -#: src/modules/bootloader/main.py:896 +#: src/modules/bootloader/main.py:900 msgid "" "The bootloader could not be installed. The installation command " "
{!s}
returned error code {!s}." msgstr "" -#: src/modules/displaymanager/main.py:507 +#: src/modules/displaymanager/main.py:509 msgid "Cannot write LXDM configuration file" msgstr "Ne successat scrir li file de configuration de LXDM" -#: src/modules/displaymanager/main.py:508 +#: src/modules/displaymanager/main.py:510 msgid "LXDM config file {!s} does not exist" msgstr "File del configuration de LXDM {!s} ne existe" -#: src/modules/displaymanager/main.py:596 +#: src/modules/displaymanager/main.py:598 msgid "Cannot write LightDM configuration file" msgstr "Ne successat scrir li file de configuration de LightDM" -#: src/modules/displaymanager/main.py:597 +#: src/modules/displaymanager/main.py:599 msgid "LightDM config file {!s} does not exist" msgstr "File del configuration de LightDM {!s} ne existe" -#: src/modules/displaymanager/main.py:682 +#: src/modules/displaymanager/main.py:684 msgid "Cannot configure LightDM" msgstr "" -#: src/modules/displaymanager/main.py:683 +#: src/modules/displaymanager/main.py:685 msgid "No LightDM greeter installed." msgstr "" -#: src/modules/displaymanager/main.py:714 +#: src/modules/displaymanager/main.py:716 msgid "Cannot write SLIM configuration file" msgstr "" -#: src/modules/displaymanager/main.py:715 +#: src/modules/displaymanager/main.py:717 msgid "SLIM config file {!s} does not exist" msgstr "File del configuration de SLIM {!s} ne existe" -#: src/modules/displaymanager/main.py:933 +#: src/modules/displaymanager/main.py:935 msgid "No display managers selected for the displaymanager module." msgstr "" -#: src/modules/displaymanager/main.py:934 +#: src/modules/displaymanager/main.py:936 msgid "" "The displaymanagers list is empty or undefined in both globalstorage and " "displaymanager.conf." msgstr "" -#: src/modules/displaymanager/main.py:1021 +#: src/modules/displaymanager/main.py:1023 msgid "Display manager configuration was incomplete" msgstr "" @@ -112,8 +112,8 @@ msgid "Writing fstab." msgstr "Scrition de fstab." #: src/modules/fstab/main.py:377 src/modules/fstab/main.py:383 -#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:245 -#: src/modules/initcpiocfg/main.py:249 src/modules/initramfscfg/main.py:85 +#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:267 +#: src/modules/initcpiocfg/main.py:271 src/modules/initramfscfg/main.py:85 #: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:140 #: src/modules/mount/main.py:329 src/modules/networkcfg/main.py:105 #: src/modules/openrcdmcryptcfg/main.py:72 @@ -149,11 +149,11 @@ msgstr "" msgid "Configuring mkinitcpio." msgstr "Configurante mkinitcpio." -#: src/modules/initcpiocfg/main.py:246 +#: src/modules/initcpiocfg/main.py:268 msgid "No partitions are defined for
initcpiocfg
." msgstr "" -#: src/modules/initcpiocfg/main.py:250 +#: src/modules/initcpiocfg/main.py:272 msgid "No root mount point for
initcpiocfg
." msgstr "" @@ -233,24 +233,24 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "" msgstr[1] "" -#: src/modules/packages/main.py:725 src/modules/packages/main.py:737 -#: src/modules/packages/main.py:765 +#: src/modules/packages/main.py:740 src/modules/packages/main.py:752 +#: src/modules/packages/main.py:780 msgid "Package Manager error" msgstr "" -#: src/modules/packages/main.py:726 +#: src/modules/packages/main.py:741 msgid "" "The package manager could not prepare updates. The command
{!s}
" "returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:738 +#: src/modules/packages/main.py:753 msgid "" "The package manager could not update the system. The command
{!s}
" " returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:766 +#: src/modules/packages/main.py:781 msgid "" "The package manager could not make changes to the installed system. The " "command
{!s}
returned error code {!s}." diff --git a/lang/python/is/LC_MESSAGES/python.po b/lang/python/is/LC_MESSAGES/python.po index a9be6a076..43a8d77e2 100644 --- a/lang/python/is/LC_MESSAGES/python.po +++ b/lang/python/is/LC_MESSAGES/python.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-24 23:38+0200\n" +"POT-Creation-Date: 2023-08-28 23:53+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Sveinn í Felli , 2023\n" "Language-Team: Icelandic (https://app.transifex.com/calamares/teams/20061/is/)\n" @@ -26,63 +26,63 @@ msgstr "" msgid "Install bootloader." msgstr "Setja upp ræsistjóra." -#: src/modules/bootloader/main.py:640 +#: src/modules/bootloader/main.py:644 msgid "Failed to install grub, no partitions defined in global storage" msgstr "" -#: src/modules/bootloader/main.py:895 +#: src/modules/bootloader/main.py:899 msgid "Bootloader installation error" msgstr "Villa við uppsetningu ræsistjóra" -#: src/modules/bootloader/main.py:896 +#: src/modules/bootloader/main.py:900 msgid "" "The bootloader could not be installed. The installation command " "
{!s}
returned error code {!s}." msgstr "" -#: src/modules/displaymanager/main.py:507 +#: src/modules/displaymanager/main.py:509 msgid "Cannot write LXDM configuration file" msgstr "Gat ekki skrifað LXDM-stillingaskrá" -#: src/modules/displaymanager/main.py:508 +#: src/modules/displaymanager/main.py:510 msgid "LXDM config file {!s} does not exist" msgstr "LXDM-stillingaskráin {!s} er ekki til" -#: src/modules/displaymanager/main.py:596 +#: src/modules/displaymanager/main.py:598 msgid "Cannot write LightDM configuration file" msgstr "Gat ekki skrifað LightDM-stillingaskrá" -#: src/modules/displaymanager/main.py:597 +#: src/modules/displaymanager/main.py:599 msgid "LightDM config file {!s} does not exist" msgstr "LightDM-stillingaskráin {!s} er ekki til" -#: src/modules/displaymanager/main.py:682 +#: src/modules/displaymanager/main.py:684 msgid "Cannot configure LightDM" msgstr "Get ekki stillt LightDM" -#: src/modules/displaymanager/main.py:683 +#: src/modules/displaymanager/main.py:685 msgid "No LightDM greeter installed." msgstr "" -#: src/modules/displaymanager/main.py:714 +#: src/modules/displaymanager/main.py:716 msgid "Cannot write SLIM configuration file" msgstr "Gat ekki skrifað SLIM-stillingaskrá" -#: src/modules/displaymanager/main.py:715 +#: src/modules/displaymanager/main.py:717 msgid "SLIM config file {!s} does not exist" msgstr "SLIM-stillingaskráin {!s} er ekki til" -#: src/modules/displaymanager/main.py:933 +#: src/modules/displaymanager/main.py:935 msgid "No display managers selected for the displaymanager module." msgstr "" -#: src/modules/displaymanager/main.py:934 +#: src/modules/displaymanager/main.py:936 msgid "" "The displaymanagers list is empty or undefined in both globalstorage and " "displaymanager.conf." msgstr "" -#: src/modules/displaymanager/main.py:1021 +#: src/modules/displaymanager/main.py:1023 msgid "Display manager configuration was incomplete" msgstr "" @@ -113,8 +113,8 @@ msgid "Writing fstab." msgstr "Skrifa fstab." #: src/modules/fstab/main.py:377 src/modules/fstab/main.py:383 -#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:245 -#: src/modules/initcpiocfg/main.py:249 src/modules/initramfscfg/main.py:85 +#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:267 +#: src/modules/initcpiocfg/main.py:271 src/modules/initramfscfg/main.py:85 #: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:140 #: src/modules/mount/main.py:329 src/modules/networkcfg/main.py:105 #: src/modules/openrcdmcryptcfg/main.py:72 @@ -150,11 +150,11 @@ msgstr "Stilli klukku á vélbúnaði." msgid "Configuring mkinitcpio." msgstr "Stilli mkinitcpio." -#: src/modules/initcpiocfg/main.py:246 +#: src/modules/initcpiocfg/main.py:268 msgid "No partitions are defined for
initcpiocfg
." msgstr "" -#: src/modules/initcpiocfg/main.py:250 +#: src/modules/initcpiocfg/main.py:272 msgid "No root mount point for
initcpiocfg
." msgstr "" @@ -234,24 +234,24 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "Fjarlægi einn pakka." msgstr[1] "Fjarlægi %(num)d pakka." -#: src/modules/packages/main.py:725 src/modules/packages/main.py:737 -#: src/modules/packages/main.py:765 +#: src/modules/packages/main.py:740 src/modules/packages/main.py:752 +#: src/modules/packages/main.py:780 msgid "Package Manager error" msgstr "Villa í pakkastjóra" -#: src/modules/packages/main.py:726 +#: src/modules/packages/main.py:741 msgid "" "The package manager could not prepare updates. The command
{!s}
" "returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:738 +#: src/modules/packages/main.py:753 msgid "" "The package manager could not update the system. The command
{!s}
" " returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:766 +#: src/modules/packages/main.py:781 msgid "" "The package manager could not make changes to the installed system. The " "command
{!s}
returned error code {!s}." diff --git a/lang/python/it_IT/LC_MESSAGES/python.po b/lang/python/it_IT/LC_MESSAGES/python.po index 36944bb11..b0a8e7c13 100644 --- a/lang/python/it_IT/LC_MESSAGES/python.po +++ b/lang/python/it_IT/LC_MESSAGES/python.po @@ -10,15 +10,16 @@ # Giuseppe Pignataro , 2021 # Vincenzo Reale , 2022 # vincenzo sammarco, 2022 +# Paolo Zamponi , 2023 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-24 23:38+0200\n" +"POT-Creation-Date: 2023-08-28 23:53+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" -"Last-Translator: vincenzo sammarco, 2022\n" +"Last-Translator: Paolo Zamponi , 2023\n" "Language-Team: Italian (Italy) (https://app.transifex.com/calamares/teams/20061/it_IT/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -30,17 +31,17 @@ msgstr "" msgid "Install bootloader." msgstr "Installa il bootloader." -#: src/modules/bootloader/main.py:640 +#: src/modules/bootloader/main.py:644 msgid "Failed to install grub, no partitions defined in global storage" msgstr "" "Installazione di grub non riuscita, nessuna partizione definita " "nell'archiviazione globale" -#: src/modules/bootloader/main.py:895 +#: src/modules/bootloader/main.py:899 msgid "Bootloader installation error" msgstr "Errore di installazione del boot loader" -#: src/modules/bootloader/main.py:896 +#: src/modules/bootloader/main.py:900 msgid "" "The bootloader could not be installed. The installation command " "
{!s}
returned error code {!s}." @@ -48,44 +49,44 @@ msgstr "" "Impossibile installare il bootloader. Il comando di installazione " "
{!s}
ha restituito il codice di errore {!s}." -#: src/modules/displaymanager/main.py:507 +#: src/modules/displaymanager/main.py:509 msgid "Cannot write LXDM configuration file" msgstr "Impossibile scrivere il file di configurazione di LXDM" -#: src/modules/displaymanager/main.py:508 +#: src/modules/displaymanager/main.py:510 msgid "LXDM config file {!s} does not exist" msgstr "Il file di configurazione di LXDM {!s} non esiste" -#: src/modules/displaymanager/main.py:596 +#: src/modules/displaymanager/main.py:598 msgid "Cannot write LightDM configuration file" msgstr "Impossibile scrivere il file di configurazione di LightDM" -#: src/modules/displaymanager/main.py:597 +#: src/modules/displaymanager/main.py:599 msgid "LightDM config file {!s} does not exist" msgstr "Il file di configurazione di LightDM {!s} non esiste" -#: src/modules/displaymanager/main.py:682 +#: src/modules/displaymanager/main.py:684 msgid "Cannot configure LightDM" msgstr "Impossibile configurare LightDM" -#: src/modules/displaymanager/main.py:683 +#: src/modules/displaymanager/main.py:685 msgid "No LightDM greeter installed." msgstr "Nessun LightDM greeter installato." -#: src/modules/displaymanager/main.py:714 +#: src/modules/displaymanager/main.py:716 msgid "Cannot write SLIM configuration file" msgstr "Impossibile scrivere il file di configurazione di SLIM" -#: src/modules/displaymanager/main.py:715 +#: src/modules/displaymanager/main.py:717 msgid "SLIM config file {!s} does not exist" msgstr "Il file di configurazione di SLIM {!s} non esiste" -#: src/modules/displaymanager/main.py:933 +#: src/modules/displaymanager/main.py:935 msgid "No display managers selected for the displaymanager module." msgstr "" "Non è stato selezionato alcun display manager per il modulo displaymanager" -#: src/modules/displaymanager/main.py:934 +#: src/modules/displaymanager/main.py:936 msgid "" "The displaymanagers list is empty or undefined in both globalstorage and " "displaymanager.conf." @@ -93,7 +94,7 @@ msgstr "" "La lista dei display manager è vuota o non definita sia in globalstorage che" " in displaymanager.conf." -#: src/modules/displaymanager/main.py:1021 +#: src/modules/displaymanager/main.py:1023 msgid "Display manager configuration was incomplete" msgstr "La configurazione del display manager è incompleta" @@ -103,12 +104,14 @@ msgstr "Creazione di initramfs con dracut." #: src/modules/dracut/main.py:63 msgid "Failed to run dracut" -msgstr "" +msgstr "Impossibile eseguire dracut" #: src/modules/dracut/main.py:64 #, python-brace-format msgid "Dracut failed to run on the target with return code: {return_code}" msgstr "" +"Esecuzione di dracut nella destinazione non riuscita con codice restituito: " +"{return_code}" #: src/modules/dummypython/main.py:35 msgid "Dummy python job." @@ -124,8 +127,8 @@ msgid "Writing fstab." msgstr "Scrittura di fstab." #: src/modules/fstab/main.py:377 src/modules/fstab/main.py:383 -#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:245 -#: src/modules/initcpiocfg/main.py:249 src/modules/initramfscfg/main.py:85 +#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:267 +#: src/modules/initcpiocfg/main.py:271 src/modules/initramfscfg/main.py:85 #: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:140 #: src/modules/mount/main.py:329 src/modules/networkcfg/main.py:105 #: src/modules/openrcdmcryptcfg/main.py:72 @@ -163,11 +166,11 @@ msgstr "Impostazione del clock hardware." msgid "Configuring mkinitcpio." msgstr "Configurazione di mkinitcpio." -#: src/modules/initcpiocfg/main.py:246 +#: src/modules/initcpiocfg/main.py:268 msgid "No partitions are defined for
initcpiocfg
." -msgstr "" +msgstr "Nessuna partizione definita per
initcpiocfg
." -#: src/modules/initcpiocfg/main.py:250 +#: src/modules/initcpiocfg/main.py:272 msgid "No root mount point for
initcpiocfg
." msgstr "" @@ -181,7 +184,7 @@ msgstr "Configurazione della localizzazione." #: src/modules/mkinitfs/main.py:27 msgid "Creating initramfs with mkinitfs." -msgstr "Sto creando initramfs con mkinitfs." +msgstr "Creazione di initramfs con mkinitfs." #: src/modules/mkinitfs/main.py:49 msgid "Failed to run mkinitfs on the target" @@ -213,7 +216,7 @@ msgstr "Impossibile impostare il punto di montaggio zfs" #: src/modules/mount/main.py:365 msgid "zfs mounting error" -msgstr "errore di mount zfs" +msgstr "errore di montaggio di zfs" #: src/modules/networkcfg/main.py:29 msgid "Saving network configuration." @@ -249,12 +252,12 @@ msgstr[0] "Rimuovendo un pacchetto." msgstr[1] "Rimozione di %(num)d pacchetti." msgstr[2] "Rimozione di %(num)d pacchetti." -#: src/modules/packages/main.py:725 src/modules/packages/main.py:737 -#: src/modules/packages/main.py:765 +#: src/modules/packages/main.py:740 src/modules/packages/main.py:752 +#: src/modules/packages/main.py:780 msgid "Package Manager error" msgstr "Errore del gestore dei pacchetti" -#: src/modules/packages/main.py:726 +#: src/modules/packages/main.py:741 msgid "" "The package manager could not prepare updates. The command
{!s}
" "returned error code {!s}." @@ -262,7 +265,7 @@ msgstr "" "Il gestore pacchetti non ha potuto preparare gli aggiornamenti. Il comando " "
{!s}
ha restituito il codice di errore {!s}." -#: src/modules/packages/main.py:738 +#: src/modules/packages/main.py:753 msgid "" "The package manager could not update the system. The command
{!s}
" " returned error code {!s}." @@ -270,7 +273,7 @@ msgstr "" "Il gestore pacchetti non ha potuto aggiornare il sistema. Il " "comando
{!s}
ha restituito il codice di errore {!s}." -#: src/modules/packages/main.py:766 +#: src/modules/packages/main.py:781 msgid "" "The package manager could not make changes to the installed system. The " "command
{!s}
returned error code {!s}." @@ -320,7 +323,7 @@ msgstr "" #: src/modules/services-openrc/main.py:101 msgid "Target runlevel does not exist" -msgstr "Il runlevel target non esiste" +msgstr "Il runlevel di destinazione non esiste" #: src/modules/services-openrc/main.py:102 msgid "" @@ -346,13 +349,15 @@ msgstr "" #: src/modules/services-systemd/main.py:64 msgid "Cannot modify unit" -msgstr "" +msgstr "Impossibile modificare l'unità" #: src/modules/services-systemd/main.py:65 msgid "" "systemctl {_action!s} call in chroot returned error code " "{_exit_code!s}." msgstr "" +"La chiamata systemctl {_action!s} in chroot ha restituito il " +"codice di errore {_exit_code!s}." #: src/modules/services-systemd/main.py:66 msgid "Cannot {_action!s} systemd unit {_name!s}." @@ -364,7 +369,7 @@ msgstr "Copia dei file system." #: src/modules/unpackfs/main.py:254 msgid "rsync failed with error code {}." -msgstr "rsync fallita con codice d'errore {}." +msgstr "rsync non riuscito con codice d'errore {}." #: src/modules/unpackfs/main.py:299 msgid "Unpacking image {}/{}, file {}/{}" @@ -376,7 +381,7 @@ msgstr "Avvio dell'estrazione {}" #: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:467 msgid "Failed to unpack image \"{}\"" -msgstr "Estrazione dell'immagine \"{}\" fallita" +msgstr "Estrazione dell'immagine \"{}\" non riuscita" #: src/modules/unpackfs/main.py:430 msgid "No mount point for root partition" diff --git a/lang/python/ja-Hira/LC_MESSAGES/python.po b/lang/python/ja-Hira/LC_MESSAGES/python.po index d32a62e41..cd02353c3 100644 --- a/lang/python/ja-Hira/LC_MESSAGES/python.po +++ b/lang/python/ja-Hira/LC_MESSAGES/python.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-24 23:38+0200\n" +"POT-Creation-Date: 2023-08-28 23:53+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Japanese (Hiragana) (https://app.transifex.com/calamares/teams/20061/ja-Hira/)\n" "MIME-Version: 1.0\n" @@ -21,63 +21,63 @@ msgstr "" msgid "Install bootloader." msgstr "" -#: src/modules/bootloader/main.py:640 +#: src/modules/bootloader/main.py:644 msgid "Failed to install grub, no partitions defined in global storage" msgstr "" -#: src/modules/bootloader/main.py:895 +#: src/modules/bootloader/main.py:899 msgid "Bootloader installation error" msgstr "" -#: src/modules/bootloader/main.py:896 +#: src/modules/bootloader/main.py:900 msgid "" "The bootloader could not be installed. The installation command " "
{!s}
returned error code {!s}." msgstr "" -#: src/modules/displaymanager/main.py:507 +#: src/modules/displaymanager/main.py:509 msgid "Cannot write LXDM configuration file" msgstr "" -#: src/modules/displaymanager/main.py:508 +#: src/modules/displaymanager/main.py:510 msgid "LXDM config file {!s} does not exist" msgstr "" -#: src/modules/displaymanager/main.py:596 +#: src/modules/displaymanager/main.py:598 msgid "Cannot write LightDM configuration file" msgstr "" -#: src/modules/displaymanager/main.py:597 +#: src/modules/displaymanager/main.py:599 msgid "LightDM config file {!s} does not exist" msgstr "" -#: src/modules/displaymanager/main.py:682 +#: src/modules/displaymanager/main.py:684 msgid "Cannot configure LightDM" msgstr "" -#: src/modules/displaymanager/main.py:683 +#: src/modules/displaymanager/main.py:685 msgid "No LightDM greeter installed." msgstr "" -#: src/modules/displaymanager/main.py:714 +#: src/modules/displaymanager/main.py:716 msgid "Cannot write SLIM configuration file" msgstr "" -#: src/modules/displaymanager/main.py:715 +#: src/modules/displaymanager/main.py:717 msgid "SLIM config file {!s} does not exist" msgstr "" -#: src/modules/displaymanager/main.py:933 +#: src/modules/displaymanager/main.py:935 msgid "No display managers selected for the displaymanager module." msgstr "" -#: src/modules/displaymanager/main.py:934 +#: src/modules/displaymanager/main.py:936 msgid "" "The displaymanagers list is empty or undefined in both globalstorage and " "displaymanager.conf." msgstr "" -#: src/modules/displaymanager/main.py:1021 +#: src/modules/displaymanager/main.py:1023 msgid "Display manager configuration was incomplete" msgstr "" @@ -108,8 +108,8 @@ msgid "Writing fstab." msgstr "" #: src/modules/fstab/main.py:377 src/modules/fstab/main.py:383 -#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:245 -#: src/modules/initcpiocfg/main.py:249 src/modules/initramfscfg/main.py:85 +#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:267 +#: src/modules/initcpiocfg/main.py:271 src/modules/initramfscfg/main.py:85 #: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:140 #: src/modules/mount/main.py:329 src/modules/networkcfg/main.py:105 #: src/modules/openrcdmcryptcfg/main.py:72 @@ -145,11 +145,11 @@ msgstr "" msgid "Configuring mkinitcpio." msgstr "" -#: src/modules/initcpiocfg/main.py:246 +#: src/modules/initcpiocfg/main.py:268 msgid "No partitions are defined for
initcpiocfg
." msgstr "" -#: src/modules/initcpiocfg/main.py:250 +#: src/modules/initcpiocfg/main.py:272 msgid "No root mount point for
initcpiocfg
." msgstr "" @@ -227,24 +227,24 @@ msgid "Removing one package." msgid_plural "Removing %(num)d packages." msgstr[0] "" -#: src/modules/packages/main.py:725 src/modules/packages/main.py:737 -#: src/modules/packages/main.py:765 +#: src/modules/packages/main.py:740 src/modules/packages/main.py:752 +#: src/modules/packages/main.py:780 msgid "Package Manager error" msgstr "" -#: src/modules/packages/main.py:726 +#: src/modules/packages/main.py:741 msgid "" "The package manager could not prepare updates. The command
{!s}
" "returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:738 +#: src/modules/packages/main.py:753 msgid "" "The package manager could not update the system. The command
{!s}
" " returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:766 +#: src/modules/packages/main.py:781 msgid "" "The package manager could not make changes to the installed system. The " "command
{!s}
returned error code {!s}." diff --git a/lang/python/ja/LC_MESSAGES/python.po b/lang/python/ja/LC_MESSAGES/python.po index 3c972c734..350782936 100644 --- a/lang/python/ja/LC_MESSAGES/python.po +++ b/lang/python/ja/LC_MESSAGES/python.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-24 23:38+0200\n" +"POT-Creation-Date: 2023-08-28 23:53+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: UTUMI Hirosi , 2023\n" "Language-Team: Japanese (https://app.transifex.com/calamares/teams/20061/ja/)\n" @@ -27,64 +27,64 @@ msgstr "" msgid "Install bootloader." msgstr "ブートローダーをインストール" -#: src/modules/bootloader/main.py:640 +#: src/modules/bootloader/main.py:644 msgid "Failed to install grub, no partitions defined in global storage" msgstr "grub のインストールに失敗しました。グローバルストレージにパーティションが定義されていません" -#: src/modules/bootloader/main.py:895 +#: src/modules/bootloader/main.py:899 msgid "Bootloader installation error" msgstr "ブートローダーのインストールエラー" -#: src/modules/bootloader/main.py:896 +#: src/modules/bootloader/main.py:900 msgid "" "The bootloader could not be installed. The installation command " "
{!s}
returned error code {!s}." msgstr "" "ブートローダーをインストールできませんでした。インストールコマンド
{!s}
がエラーコード {!s} を返しました。" -#: src/modules/displaymanager/main.py:507 +#: src/modules/displaymanager/main.py:509 msgid "Cannot write LXDM configuration file" msgstr "LXDMの設定ファイルに書き込みができません" -#: src/modules/displaymanager/main.py:508 +#: src/modules/displaymanager/main.py:510 msgid "LXDM config file {!s} does not exist" msgstr "LXDM 設定ファイル {!s} が存在しません" -#: src/modules/displaymanager/main.py:596 +#: src/modules/displaymanager/main.py:598 msgid "Cannot write LightDM configuration file" msgstr "LightDMの設定ファイルに書き込みができません" -#: src/modules/displaymanager/main.py:597 +#: src/modules/displaymanager/main.py:599 msgid "LightDM config file {!s} does not exist" msgstr "LightDM 設定ファイル {!s} が存在しません" -#: src/modules/displaymanager/main.py:682 +#: src/modules/displaymanager/main.py:684 msgid "Cannot configure LightDM" msgstr "LightDMの設定ができません" -#: src/modules/displaymanager/main.py:683 +#: src/modules/displaymanager/main.py:685 msgid "No LightDM greeter installed." msgstr "LightDM greeter がインストールされていません。" -#: src/modules/displaymanager/main.py:714 +#: src/modules/displaymanager/main.py:716 msgid "Cannot write SLIM configuration file" msgstr "SLIMの設定ファイルに書き込みができません" -#: src/modules/displaymanager/main.py:715 +#: src/modules/displaymanager/main.py:717 msgid "SLIM config file {!s} does not exist" msgstr "SLIM 設定ファイル {!s} が存在しません" -#: src/modules/displaymanager/main.py:933 +#: src/modules/displaymanager/main.py:935 msgid "No display managers selected for the displaymanager module." msgstr "ディスプレイマネージャが選択されていません。" -#: src/modules/displaymanager/main.py:934 +#: src/modules/displaymanager/main.py:936 msgid "" "The displaymanagers list is empty or undefined in both globalstorage and " "displaymanager.conf." msgstr "globalstorage と displaymanager.conf の両方で、displaymanagers リストが空か未定義です。" -#: src/modules/displaymanager/main.py:1021 +#: src/modules/displaymanager/main.py:1023 msgid "Display manager configuration was incomplete" msgstr "ディスプレイマネージャの設定が不完全です" @@ -115,8 +115,8 @@ msgid "Writing fstab." msgstr "fstabを書き込んでいます。" #: src/modules/fstab/main.py:377 src/modules/fstab/main.py:383 -#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:245 -#: src/modules/initcpiocfg/main.py:249 src/modules/initramfscfg/main.py:85 +#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:267 +#: src/modules/initcpiocfg/main.py:271 src/modules/initramfscfg/main.py:85 #: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:140 #: src/modules/mount/main.py:329 src/modules/networkcfg/main.py:105 #: src/modules/openrcdmcryptcfg/main.py:72 @@ -152,11 +152,11 @@ msgstr "ハードウェアクロックの設定" msgid "Configuring mkinitcpio." msgstr "mkinitcpioを設定しています。" -#: src/modules/initcpiocfg/main.py:246 +#: src/modules/initcpiocfg/main.py:268 msgid "No partitions are defined for
initcpiocfg
." msgstr "
initcpiocfg
にパーティションが定義されていません。" -#: src/modules/initcpiocfg/main.py:250 +#: src/modules/initcpiocfg/main.py:272 msgid "No root mount point for
initcpiocfg
." msgstr "
initcpiocfg
のルートマウントポイントがありません" @@ -234,26 +234,26 @@ msgid "Removing one package." msgid_plural "Removing %(num)d packages." msgstr[0] " %(num)d パッケージを削除しています。" -#: src/modules/packages/main.py:725 src/modules/packages/main.py:737 -#: src/modules/packages/main.py:765 +#: src/modules/packages/main.py:740 src/modules/packages/main.py:752 +#: src/modules/packages/main.py:780 msgid "Package Manager error" msgstr "パッケージマネージャーのエラー" -#: src/modules/packages/main.py:726 +#: src/modules/packages/main.py:741 msgid "" "The package manager could not prepare updates. The command
{!s}
" "returned error code {!s}." msgstr "" "パッケージマネージャーはアップデートを準備できませんでした。コマンド
{!s}
はエラーコード {!s} を返しました。" -#: src/modules/packages/main.py:738 +#: src/modules/packages/main.py:753 msgid "" "The package manager could not update the system. The command
{!s}
" " returned error code {!s}." msgstr "" "パッケージマネージャーはシステムをアップデートできませんでした。 コマンド
{!s}
はエラーコード {!s} を返しました。" -#: src/modules/packages/main.py:766 +#: src/modules/packages/main.py:781 msgid "" "The package manager could not make changes to the installed system. The " "command
{!s}
returned error code {!s}." diff --git a/lang/python/ka/LC_MESSAGES/python.po b/lang/python/ka/LC_MESSAGES/python.po index fb4a4bcf0..aac7d1759 100644 --- a/lang/python/ka/LC_MESSAGES/python.po +++ b/lang/python/ka/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-24 23:38+0200\n" +"POT-Creation-Date: 2023-08-28 23:53+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Temuri Doghonadze , 2023\n" "Language-Team: Georgian (https://app.transifex.com/calamares/teams/20061/ka/)\n" @@ -25,63 +25,63 @@ msgstr "" msgid "Install bootloader." msgstr "ჩამტვირთავის დაყენება." -#: src/modules/bootloader/main.py:640 +#: src/modules/bootloader/main.py:644 msgid "Failed to install grub, no partitions defined in global storage" msgstr "GRUB-ის დაყენების შეცდომა. გლობალურ საცავში დანაყოფები აღწერილი არაა" -#: src/modules/bootloader/main.py:895 +#: src/modules/bootloader/main.py:899 msgid "Bootloader installation error" msgstr "ჩამტვირთავის დაყენების შეცდომა" -#: src/modules/bootloader/main.py:896 +#: src/modules/bootloader/main.py:900 msgid "" "The bootloader could not be installed. The installation command " "
{!s}
returned error code {!s}." msgstr "" -#: src/modules/displaymanager/main.py:507 +#: src/modules/displaymanager/main.py:509 msgid "Cannot write LXDM configuration file" msgstr "LXDM-ის კონფიგურაციის ფაილის ჩაწერა შეუძლებელია" -#: src/modules/displaymanager/main.py:508 +#: src/modules/displaymanager/main.py:510 msgid "LXDM config file {!s} does not exist" msgstr "LXDM-ის კონფიგურაციის ფაილი არ არსებობს" -#: src/modules/displaymanager/main.py:596 +#: src/modules/displaymanager/main.py:598 msgid "Cannot write LightDM configuration file" msgstr "LightDM-ის კონფიგურაციის ფაილის ჩაწერა შეუძლებელია" -#: src/modules/displaymanager/main.py:597 +#: src/modules/displaymanager/main.py:599 msgid "LightDM config file {!s} does not exist" msgstr "LightDM-ის კონფიგურაციის ფაილი არ არსებობს" -#: src/modules/displaymanager/main.py:682 +#: src/modules/displaymanager/main.py:684 msgid "Cannot configure LightDM" msgstr "LightDM-ის მორგების შეცდომა" -#: src/modules/displaymanager/main.py:683 +#: src/modules/displaymanager/main.py:685 msgid "No LightDM greeter installed." msgstr "LightDM greeter დაყენებული არაა." -#: src/modules/displaymanager/main.py:714 +#: src/modules/displaymanager/main.py:716 msgid "Cannot write SLIM configuration file" msgstr "SLIM-ის კონფიგურაციის ფაილის ჩაწერის შეცდომა" -#: src/modules/displaymanager/main.py:715 +#: src/modules/displaymanager/main.py:717 msgid "SLIM config file {!s} does not exist" msgstr "SLIM-ის კონფიგურაციის ფაილი არ არსებობს" -#: src/modules/displaymanager/main.py:933 +#: src/modules/displaymanager/main.py:935 msgid "No display managers selected for the displaymanager module." msgstr "" -#: src/modules/displaymanager/main.py:934 +#: src/modules/displaymanager/main.py:936 msgid "" "The displaymanagers list is empty or undefined in both globalstorage and " "displaymanager.conf." msgstr "" -#: src/modules/displaymanager/main.py:1021 +#: src/modules/displaymanager/main.py:1023 msgid "Display manager configuration was incomplete" msgstr "ეკრანის მმართველის მორგება დასრულებული არაა" @@ -112,8 +112,8 @@ msgid "Writing fstab." msgstr "'fstab'-ის ჩაწერა." #: src/modules/fstab/main.py:377 src/modules/fstab/main.py:383 -#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:245 -#: src/modules/initcpiocfg/main.py:249 src/modules/initramfscfg/main.py:85 +#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:267 +#: src/modules/initcpiocfg/main.py:271 src/modules/initramfscfg/main.py:85 #: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:140 #: src/modules/mount/main.py:329 src/modules/networkcfg/main.py:105 #: src/modules/openrcdmcryptcfg/main.py:72 @@ -149,11 +149,11 @@ msgstr "აპარატურული საათის დაყენე msgid "Configuring mkinitcpio." msgstr "Mkinitcpio-ის მორგება." -#: src/modules/initcpiocfg/main.py:246 +#: src/modules/initcpiocfg/main.py:268 msgid "No partitions are defined for
initcpiocfg
." msgstr "" -#: src/modules/initcpiocfg/main.py:250 +#: src/modules/initcpiocfg/main.py:272 msgid "No root mount point for
initcpiocfg
." msgstr "" @@ -233,24 +233,24 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "ერთი პაკეტის წაშლა." msgstr[1] "%(num)d პაკეტის წაშლა." -#: src/modules/packages/main.py:725 src/modules/packages/main.py:737 -#: src/modules/packages/main.py:765 +#: src/modules/packages/main.py:740 src/modules/packages/main.py:752 +#: src/modules/packages/main.py:780 msgid "Package Manager error" msgstr "პაკეტების მმართველის შეცდომა" -#: src/modules/packages/main.py:726 +#: src/modules/packages/main.py:741 msgid "" "The package manager could not prepare updates. The command
{!s}
" "returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:738 +#: src/modules/packages/main.py:753 msgid "" "The package manager could not update the system. The command
{!s}
" " returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:766 +#: src/modules/packages/main.py:781 msgid "" "The package manager could not make changes to the installed system. The " "command
{!s}
returned error code {!s}." diff --git a/lang/python/kk/LC_MESSAGES/python.po b/lang/python/kk/LC_MESSAGES/python.po index 2d12e8f8a..8a8eacd71 100644 --- a/lang/python/kk/LC_MESSAGES/python.po +++ b/lang/python/kk/LC_MESSAGES/python.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-24 23:38+0200\n" +"POT-Creation-Date: 2023-08-28 23:53+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Kazakh (https://app.transifex.com/calamares/teams/20061/kk/)\n" "MIME-Version: 1.0\n" @@ -21,63 +21,63 @@ msgstr "" msgid "Install bootloader." msgstr "" -#: src/modules/bootloader/main.py:640 +#: src/modules/bootloader/main.py:644 msgid "Failed to install grub, no partitions defined in global storage" msgstr "" -#: src/modules/bootloader/main.py:895 +#: src/modules/bootloader/main.py:899 msgid "Bootloader installation error" msgstr "" -#: src/modules/bootloader/main.py:896 +#: src/modules/bootloader/main.py:900 msgid "" "The bootloader could not be installed. The installation command " "
{!s}
returned error code {!s}." msgstr "" -#: src/modules/displaymanager/main.py:507 +#: src/modules/displaymanager/main.py:509 msgid "Cannot write LXDM configuration file" msgstr "" -#: src/modules/displaymanager/main.py:508 +#: src/modules/displaymanager/main.py:510 msgid "LXDM config file {!s} does not exist" msgstr "" -#: src/modules/displaymanager/main.py:596 +#: src/modules/displaymanager/main.py:598 msgid "Cannot write LightDM configuration file" msgstr "" -#: src/modules/displaymanager/main.py:597 +#: src/modules/displaymanager/main.py:599 msgid "LightDM config file {!s} does not exist" msgstr "" -#: src/modules/displaymanager/main.py:682 +#: src/modules/displaymanager/main.py:684 msgid "Cannot configure LightDM" msgstr "" -#: src/modules/displaymanager/main.py:683 +#: src/modules/displaymanager/main.py:685 msgid "No LightDM greeter installed." msgstr "" -#: src/modules/displaymanager/main.py:714 +#: src/modules/displaymanager/main.py:716 msgid "Cannot write SLIM configuration file" msgstr "" -#: src/modules/displaymanager/main.py:715 +#: src/modules/displaymanager/main.py:717 msgid "SLIM config file {!s} does not exist" msgstr "" -#: src/modules/displaymanager/main.py:933 +#: src/modules/displaymanager/main.py:935 msgid "No display managers selected for the displaymanager module." msgstr "" -#: src/modules/displaymanager/main.py:934 +#: src/modules/displaymanager/main.py:936 msgid "" "The displaymanagers list is empty or undefined in both globalstorage and " "displaymanager.conf." msgstr "" -#: src/modules/displaymanager/main.py:1021 +#: src/modules/displaymanager/main.py:1023 msgid "Display manager configuration was incomplete" msgstr "" @@ -108,8 +108,8 @@ msgid "Writing fstab." msgstr "" #: src/modules/fstab/main.py:377 src/modules/fstab/main.py:383 -#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:245 -#: src/modules/initcpiocfg/main.py:249 src/modules/initramfscfg/main.py:85 +#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:267 +#: src/modules/initcpiocfg/main.py:271 src/modules/initramfscfg/main.py:85 #: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:140 #: src/modules/mount/main.py:329 src/modules/networkcfg/main.py:105 #: src/modules/openrcdmcryptcfg/main.py:72 @@ -145,11 +145,11 @@ msgstr "" msgid "Configuring mkinitcpio." msgstr "" -#: src/modules/initcpiocfg/main.py:246 +#: src/modules/initcpiocfg/main.py:268 msgid "No partitions are defined for
initcpiocfg
." msgstr "" -#: src/modules/initcpiocfg/main.py:250 +#: src/modules/initcpiocfg/main.py:272 msgid "No root mount point for
initcpiocfg
." msgstr "" @@ -229,24 +229,24 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "" msgstr[1] "" -#: src/modules/packages/main.py:725 src/modules/packages/main.py:737 -#: src/modules/packages/main.py:765 +#: src/modules/packages/main.py:740 src/modules/packages/main.py:752 +#: src/modules/packages/main.py:780 msgid "Package Manager error" msgstr "" -#: src/modules/packages/main.py:726 +#: src/modules/packages/main.py:741 msgid "" "The package manager could not prepare updates. The command
{!s}
" "returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:738 +#: src/modules/packages/main.py:753 msgid "" "The package manager could not update the system. The command
{!s}
" " returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:766 +#: src/modules/packages/main.py:781 msgid "" "The package manager could not make changes to the installed system. The " "command
{!s}
returned error code {!s}." diff --git a/lang/python/kn/LC_MESSAGES/python.po b/lang/python/kn/LC_MESSAGES/python.po index 33d3cd4c1..f235edc0e 100644 --- a/lang/python/kn/LC_MESSAGES/python.po +++ b/lang/python/kn/LC_MESSAGES/python.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-24 23:38+0200\n" +"POT-Creation-Date: 2023-08-28 23:53+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Kannada (https://app.transifex.com/calamares/teams/20061/kn/)\n" "MIME-Version: 1.0\n" @@ -21,63 +21,63 @@ msgstr "" msgid "Install bootloader." msgstr "" -#: src/modules/bootloader/main.py:640 +#: src/modules/bootloader/main.py:644 msgid "Failed to install grub, no partitions defined in global storage" msgstr "" -#: src/modules/bootloader/main.py:895 +#: src/modules/bootloader/main.py:899 msgid "Bootloader installation error" msgstr "" -#: src/modules/bootloader/main.py:896 +#: src/modules/bootloader/main.py:900 msgid "" "The bootloader could not be installed. The installation command " "
{!s}
returned error code {!s}." msgstr "" -#: src/modules/displaymanager/main.py:507 +#: src/modules/displaymanager/main.py:509 msgid "Cannot write LXDM configuration file" msgstr "" -#: src/modules/displaymanager/main.py:508 +#: src/modules/displaymanager/main.py:510 msgid "LXDM config file {!s} does not exist" msgstr "" -#: src/modules/displaymanager/main.py:596 +#: src/modules/displaymanager/main.py:598 msgid "Cannot write LightDM configuration file" msgstr "" -#: src/modules/displaymanager/main.py:597 +#: src/modules/displaymanager/main.py:599 msgid "LightDM config file {!s} does not exist" msgstr "" -#: src/modules/displaymanager/main.py:682 +#: src/modules/displaymanager/main.py:684 msgid "Cannot configure LightDM" msgstr "" -#: src/modules/displaymanager/main.py:683 +#: src/modules/displaymanager/main.py:685 msgid "No LightDM greeter installed." msgstr "" -#: src/modules/displaymanager/main.py:714 +#: src/modules/displaymanager/main.py:716 msgid "Cannot write SLIM configuration file" msgstr "" -#: src/modules/displaymanager/main.py:715 +#: src/modules/displaymanager/main.py:717 msgid "SLIM config file {!s} does not exist" msgstr "" -#: src/modules/displaymanager/main.py:933 +#: src/modules/displaymanager/main.py:935 msgid "No display managers selected for the displaymanager module." msgstr "" -#: src/modules/displaymanager/main.py:934 +#: src/modules/displaymanager/main.py:936 msgid "" "The displaymanagers list is empty or undefined in both globalstorage and " "displaymanager.conf." msgstr "" -#: src/modules/displaymanager/main.py:1021 +#: src/modules/displaymanager/main.py:1023 msgid "Display manager configuration was incomplete" msgstr "" @@ -108,8 +108,8 @@ msgid "Writing fstab." msgstr "" #: src/modules/fstab/main.py:377 src/modules/fstab/main.py:383 -#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:245 -#: src/modules/initcpiocfg/main.py:249 src/modules/initramfscfg/main.py:85 +#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:267 +#: src/modules/initcpiocfg/main.py:271 src/modules/initramfscfg/main.py:85 #: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:140 #: src/modules/mount/main.py:329 src/modules/networkcfg/main.py:105 #: src/modules/openrcdmcryptcfg/main.py:72 @@ -145,11 +145,11 @@ msgstr "" msgid "Configuring mkinitcpio." msgstr "" -#: src/modules/initcpiocfg/main.py:246 +#: src/modules/initcpiocfg/main.py:268 msgid "No partitions are defined for
initcpiocfg
." msgstr "" -#: src/modules/initcpiocfg/main.py:250 +#: src/modules/initcpiocfg/main.py:272 msgid "No root mount point for
initcpiocfg
." msgstr "" @@ -229,24 +229,24 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "" msgstr[1] "" -#: src/modules/packages/main.py:725 src/modules/packages/main.py:737 -#: src/modules/packages/main.py:765 +#: src/modules/packages/main.py:740 src/modules/packages/main.py:752 +#: src/modules/packages/main.py:780 msgid "Package Manager error" msgstr "" -#: src/modules/packages/main.py:726 +#: src/modules/packages/main.py:741 msgid "" "The package manager could not prepare updates. The command
{!s}
" "returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:738 +#: src/modules/packages/main.py:753 msgid "" "The package manager could not update the system. The command
{!s}
" " returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:766 +#: src/modules/packages/main.py:781 msgid "" "The package manager could not make changes to the installed system. The " "command
{!s}
returned error code {!s}." diff --git a/lang/python/ko/LC_MESSAGES/python.po b/lang/python/ko/LC_MESSAGES/python.po index c6f5ee0b5..15f0faead 100644 --- a/lang/python/ko/LC_MESSAGES/python.po +++ b/lang/python/ko/LC_MESSAGES/python.po @@ -5,16 +5,16 @@ # # Translators: # Ji-Hyeon Gim , 2018 -# Junghee Lee , 2023 +# JungHee Lee , 2023 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-24 23:38+0200\n" +"POT-Creation-Date: 2023-08-28 23:53+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" -"Last-Translator: Junghee Lee , 2023\n" +"Last-Translator: JungHee Lee , 2023\n" "Language-Team: Korean (https://app.transifex.com/calamares/teams/20061/ko/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -26,57 +26,57 @@ msgstr "" msgid "Install bootloader." msgstr "부트로더 설치." -#: src/modules/bootloader/main.py:640 +#: src/modules/bootloader/main.py:644 msgid "Failed to install grub, no partitions defined in global storage" msgstr "grub을 설치하지 못했습니다. 파티션 없음이 전역 저장소에 정의되었습니다" -#: src/modules/bootloader/main.py:895 +#: src/modules/bootloader/main.py:899 msgid "Bootloader installation error" msgstr "부트로더 설치 오류" -#: src/modules/bootloader/main.py:896 +#: src/modules/bootloader/main.py:900 msgid "" "The bootloader could not be installed. The installation command " "
{!s}
returned error code {!s}." msgstr "부트로더를 설치할 수 없습니다.
{!s}
설치 명령에서 {!s} 오류 코드를 반환했습니다." -#: src/modules/displaymanager/main.py:507 +#: src/modules/displaymanager/main.py:509 msgid "Cannot write LXDM configuration file" msgstr "LMLDM 구성 파일을 쓸 수 없습니다." -#: src/modules/displaymanager/main.py:508 +#: src/modules/displaymanager/main.py:510 msgid "LXDM config file {!s} does not exist" msgstr "LXDM 구성 파일 {!s}이 없습니다." -#: src/modules/displaymanager/main.py:596 +#: src/modules/displaymanager/main.py:598 msgid "Cannot write LightDM configuration file" msgstr "LightDM 구성 파일을 쓸 수 없습니다." -#: src/modules/displaymanager/main.py:597 +#: src/modules/displaymanager/main.py:599 msgid "LightDM config file {!s} does not exist" msgstr "LightDM 구성 파일 {!s}가 없습니다." -#: src/modules/displaymanager/main.py:682 +#: src/modules/displaymanager/main.py:684 msgid "Cannot configure LightDM" msgstr "LightDM을 구성할 수 없습니다." -#: src/modules/displaymanager/main.py:683 +#: src/modules/displaymanager/main.py:685 msgid "No LightDM greeter installed." msgstr "LightDM greeter가 설치되지 않았습니다." -#: src/modules/displaymanager/main.py:714 +#: src/modules/displaymanager/main.py:716 msgid "Cannot write SLIM configuration file" msgstr "SLIM 구성 파일을 쓸 수 없음" -#: src/modules/displaymanager/main.py:715 +#: src/modules/displaymanager/main.py:717 msgid "SLIM config file {!s} does not exist" msgstr "SLIM 구성 파일 {!s}가 없음" -#: src/modules/displaymanager/main.py:933 +#: src/modules/displaymanager/main.py:935 msgid "No display managers selected for the displaymanager module." msgstr "displaymanager 모듈에 대해 선택된 디스플레이 관리자가 없습니다." -#: src/modules/displaymanager/main.py:934 +#: src/modules/displaymanager/main.py:936 msgid "" "The displaymanagers list is empty or undefined in both globalstorage and " "displaymanager.conf." @@ -84,7 +84,7 @@ msgstr "" "displaymanagers 목록이 비어 있거나 globalstorage 및 displaymanager.conf 모두에서 정의되지 " "않았습니다." -#: src/modules/displaymanager/main.py:1021 +#: src/modules/displaymanager/main.py:1023 msgid "Display manager configuration was incomplete" msgstr "디스플레이 관리자 구성이 완료되지 않았습니다." @@ -115,8 +115,8 @@ msgid "Writing fstab." msgstr "fstab 쓰기." #: src/modules/fstab/main.py:377 src/modules/fstab/main.py:383 -#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:245 -#: src/modules/initcpiocfg/main.py:249 src/modules/initramfscfg/main.py:85 +#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:267 +#: src/modules/initcpiocfg/main.py:271 src/modules/initramfscfg/main.py:85 #: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:140 #: src/modules/mount/main.py:329 src/modules/networkcfg/main.py:105 #: src/modules/openrcdmcryptcfg/main.py:72 @@ -152,11 +152,11 @@ msgstr "하드웨어 클럭 설정 중." msgid "Configuring mkinitcpio." msgstr "mkinitcpio 구성 중." -#: src/modules/initcpiocfg/main.py:246 +#: src/modules/initcpiocfg/main.py:268 msgid "No partitions are defined for
initcpiocfg
." msgstr "
initcpiocfg
에 대해 정의된 파티션이 없습니다." -#: src/modules/initcpiocfg/main.py:250 +#: src/modules/initcpiocfg/main.py:272 msgid "No root mount point for
initcpiocfg
." msgstr "
initcpiocfg
에 대한 루트 마운트 지점이 없습니다." @@ -234,24 +234,24 @@ msgid "Removing one package." msgid_plural "Removing %(num)d packages." msgstr[0] "%(num)d개의 패키지들을 제거하는 중입니다." -#: src/modules/packages/main.py:725 src/modules/packages/main.py:737 -#: src/modules/packages/main.py:765 +#: src/modules/packages/main.py:740 src/modules/packages/main.py:752 +#: src/modules/packages/main.py:780 msgid "Package Manager error" msgstr "패키지 관리자 오류" -#: src/modules/packages/main.py:726 +#: src/modules/packages/main.py:741 msgid "" "The package manager could not prepare updates. The command
{!s}
" "returned error code {!s}." msgstr "패키지 관리자가 업데이트를 준비할 수 없습니다.
{!s}
명령에서 {!s} 오류 코드를 반환했습니다." -#: src/modules/packages/main.py:738 +#: src/modules/packages/main.py:753 msgid "" "The package manager could not update the system. The command
{!s}
" " returned error code {!s}." msgstr "패키지 관리자가 시스템을 업데이트할 수 없습니다.
{!s}
명령에서 {!s} 오류 코드를 반환했습니다." -#: src/modules/packages/main.py:766 +#: src/modules/packages/main.py:781 msgid "" "The package manager could not make changes to the installed system. The " "command
{!s}
returned error code {!s}." diff --git a/lang/python/lo/LC_MESSAGES/python.po b/lang/python/lo/LC_MESSAGES/python.po index 36dfa5964..b4cbe19e5 100644 --- a/lang/python/lo/LC_MESSAGES/python.po +++ b/lang/python/lo/LC_MESSAGES/python.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-24 23:38+0200\n" +"POT-Creation-Date: 2023-08-28 23:53+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Lao (https://app.transifex.com/calamares/teams/20061/lo/)\n" "MIME-Version: 1.0\n" @@ -21,63 +21,63 @@ msgstr "" msgid "Install bootloader." msgstr "" -#: src/modules/bootloader/main.py:640 +#: src/modules/bootloader/main.py:644 msgid "Failed to install grub, no partitions defined in global storage" msgstr "" -#: src/modules/bootloader/main.py:895 +#: src/modules/bootloader/main.py:899 msgid "Bootloader installation error" msgstr "" -#: src/modules/bootloader/main.py:896 +#: src/modules/bootloader/main.py:900 msgid "" "The bootloader could not be installed. The installation command " "
{!s}
returned error code {!s}." msgstr "" -#: src/modules/displaymanager/main.py:507 +#: src/modules/displaymanager/main.py:509 msgid "Cannot write LXDM configuration file" msgstr "" -#: src/modules/displaymanager/main.py:508 +#: src/modules/displaymanager/main.py:510 msgid "LXDM config file {!s} does not exist" msgstr "" -#: src/modules/displaymanager/main.py:596 +#: src/modules/displaymanager/main.py:598 msgid "Cannot write LightDM configuration file" msgstr "" -#: src/modules/displaymanager/main.py:597 +#: src/modules/displaymanager/main.py:599 msgid "LightDM config file {!s} does not exist" msgstr "" -#: src/modules/displaymanager/main.py:682 +#: src/modules/displaymanager/main.py:684 msgid "Cannot configure LightDM" msgstr "" -#: src/modules/displaymanager/main.py:683 +#: src/modules/displaymanager/main.py:685 msgid "No LightDM greeter installed." msgstr "" -#: src/modules/displaymanager/main.py:714 +#: src/modules/displaymanager/main.py:716 msgid "Cannot write SLIM configuration file" msgstr "" -#: src/modules/displaymanager/main.py:715 +#: src/modules/displaymanager/main.py:717 msgid "SLIM config file {!s} does not exist" msgstr "" -#: src/modules/displaymanager/main.py:933 +#: src/modules/displaymanager/main.py:935 msgid "No display managers selected for the displaymanager module." msgstr "" -#: src/modules/displaymanager/main.py:934 +#: src/modules/displaymanager/main.py:936 msgid "" "The displaymanagers list is empty or undefined in both globalstorage and " "displaymanager.conf." msgstr "" -#: src/modules/displaymanager/main.py:1021 +#: src/modules/displaymanager/main.py:1023 msgid "Display manager configuration was incomplete" msgstr "" @@ -108,8 +108,8 @@ msgid "Writing fstab." msgstr "" #: src/modules/fstab/main.py:377 src/modules/fstab/main.py:383 -#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:245 -#: src/modules/initcpiocfg/main.py:249 src/modules/initramfscfg/main.py:85 +#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:267 +#: src/modules/initcpiocfg/main.py:271 src/modules/initramfscfg/main.py:85 #: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:140 #: src/modules/mount/main.py:329 src/modules/networkcfg/main.py:105 #: src/modules/openrcdmcryptcfg/main.py:72 @@ -145,11 +145,11 @@ msgstr "" msgid "Configuring mkinitcpio." msgstr "" -#: src/modules/initcpiocfg/main.py:246 +#: src/modules/initcpiocfg/main.py:268 msgid "No partitions are defined for
initcpiocfg
." msgstr "" -#: src/modules/initcpiocfg/main.py:250 +#: src/modules/initcpiocfg/main.py:272 msgid "No root mount point for
initcpiocfg
." msgstr "" @@ -227,24 +227,24 @@ msgid "Removing one package." msgid_plural "Removing %(num)d packages." msgstr[0] "" -#: src/modules/packages/main.py:725 src/modules/packages/main.py:737 -#: src/modules/packages/main.py:765 +#: src/modules/packages/main.py:740 src/modules/packages/main.py:752 +#: src/modules/packages/main.py:780 msgid "Package Manager error" msgstr "" -#: src/modules/packages/main.py:726 +#: src/modules/packages/main.py:741 msgid "" "The package manager could not prepare updates. The command
{!s}
" "returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:738 +#: src/modules/packages/main.py:753 msgid "" "The package manager could not update the system. The command
{!s}
" " returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:766 +#: src/modules/packages/main.py:781 msgid "" "The package manager could not make changes to the installed system. The " "command
{!s}
returned error code {!s}." diff --git a/lang/python/lt/LC_MESSAGES/python.po b/lang/python/lt/LC_MESSAGES/python.po index 862629647..cd7ebfa47 100644 --- a/lang/python/lt/LC_MESSAGES/python.po +++ b/lang/python/lt/LC_MESSAGES/python.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-24 23:38+0200\n" +"POT-Creation-Date: 2023-08-28 23:53+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Moo, 2023\n" "Language-Team: Lithuanian (https://app.transifex.com/calamares/teams/20061/lt/)\n" @@ -26,17 +26,17 @@ msgstr "" msgid "Install bootloader." msgstr "Įdiegti operacinės sistemos paleidyklę." -#: src/modules/bootloader/main.py:640 +#: src/modules/bootloader/main.py:644 msgid "Failed to install grub, no partitions defined in global storage" msgstr "" "Nepavyko įdiegti grub paleidyklės, visuotinėje saugykloje nėra apibrėžta " "jokių skaidinių" -#: src/modules/bootloader/main.py:895 +#: src/modules/bootloader/main.py:899 msgid "Bootloader installation error" msgstr "Operacinės sistemos paleidyklės diegimo klaida" -#: src/modules/bootloader/main.py:896 +#: src/modules/bootloader/main.py:900 msgid "" "The bootloader could not be installed. The installation command " "
{!s}
returned error code {!s}." @@ -44,43 +44,43 @@ msgstr "" "Nepavyko įdiegti operacinės sistemos paleidyklės. Diegimo komanda " "
{!s}
grąžino klaidos kodą {!s}." -#: src/modules/displaymanager/main.py:507 +#: src/modules/displaymanager/main.py:509 msgid "Cannot write LXDM configuration file" msgstr "Nepavyksta įrašyti LXDM konfigūracijos failą" -#: src/modules/displaymanager/main.py:508 +#: src/modules/displaymanager/main.py:510 msgid "LXDM config file {!s} does not exist" msgstr "LXDM konfigūracijos failo {!s} nėra" -#: src/modules/displaymanager/main.py:596 +#: src/modules/displaymanager/main.py:598 msgid "Cannot write LightDM configuration file" msgstr "Nepavyksta įrašyti LightDM konfigūracijos failą" -#: src/modules/displaymanager/main.py:597 +#: src/modules/displaymanager/main.py:599 msgid "LightDM config file {!s} does not exist" msgstr "LightDM konfigūracijos failo {!s} nėra" -#: src/modules/displaymanager/main.py:682 +#: src/modules/displaymanager/main.py:684 msgid "Cannot configure LightDM" msgstr "Nepavyksta konfigūruoti LightDM" -#: src/modules/displaymanager/main.py:683 +#: src/modules/displaymanager/main.py:685 msgid "No LightDM greeter installed." msgstr "Neįdiegtas joks LightDM pasisveikinimas." -#: src/modules/displaymanager/main.py:714 +#: src/modules/displaymanager/main.py:716 msgid "Cannot write SLIM configuration file" msgstr "Nepavyksta įrašyti SLIM konfigūracijos failą" -#: src/modules/displaymanager/main.py:715 +#: src/modules/displaymanager/main.py:717 msgid "SLIM config file {!s} does not exist" msgstr "SLIM konfigūracijos failo {!s} nėra" -#: src/modules/displaymanager/main.py:933 +#: src/modules/displaymanager/main.py:935 msgid "No display managers selected for the displaymanager module." msgstr "Displaymanagers moduliui nėra pasirinkta jokių ekranų tvarkytuvių." -#: src/modules/displaymanager/main.py:934 +#: src/modules/displaymanager/main.py:936 msgid "" "The displaymanagers list is empty or undefined in both globalstorage and " "displaymanager.conf." @@ -88,7 +88,7 @@ msgstr "" "Displaymanagers sąrašas yra tuščias arba neapibrėžtas tiek globalstorage, " "tiek ir displaymanager.conf faile." -#: src/modules/displaymanager/main.py:1021 +#: src/modules/displaymanager/main.py:1023 msgid "Display manager configuration was incomplete" msgstr "Ekranų tvarkytuvės konfigūracija yra nepilna" @@ -121,8 +121,8 @@ msgid "Writing fstab." msgstr "Rašoma fstab." #: src/modules/fstab/main.py:377 src/modules/fstab/main.py:383 -#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:245 -#: src/modules/initcpiocfg/main.py:249 src/modules/initramfscfg/main.py:85 +#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:267 +#: src/modules/initcpiocfg/main.py:271 src/modules/initramfscfg/main.py:85 #: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:140 #: src/modules/mount/main.py:329 src/modules/networkcfg/main.py:105 #: src/modules/openrcdmcryptcfg/main.py:72 @@ -162,11 +162,11 @@ msgstr "Nustatomas aparatinės įrangos laikrodis." msgid "Configuring mkinitcpio." msgstr "Konfigūruojama mkinitcpio." -#: src/modules/initcpiocfg/main.py:246 +#: src/modules/initcpiocfg/main.py:268 msgid "No partitions are defined for
initcpiocfg
." msgstr "Nėra apibrėžta jokių skaidinių, skirtų
initcpiocfg
." -#: src/modules/initcpiocfg/main.py:250 +#: src/modules/initcpiocfg/main.py:272 msgid "No root mount point for
initcpiocfg
." msgstr "Nėra šaknies prijungimo taško, skirto
initcpiocfg
." @@ -250,12 +250,12 @@ msgstr[1] "Šalinami %(num)d paketai." msgstr[2] "Šalinama %(num)d paketų." msgstr[3] "Šalinama %(num)d paketų." -#: src/modules/packages/main.py:725 src/modules/packages/main.py:737 -#: src/modules/packages/main.py:765 +#: src/modules/packages/main.py:740 src/modules/packages/main.py:752 +#: src/modules/packages/main.py:780 msgid "Package Manager error" msgstr "Paketų tvarkytuvės klaida" -#: src/modules/packages/main.py:726 +#: src/modules/packages/main.py:741 msgid "" "The package manager could not prepare updates. The command
{!s}
" "returned error code {!s}." @@ -263,7 +263,7 @@ msgstr "" "Paketų tvarkytuvei nepavyko paruošti atnaujinimų. Komanda
{!s}
" "grąžino klaidos kodą {!s}." -#: src/modules/packages/main.py:738 +#: src/modules/packages/main.py:753 msgid "" "The package manager could not update the system. The command
{!s}
" " returned error code {!s}." @@ -271,7 +271,7 @@ msgstr "" "Paketų tvarkytuvei nepavyko atnaujinti sistemos. Komanda
{!s}
" "grąžino klaidos kodą {!s}." -#: src/modules/packages/main.py:766 +#: src/modules/packages/main.py:781 msgid "" "The package manager could not make changes to the installed system. The " "command
{!s}
returned error code {!s}." diff --git a/lang/python/lv/LC_MESSAGES/python.po b/lang/python/lv/LC_MESSAGES/python.po index 99039e451..c7bbb857e 100644 --- a/lang/python/lv/LC_MESSAGES/python.po +++ b/lang/python/lv/LC_MESSAGES/python.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-24 23:38+0200\n" +"POT-Creation-Date: 2023-08-28 23:53+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Latvian (https://app.transifex.com/calamares/teams/20061/lv/)\n" "MIME-Version: 1.0\n" @@ -21,63 +21,63 @@ msgstr "" msgid "Install bootloader." msgstr "" -#: src/modules/bootloader/main.py:640 +#: src/modules/bootloader/main.py:644 msgid "Failed to install grub, no partitions defined in global storage" msgstr "" -#: src/modules/bootloader/main.py:895 +#: src/modules/bootloader/main.py:899 msgid "Bootloader installation error" msgstr "" -#: src/modules/bootloader/main.py:896 +#: src/modules/bootloader/main.py:900 msgid "" "The bootloader could not be installed. The installation command " "
{!s}
returned error code {!s}." msgstr "" -#: src/modules/displaymanager/main.py:507 +#: src/modules/displaymanager/main.py:509 msgid "Cannot write LXDM configuration file" msgstr "" -#: src/modules/displaymanager/main.py:508 +#: src/modules/displaymanager/main.py:510 msgid "LXDM config file {!s} does not exist" msgstr "" -#: src/modules/displaymanager/main.py:596 +#: src/modules/displaymanager/main.py:598 msgid "Cannot write LightDM configuration file" msgstr "" -#: src/modules/displaymanager/main.py:597 +#: src/modules/displaymanager/main.py:599 msgid "LightDM config file {!s} does not exist" msgstr "" -#: src/modules/displaymanager/main.py:682 +#: src/modules/displaymanager/main.py:684 msgid "Cannot configure LightDM" msgstr "" -#: src/modules/displaymanager/main.py:683 +#: src/modules/displaymanager/main.py:685 msgid "No LightDM greeter installed." msgstr "" -#: src/modules/displaymanager/main.py:714 +#: src/modules/displaymanager/main.py:716 msgid "Cannot write SLIM configuration file" msgstr "" -#: src/modules/displaymanager/main.py:715 +#: src/modules/displaymanager/main.py:717 msgid "SLIM config file {!s} does not exist" msgstr "" -#: src/modules/displaymanager/main.py:933 +#: src/modules/displaymanager/main.py:935 msgid "No display managers selected for the displaymanager module." msgstr "" -#: src/modules/displaymanager/main.py:934 +#: src/modules/displaymanager/main.py:936 msgid "" "The displaymanagers list is empty or undefined in both globalstorage and " "displaymanager.conf." msgstr "" -#: src/modules/displaymanager/main.py:1021 +#: src/modules/displaymanager/main.py:1023 msgid "Display manager configuration was incomplete" msgstr "" @@ -108,8 +108,8 @@ msgid "Writing fstab." msgstr "" #: src/modules/fstab/main.py:377 src/modules/fstab/main.py:383 -#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:245 -#: src/modules/initcpiocfg/main.py:249 src/modules/initramfscfg/main.py:85 +#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:267 +#: src/modules/initcpiocfg/main.py:271 src/modules/initramfscfg/main.py:85 #: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:140 #: src/modules/mount/main.py:329 src/modules/networkcfg/main.py:105 #: src/modules/openrcdmcryptcfg/main.py:72 @@ -145,11 +145,11 @@ msgstr "" msgid "Configuring mkinitcpio." msgstr "" -#: src/modules/initcpiocfg/main.py:246 +#: src/modules/initcpiocfg/main.py:268 msgid "No partitions are defined for
initcpiocfg
." msgstr "" -#: src/modules/initcpiocfg/main.py:250 +#: src/modules/initcpiocfg/main.py:272 msgid "No root mount point for
initcpiocfg
." msgstr "" @@ -231,24 +231,24 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/modules/packages/main.py:725 src/modules/packages/main.py:737 -#: src/modules/packages/main.py:765 +#: src/modules/packages/main.py:740 src/modules/packages/main.py:752 +#: src/modules/packages/main.py:780 msgid "Package Manager error" msgstr "" -#: src/modules/packages/main.py:726 +#: src/modules/packages/main.py:741 msgid "" "The package manager could not prepare updates. The command
{!s}
" "returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:738 +#: src/modules/packages/main.py:753 msgid "" "The package manager could not update the system. The command
{!s}
" " returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:766 +#: src/modules/packages/main.py:781 msgid "" "The package manager could not make changes to the installed system. The " "command
{!s}
returned error code {!s}." diff --git a/lang/python/mk/LC_MESSAGES/python.po b/lang/python/mk/LC_MESSAGES/python.po index c7290b127..1ea3bb41b 100644 --- a/lang/python/mk/LC_MESSAGES/python.po +++ b/lang/python/mk/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-24 23:38+0200\n" +"POT-Creation-Date: 2023-08-28 23:53+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Martin Ristovski , 2018\n" "Language-Team: Macedonian (https://app.transifex.com/calamares/teams/20061/mk/)\n" @@ -25,63 +25,63 @@ msgstr "" msgid "Install bootloader." msgstr "" -#: src/modules/bootloader/main.py:640 +#: src/modules/bootloader/main.py:644 msgid "Failed to install grub, no partitions defined in global storage" msgstr "" -#: src/modules/bootloader/main.py:895 +#: src/modules/bootloader/main.py:899 msgid "Bootloader installation error" msgstr "" -#: src/modules/bootloader/main.py:896 +#: src/modules/bootloader/main.py:900 msgid "" "The bootloader could not be installed. The installation command " "
{!s}
returned error code {!s}." msgstr "" -#: src/modules/displaymanager/main.py:507 +#: src/modules/displaymanager/main.py:509 msgid "Cannot write LXDM configuration file" msgstr "LXDM конфигурациониот фајл не може да се создаде" -#: src/modules/displaymanager/main.py:508 +#: src/modules/displaymanager/main.py:510 msgid "LXDM config file {!s} does not exist" msgstr "LXDM конфигурациониот фајл {!s} не постои" -#: src/modules/displaymanager/main.py:596 +#: src/modules/displaymanager/main.py:598 msgid "Cannot write LightDM configuration file" msgstr "LightDM конфигурациониот фајл не може да се создаде" -#: src/modules/displaymanager/main.py:597 +#: src/modules/displaymanager/main.py:599 msgid "LightDM config file {!s} does not exist" msgstr "LightDM конфигурациониот фајл {!s} не постои" -#: src/modules/displaymanager/main.py:682 +#: src/modules/displaymanager/main.py:684 msgid "Cannot configure LightDM" msgstr "Не може да се подеси LightDM" -#: src/modules/displaymanager/main.py:683 +#: src/modules/displaymanager/main.py:685 msgid "No LightDM greeter installed." msgstr "Нема инсталирано LightDM поздравувач" -#: src/modules/displaymanager/main.py:714 +#: src/modules/displaymanager/main.py:716 msgid "Cannot write SLIM configuration file" msgstr "SLIM конфигурациониот фајл не може да се создаде" -#: src/modules/displaymanager/main.py:715 +#: src/modules/displaymanager/main.py:717 msgid "SLIM config file {!s} does not exist" msgstr "SLIM конфигурациониот фајл {!s} не постои" -#: src/modules/displaymanager/main.py:933 +#: src/modules/displaymanager/main.py:935 msgid "No display managers selected for the displaymanager module." msgstr "Немате избрано дисплеј менаџер за displaymanager модулот." -#: src/modules/displaymanager/main.py:934 +#: src/modules/displaymanager/main.py:936 msgid "" "The displaymanagers list is empty or undefined in both globalstorage and " "displaymanager.conf." msgstr "" -#: src/modules/displaymanager/main.py:1021 +#: src/modules/displaymanager/main.py:1023 msgid "Display manager configuration was incomplete" msgstr "" @@ -112,8 +112,8 @@ msgid "Writing fstab." msgstr "" #: src/modules/fstab/main.py:377 src/modules/fstab/main.py:383 -#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:245 -#: src/modules/initcpiocfg/main.py:249 src/modules/initramfscfg/main.py:85 +#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:267 +#: src/modules/initcpiocfg/main.py:271 src/modules/initramfscfg/main.py:85 #: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:140 #: src/modules/mount/main.py:329 src/modules/networkcfg/main.py:105 #: src/modules/openrcdmcryptcfg/main.py:72 @@ -149,11 +149,11 @@ msgstr "" msgid "Configuring mkinitcpio." msgstr "" -#: src/modules/initcpiocfg/main.py:246 +#: src/modules/initcpiocfg/main.py:268 msgid "No partitions are defined for
initcpiocfg
." msgstr "" -#: src/modules/initcpiocfg/main.py:250 +#: src/modules/initcpiocfg/main.py:272 msgid "No root mount point for
initcpiocfg
." msgstr "" @@ -233,24 +233,24 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "" msgstr[1] "" -#: src/modules/packages/main.py:725 src/modules/packages/main.py:737 -#: src/modules/packages/main.py:765 +#: src/modules/packages/main.py:740 src/modules/packages/main.py:752 +#: src/modules/packages/main.py:780 msgid "Package Manager error" msgstr "" -#: src/modules/packages/main.py:726 +#: src/modules/packages/main.py:741 msgid "" "The package manager could not prepare updates. The command
{!s}
" "returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:738 +#: src/modules/packages/main.py:753 msgid "" "The package manager could not update the system. The command
{!s}
" " returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:766 +#: src/modules/packages/main.py:781 msgid "" "The package manager could not make changes to the installed system. The " "command
{!s}
returned error code {!s}." diff --git a/lang/python/ml/LC_MESSAGES/python.po b/lang/python/ml/LC_MESSAGES/python.po index b50f8db7f..abfb4eff2 100644 --- a/lang/python/ml/LC_MESSAGES/python.po +++ b/lang/python/ml/LC_MESSAGES/python.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-24 23:38+0200\n" +"POT-Creation-Date: 2023-08-28 23:53+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Balasankar C , 2019\n" "Language-Team: Malayalam (https://app.transifex.com/calamares/teams/20061/ml/)\n" @@ -26,63 +26,63 @@ msgstr "" msgid "Install bootloader." msgstr "ബൂട്ട്‌ലോടർ ഇൻസ്റ്റാൾ ചെയ്യൂ ." -#: src/modules/bootloader/main.py:640 +#: src/modules/bootloader/main.py:644 msgid "Failed to install grub, no partitions defined in global storage" msgstr "" -#: src/modules/bootloader/main.py:895 +#: src/modules/bootloader/main.py:899 msgid "Bootloader installation error" msgstr "" -#: src/modules/bootloader/main.py:896 +#: src/modules/bootloader/main.py:900 msgid "" "The bootloader could not be installed. The installation command " "
{!s}
returned error code {!s}." msgstr "" -#: src/modules/displaymanager/main.py:507 +#: src/modules/displaymanager/main.py:509 msgid "Cannot write LXDM configuration file" msgstr "" -#: src/modules/displaymanager/main.py:508 +#: src/modules/displaymanager/main.py:510 msgid "LXDM config file {!s} does not exist" msgstr "" -#: src/modules/displaymanager/main.py:596 +#: src/modules/displaymanager/main.py:598 msgid "Cannot write LightDM configuration file" msgstr "" -#: src/modules/displaymanager/main.py:597 +#: src/modules/displaymanager/main.py:599 msgid "LightDM config file {!s} does not exist" msgstr "" -#: src/modules/displaymanager/main.py:682 +#: src/modules/displaymanager/main.py:684 msgid "Cannot configure LightDM" msgstr "" -#: src/modules/displaymanager/main.py:683 +#: src/modules/displaymanager/main.py:685 msgid "No LightDM greeter installed." msgstr "" -#: src/modules/displaymanager/main.py:714 +#: src/modules/displaymanager/main.py:716 msgid "Cannot write SLIM configuration file" msgstr "" -#: src/modules/displaymanager/main.py:715 +#: src/modules/displaymanager/main.py:717 msgid "SLIM config file {!s} does not exist" msgstr "" -#: src/modules/displaymanager/main.py:933 +#: src/modules/displaymanager/main.py:935 msgid "No display managers selected for the displaymanager module." msgstr "" -#: src/modules/displaymanager/main.py:934 +#: src/modules/displaymanager/main.py:936 msgid "" "The displaymanagers list is empty or undefined in both globalstorage and " "displaymanager.conf." msgstr "" -#: src/modules/displaymanager/main.py:1021 +#: src/modules/displaymanager/main.py:1023 msgid "Display manager configuration was incomplete" msgstr "" @@ -113,8 +113,8 @@ msgid "Writing fstab." msgstr "" #: src/modules/fstab/main.py:377 src/modules/fstab/main.py:383 -#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:245 -#: src/modules/initcpiocfg/main.py:249 src/modules/initramfscfg/main.py:85 +#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:267 +#: src/modules/initcpiocfg/main.py:271 src/modules/initramfscfg/main.py:85 #: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:140 #: src/modules/mount/main.py:329 src/modules/networkcfg/main.py:105 #: src/modules/openrcdmcryptcfg/main.py:72 @@ -150,11 +150,11 @@ msgstr "" msgid "Configuring mkinitcpio." msgstr "" -#: src/modules/initcpiocfg/main.py:246 +#: src/modules/initcpiocfg/main.py:268 msgid "No partitions are defined for
initcpiocfg
." msgstr "" -#: src/modules/initcpiocfg/main.py:250 +#: src/modules/initcpiocfg/main.py:272 msgid "No root mount point for
initcpiocfg
." msgstr "" @@ -234,24 +234,24 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "" msgstr[1] "" -#: src/modules/packages/main.py:725 src/modules/packages/main.py:737 -#: src/modules/packages/main.py:765 +#: src/modules/packages/main.py:740 src/modules/packages/main.py:752 +#: src/modules/packages/main.py:780 msgid "Package Manager error" msgstr "" -#: src/modules/packages/main.py:726 +#: src/modules/packages/main.py:741 msgid "" "The package manager could not prepare updates. The command
{!s}
" "returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:738 +#: src/modules/packages/main.py:753 msgid "" "The package manager could not update the system. The command
{!s}
" " returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:766 +#: src/modules/packages/main.py:781 msgid "" "The package manager could not make changes to the installed system. The " "command
{!s}
returned error code {!s}." diff --git a/lang/python/mr/LC_MESSAGES/python.po b/lang/python/mr/LC_MESSAGES/python.po index 4325959fd..65b74e41a 100644 --- a/lang/python/mr/LC_MESSAGES/python.po +++ b/lang/python/mr/LC_MESSAGES/python.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-24 23:38+0200\n" +"POT-Creation-Date: 2023-08-28 23:53+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Marathi (https://app.transifex.com/calamares/teams/20061/mr/)\n" "MIME-Version: 1.0\n" @@ -21,63 +21,63 @@ msgstr "" msgid "Install bootloader." msgstr "" -#: src/modules/bootloader/main.py:640 +#: src/modules/bootloader/main.py:644 msgid "Failed to install grub, no partitions defined in global storage" msgstr "" -#: src/modules/bootloader/main.py:895 +#: src/modules/bootloader/main.py:899 msgid "Bootloader installation error" msgstr "" -#: src/modules/bootloader/main.py:896 +#: src/modules/bootloader/main.py:900 msgid "" "The bootloader could not be installed. The installation command " "
{!s}
returned error code {!s}." msgstr "" -#: src/modules/displaymanager/main.py:507 +#: src/modules/displaymanager/main.py:509 msgid "Cannot write LXDM configuration file" msgstr "" -#: src/modules/displaymanager/main.py:508 +#: src/modules/displaymanager/main.py:510 msgid "LXDM config file {!s} does not exist" msgstr "" -#: src/modules/displaymanager/main.py:596 +#: src/modules/displaymanager/main.py:598 msgid "Cannot write LightDM configuration file" msgstr "" -#: src/modules/displaymanager/main.py:597 +#: src/modules/displaymanager/main.py:599 msgid "LightDM config file {!s} does not exist" msgstr "" -#: src/modules/displaymanager/main.py:682 +#: src/modules/displaymanager/main.py:684 msgid "Cannot configure LightDM" msgstr "" -#: src/modules/displaymanager/main.py:683 +#: src/modules/displaymanager/main.py:685 msgid "No LightDM greeter installed." msgstr "" -#: src/modules/displaymanager/main.py:714 +#: src/modules/displaymanager/main.py:716 msgid "Cannot write SLIM configuration file" msgstr "" -#: src/modules/displaymanager/main.py:715 +#: src/modules/displaymanager/main.py:717 msgid "SLIM config file {!s} does not exist" msgstr "" -#: src/modules/displaymanager/main.py:933 +#: src/modules/displaymanager/main.py:935 msgid "No display managers selected for the displaymanager module." msgstr "" -#: src/modules/displaymanager/main.py:934 +#: src/modules/displaymanager/main.py:936 msgid "" "The displaymanagers list is empty or undefined in both globalstorage and " "displaymanager.conf." msgstr "" -#: src/modules/displaymanager/main.py:1021 +#: src/modules/displaymanager/main.py:1023 msgid "Display manager configuration was incomplete" msgstr "" @@ -108,8 +108,8 @@ msgid "Writing fstab." msgstr "" #: src/modules/fstab/main.py:377 src/modules/fstab/main.py:383 -#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:245 -#: src/modules/initcpiocfg/main.py:249 src/modules/initramfscfg/main.py:85 +#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:267 +#: src/modules/initcpiocfg/main.py:271 src/modules/initramfscfg/main.py:85 #: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:140 #: src/modules/mount/main.py:329 src/modules/networkcfg/main.py:105 #: src/modules/openrcdmcryptcfg/main.py:72 @@ -145,11 +145,11 @@ msgstr "" msgid "Configuring mkinitcpio." msgstr "" -#: src/modules/initcpiocfg/main.py:246 +#: src/modules/initcpiocfg/main.py:268 msgid "No partitions are defined for
initcpiocfg
." msgstr "" -#: src/modules/initcpiocfg/main.py:250 +#: src/modules/initcpiocfg/main.py:272 msgid "No root mount point for
initcpiocfg
." msgstr "" @@ -229,24 +229,24 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "" msgstr[1] "" -#: src/modules/packages/main.py:725 src/modules/packages/main.py:737 -#: src/modules/packages/main.py:765 +#: src/modules/packages/main.py:740 src/modules/packages/main.py:752 +#: src/modules/packages/main.py:780 msgid "Package Manager error" msgstr "" -#: src/modules/packages/main.py:726 +#: src/modules/packages/main.py:741 msgid "" "The package manager could not prepare updates. The command
{!s}
" "returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:738 +#: src/modules/packages/main.py:753 msgid "" "The package manager could not update the system. The command
{!s}
" " returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:766 +#: src/modules/packages/main.py:781 msgid "" "The package manager could not make changes to the installed system. The " "command
{!s}
returned error code {!s}." diff --git a/lang/python/nb/LC_MESSAGES/python.po b/lang/python/nb/LC_MESSAGES/python.po index dd81659ee..24eb9cf34 100644 --- a/lang/python/nb/LC_MESSAGES/python.po +++ b/lang/python/nb/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-24 23:38+0200\n" +"POT-Creation-Date: 2023-08-28 23:53+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: 865ac004d9acf2568b2e4b389e0007c7_fba755c <3516cc82d94f87187da1e036e5f09e42_616112>, 2017\n" "Language-Team: Norwegian Bokmål (https://app.transifex.com/calamares/teams/20061/nb/)\n" @@ -25,63 +25,63 @@ msgstr "" msgid "Install bootloader." msgstr "" -#: src/modules/bootloader/main.py:640 +#: src/modules/bootloader/main.py:644 msgid "Failed to install grub, no partitions defined in global storage" msgstr "" -#: src/modules/bootloader/main.py:895 +#: src/modules/bootloader/main.py:899 msgid "Bootloader installation error" msgstr "" -#: src/modules/bootloader/main.py:896 +#: src/modules/bootloader/main.py:900 msgid "" "The bootloader could not be installed. The installation command " "
{!s}
returned error code {!s}." msgstr "" -#: src/modules/displaymanager/main.py:507 +#: src/modules/displaymanager/main.py:509 msgid "Cannot write LXDM configuration file" msgstr "" -#: src/modules/displaymanager/main.py:508 +#: src/modules/displaymanager/main.py:510 msgid "LXDM config file {!s} does not exist" msgstr "" -#: src/modules/displaymanager/main.py:596 +#: src/modules/displaymanager/main.py:598 msgid "Cannot write LightDM configuration file" msgstr "" -#: src/modules/displaymanager/main.py:597 +#: src/modules/displaymanager/main.py:599 msgid "LightDM config file {!s} does not exist" msgstr "" -#: src/modules/displaymanager/main.py:682 +#: src/modules/displaymanager/main.py:684 msgid "Cannot configure LightDM" msgstr "" -#: src/modules/displaymanager/main.py:683 +#: src/modules/displaymanager/main.py:685 msgid "No LightDM greeter installed." msgstr "" -#: src/modules/displaymanager/main.py:714 +#: src/modules/displaymanager/main.py:716 msgid "Cannot write SLIM configuration file" msgstr "" -#: src/modules/displaymanager/main.py:715 +#: src/modules/displaymanager/main.py:717 msgid "SLIM config file {!s} does not exist" msgstr "" -#: src/modules/displaymanager/main.py:933 +#: src/modules/displaymanager/main.py:935 msgid "No display managers selected for the displaymanager module." msgstr "" -#: src/modules/displaymanager/main.py:934 +#: src/modules/displaymanager/main.py:936 msgid "" "The displaymanagers list is empty or undefined in both globalstorage and " "displaymanager.conf." msgstr "" -#: src/modules/displaymanager/main.py:1021 +#: src/modules/displaymanager/main.py:1023 msgid "Display manager configuration was incomplete" msgstr "" @@ -112,8 +112,8 @@ msgid "Writing fstab." msgstr "" #: src/modules/fstab/main.py:377 src/modules/fstab/main.py:383 -#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:245 -#: src/modules/initcpiocfg/main.py:249 src/modules/initramfscfg/main.py:85 +#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:267 +#: src/modules/initcpiocfg/main.py:271 src/modules/initramfscfg/main.py:85 #: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:140 #: src/modules/mount/main.py:329 src/modules/networkcfg/main.py:105 #: src/modules/openrcdmcryptcfg/main.py:72 @@ -149,11 +149,11 @@ msgstr "" msgid "Configuring mkinitcpio." msgstr "" -#: src/modules/initcpiocfg/main.py:246 +#: src/modules/initcpiocfg/main.py:268 msgid "No partitions are defined for
initcpiocfg
." msgstr "" -#: src/modules/initcpiocfg/main.py:250 +#: src/modules/initcpiocfg/main.py:272 msgid "No root mount point for
initcpiocfg
." msgstr "" @@ -233,24 +233,24 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "" msgstr[1] "" -#: src/modules/packages/main.py:725 src/modules/packages/main.py:737 -#: src/modules/packages/main.py:765 +#: src/modules/packages/main.py:740 src/modules/packages/main.py:752 +#: src/modules/packages/main.py:780 msgid "Package Manager error" msgstr "" -#: src/modules/packages/main.py:726 +#: src/modules/packages/main.py:741 msgid "" "The package manager could not prepare updates. The command
{!s}
" "returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:738 +#: src/modules/packages/main.py:753 msgid "" "The package manager could not update the system. The command
{!s}
" " returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:766 +#: src/modules/packages/main.py:781 msgid "" "The package manager could not make changes to the installed system. The " "command
{!s}
returned error code {!s}." diff --git a/lang/python/ne_NP/LC_MESSAGES/python.po b/lang/python/ne_NP/LC_MESSAGES/python.po index 258463418..9c683570a 100644 --- a/lang/python/ne_NP/LC_MESSAGES/python.po +++ b/lang/python/ne_NP/LC_MESSAGES/python.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-24 23:38+0200\n" +"POT-Creation-Date: 2023-08-28 23:53+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Nepali (Nepal) (https://app.transifex.com/calamares/teams/20061/ne_NP/)\n" "MIME-Version: 1.0\n" @@ -21,63 +21,63 @@ msgstr "" msgid "Install bootloader." msgstr "" -#: src/modules/bootloader/main.py:640 +#: src/modules/bootloader/main.py:644 msgid "Failed to install grub, no partitions defined in global storage" msgstr "" -#: src/modules/bootloader/main.py:895 +#: src/modules/bootloader/main.py:899 msgid "Bootloader installation error" msgstr "" -#: src/modules/bootloader/main.py:896 +#: src/modules/bootloader/main.py:900 msgid "" "The bootloader could not be installed. The installation command " "
{!s}
returned error code {!s}." msgstr "" -#: src/modules/displaymanager/main.py:507 +#: src/modules/displaymanager/main.py:509 msgid "Cannot write LXDM configuration file" msgstr "" -#: src/modules/displaymanager/main.py:508 +#: src/modules/displaymanager/main.py:510 msgid "LXDM config file {!s} does not exist" msgstr "" -#: src/modules/displaymanager/main.py:596 +#: src/modules/displaymanager/main.py:598 msgid "Cannot write LightDM configuration file" msgstr "" -#: src/modules/displaymanager/main.py:597 +#: src/modules/displaymanager/main.py:599 msgid "LightDM config file {!s} does not exist" msgstr "" -#: src/modules/displaymanager/main.py:682 +#: src/modules/displaymanager/main.py:684 msgid "Cannot configure LightDM" msgstr "" -#: src/modules/displaymanager/main.py:683 +#: src/modules/displaymanager/main.py:685 msgid "No LightDM greeter installed." msgstr "" -#: src/modules/displaymanager/main.py:714 +#: src/modules/displaymanager/main.py:716 msgid "Cannot write SLIM configuration file" msgstr "" -#: src/modules/displaymanager/main.py:715 +#: src/modules/displaymanager/main.py:717 msgid "SLIM config file {!s} does not exist" msgstr "" -#: src/modules/displaymanager/main.py:933 +#: src/modules/displaymanager/main.py:935 msgid "No display managers selected for the displaymanager module." msgstr "" -#: src/modules/displaymanager/main.py:934 +#: src/modules/displaymanager/main.py:936 msgid "" "The displaymanagers list is empty or undefined in both globalstorage and " "displaymanager.conf." msgstr "" -#: src/modules/displaymanager/main.py:1021 +#: src/modules/displaymanager/main.py:1023 msgid "Display manager configuration was incomplete" msgstr "" @@ -108,8 +108,8 @@ msgid "Writing fstab." msgstr "" #: src/modules/fstab/main.py:377 src/modules/fstab/main.py:383 -#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:245 -#: src/modules/initcpiocfg/main.py:249 src/modules/initramfscfg/main.py:85 +#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:267 +#: src/modules/initcpiocfg/main.py:271 src/modules/initramfscfg/main.py:85 #: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:140 #: src/modules/mount/main.py:329 src/modules/networkcfg/main.py:105 #: src/modules/openrcdmcryptcfg/main.py:72 @@ -145,11 +145,11 @@ msgstr "" msgid "Configuring mkinitcpio." msgstr "" -#: src/modules/initcpiocfg/main.py:246 +#: src/modules/initcpiocfg/main.py:268 msgid "No partitions are defined for
initcpiocfg
." msgstr "" -#: src/modules/initcpiocfg/main.py:250 +#: src/modules/initcpiocfg/main.py:272 msgid "No root mount point for
initcpiocfg
." msgstr "" @@ -229,24 +229,24 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "" msgstr[1] "" -#: src/modules/packages/main.py:725 src/modules/packages/main.py:737 -#: src/modules/packages/main.py:765 +#: src/modules/packages/main.py:740 src/modules/packages/main.py:752 +#: src/modules/packages/main.py:780 msgid "Package Manager error" msgstr "" -#: src/modules/packages/main.py:726 +#: src/modules/packages/main.py:741 msgid "" "The package manager could not prepare updates. The command
{!s}
" "returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:738 +#: src/modules/packages/main.py:753 msgid "" "The package manager could not update the system. The command
{!s}
" " returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:766 +#: src/modules/packages/main.py:781 msgid "" "The package manager could not make changes to the installed system. The " "command
{!s}
returned error code {!s}." diff --git a/lang/python/nl/LC_MESSAGES/python.po b/lang/python/nl/LC_MESSAGES/python.po index d8108522e..25a985c8f 100644 --- a/lang/python/nl/LC_MESSAGES/python.po +++ b/lang/python/nl/LC_MESSAGES/python.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-24 23:38+0200\n" +"POT-Creation-Date: 2023-08-28 23:53+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Adriaan de Groot , 2020\n" "Language-Team: Dutch (https://app.transifex.com/calamares/teams/20061/nl/)\n" @@ -26,57 +26,57 @@ msgstr "" msgid "Install bootloader." msgstr "Installeer bootloader" -#: src/modules/bootloader/main.py:640 +#: src/modules/bootloader/main.py:644 msgid "Failed to install grub, no partitions defined in global storage" msgstr "" -#: src/modules/bootloader/main.py:895 +#: src/modules/bootloader/main.py:899 msgid "Bootloader installation error" msgstr "" -#: src/modules/bootloader/main.py:896 +#: src/modules/bootloader/main.py:900 msgid "" "The bootloader could not be installed. The installation command " "
{!s}
returned error code {!s}." msgstr "" -#: src/modules/displaymanager/main.py:507 +#: src/modules/displaymanager/main.py:509 msgid "Cannot write LXDM configuration file" msgstr "Schrijven naar het LXDM-configuratiebestand is mislukt" -#: src/modules/displaymanager/main.py:508 +#: src/modules/displaymanager/main.py:510 msgid "LXDM config file {!s} does not exist" msgstr "Het KDM-configuratiebestand {!s} bestaat niet" -#: src/modules/displaymanager/main.py:596 +#: src/modules/displaymanager/main.py:598 msgid "Cannot write LightDM configuration file" msgstr "Schrijven naar het LightDM-configuratiebestand is mislukt" -#: src/modules/displaymanager/main.py:597 +#: src/modules/displaymanager/main.py:599 msgid "LightDM config file {!s} does not exist" msgstr "Het LightDM-configuratiebestand {!s} bestaat niet" -#: src/modules/displaymanager/main.py:682 +#: src/modules/displaymanager/main.py:684 msgid "Cannot configure LightDM" msgstr "Kon LightDM niet configureren" -#: src/modules/displaymanager/main.py:683 +#: src/modules/displaymanager/main.py:685 msgid "No LightDM greeter installed." msgstr "Geen LightDM begroeter geïnstalleerd" -#: src/modules/displaymanager/main.py:714 +#: src/modules/displaymanager/main.py:716 msgid "Cannot write SLIM configuration file" msgstr "Schrijven naar het SLIM-configuratiebestand is mislukt" -#: src/modules/displaymanager/main.py:715 +#: src/modules/displaymanager/main.py:717 msgid "SLIM config file {!s} does not exist" msgstr "Het SLIM-configuratiebestand {!s} bestaat niet" -#: src/modules/displaymanager/main.py:933 +#: src/modules/displaymanager/main.py:935 msgid "No display managers selected for the displaymanager module." msgstr "Geen display managers geselecteerd voor de displaymanager module." -#: src/modules/displaymanager/main.py:934 +#: src/modules/displaymanager/main.py:936 msgid "" "The displaymanagers list is empty or undefined in both globalstorage and " "displaymanager.conf." @@ -84,7 +84,7 @@ msgstr "" "De lijst van display-managers is leeg, zowel in de configuratie " "displaymanager.conf als de globale opslag." -#: src/modules/displaymanager/main.py:1021 +#: src/modules/displaymanager/main.py:1023 msgid "Display manager configuration was incomplete" msgstr "Display manager configuratie was incompleet" @@ -115,8 +115,8 @@ msgid "Writing fstab." msgstr "fstab schrijven." #: src/modules/fstab/main.py:377 src/modules/fstab/main.py:383 -#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:245 -#: src/modules/initcpiocfg/main.py:249 src/modules/initramfscfg/main.py:85 +#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:267 +#: src/modules/initcpiocfg/main.py:271 src/modules/initramfscfg/main.py:85 #: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:140 #: src/modules/mount/main.py:329 src/modules/networkcfg/main.py:105 #: src/modules/openrcdmcryptcfg/main.py:72 @@ -153,11 +153,11 @@ msgstr "Instellen van hardwareklok" msgid "Configuring mkinitcpio." msgstr "Instellen van mkinitcpio" -#: src/modules/initcpiocfg/main.py:246 +#: src/modules/initcpiocfg/main.py:268 msgid "No partitions are defined for
initcpiocfg
." msgstr "" -#: src/modules/initcpiocfg/main.py:250 +#: src/modules/initcpiocfg/main.py:272 msgid "No root mount point for
initcpiocfg
." msgstr "" @@ -237,24 +237,24 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "Pakket verwijderen." msgstr[1] "%(num)d pakketten verwijderen." -#: src/modules/packages/main.py:725 src/modules/packages/main.py:737 -#: src/modules/packages/main.py:765 +#: src/modules/packages/main.py:740 src/modules/packages/main.py:752 +#: src/modules/packages/main.py:780 msgid "Package Manager error" msgstr "" -#: src/modules/packages/main.py:726 +#: src/modules/packages/main.py:741 msgid "" "The package manager could not prepare updates. The command
{!s}
" "returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:738 +#: src/modules/packages/main.py:753 msgid "" "The package manager could not update the system. The command
{!s}
" " returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:766 +#: src/modules/packages/main.py:781 msgid "" "The package manager could not make changes to the installed system. The " "command
{!s}
returned error code {!s}." diff --git a/lang/python/oc/LC_MESSAGES/python.po b/lang/python/oc/LC_MESSAGES/python.po index cfdf36dcf..c42421cfa 100644 --- a/lang/python/oc/LC_MESSAGES/python.po +++ b/lang/python/oc/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-24 23:38+0200\n" +"POT-Creation-Date: 2023-08-28 23:53+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Quentin PAGÈS, 2022\n" "Language-Team: Occitan (post 1500) (https://app.transifex.com/calamares/teams/20061/oc/)\n" @@ -25,63 +25,63 @@ msgstr "" msgid "Install bootloader." msgstr "" -#: src/modules/bootloader/main.py:640 +#: src/modules/bootloader/main.py:644 msgid "Failed to install grub, no partitions defined in global storage" msgstr "" -#: src/modules/bootloader/main.py:895 +#: src/modules/bootloader/main.py:899 msgid "Bootloader installation error" msgstr "" -#: src/modules/bootloader/main.py:896 +#: src/modules/bootloader/main.py:900 msgid "" "The bootloader could not be installed. The installation command " "
{!s}
returned error code {!s}." msgstr "" -#: src/modules/displaymanager/main.py:507 +#: src/modules/displaymanager/main.py:509 msgid "Cannot write LXDM configuration file" msgstr "" -#: src/modules/displaymanager/main.py:508 +#: src/modules/displaymanager/main.py:510 msgid "LXDM config file {!s} does not exist" msgstr "" -#: src/modules/displaymanager/main.py:596 +#: src/modules/displaymanager/main.py:598 msgid "Cannot write LightDM configuration file" msgstr "" -#: src/modules/displaymanager/main.py:597 +#: src/modules/displaymanager/main.py:599 msgid "LightDM config file {!s} does not exist" msgstr "" -#: src/modules/displaymanager/main.py:682 +#: src/modules/displaymanager/main.py:684 msgid "Cannot configure LightDM" msgstr "" -#: src/modules/displaymanager/main.py:683 +#: src/modules/displaymanager/main.py:685 msgid "No LightDM greeter installed." msgstr "" -#: src/modules/displaymanager/main.py:714 +#: src/modules/displaymanager/main.py:716 msgid "Cannot write SLIM configuration file" msgstr "" -#: src/modules/displaymanager/main.py:715 +#: src/modules/displaymanager/main.py:717 msgid "SLIM config file {!s} does not exist" msgstr "" -#: src/modules/displaymanager/main.py:933 +#: src/modules/displaymanager/main.py:935 msgid "No display managers selected for the displaymanager module." msgstr "" -#: src/modules/displaymanager/main.py:934 +#: src/modules/displaymanager/main.py:936 msgid "" "The displaymanagers list is empty or undefined in both globalstorage and " "displaymanager.conf." msgstr "" -#: src/modules/displaymanager/main.py:1021 +#: src/modules/displaymanager/main.py:1023 msgid "Display manager configuration was incomplete" msgstr "" @@ -112,8 +112,8 @@ msgid "Writing fstab." msgstr "" #: src/modules/fstab/main.py:377 src/modules/fstab/main.py:383 -#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:245 -#: src/modules/initcpiocfg/main.py:249 src/modules/initramfscfg/main.py:85 +#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:267 +#: src/modules/initcpiocfg/main.py:271 src/modules/initramfscfg/main.py:85 #: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:140 #: src/modules/mount/main.py:329 src/modules/networkcfg/main.py:105 #: src/modules/openrcdmcryptcfg/main.py:72 @@ -149,11 +149,11 @@ msgstr "" msgid "Configuring mkinitcpio." msgstr "" -#: src/modules/initcpiocfg/main.py:246 +#: src/modules/initcpiocfg/main.py:268 msgid "No partitions are defined for
initcpiocfg
." msgstr "" -#: src/modules/initcpiocfg/main.py:250 +#: src/modules/initcpiocfg/main.py:272 msgid "No root mount point for
initcpiocfg
." msgstr "" @@ -233,24 +233,24 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "" msgstr[1] "" -#: src/modules/packages/main.py:725 src/modules/packages/main.py:737 -#: src/modules/packages/main.py:765 +#: src/modules/packages/main.py:740 src/modules/packages/main.py:752 +#: src/modules/packages/main.py:780 msgid "Package Manager error" msgstr "" -#: src/modules/packages/main.py:726 +#: src/modules/packages/main.py:741 msgid "" "The package manager could not prepare updates. The command
{!s}
" "returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:738 +#: src/modules/packages/main.py:753 msgid "" "The package manager could not update the system. The command
{!s}
" " returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:766 +#: src/modules/packages/main.py:781 msgid "" "The package manager could not make changes to the installed system. The " "command
{!s}
returned error code {!s}." diff --git a/lang/python/pl/LC_MESSAGES/python.po b/lang/python/pl/LC_MESSAGES/python.po index 01abeaabc..5b1ae31ab 100644 --- a/lang/python/pl/LC_MESSAGES/python.po +++ b/lang/python/pl/LC_MESSAGES/python.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-24 23:38+0200\n" +"POT-Creation-Date: 2023-08-28 23:53+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: cooky, 2023\n" "Language-Team: Polish (https://app.transifex.com/calamares/teams/20061/pl/)\n" @@ -29,17 +29,17 @@ msgstr "" msgid "Install bootloader." msgstr "Instalacja programu rozruchowego." -#: src/modules/bootloader/main.py:640 +#: src/modules/bootloader/main.py:644 msgid "Failed to install grub, no partitions defined in global storage" msgstr "" "Nie udało się zainstalować GRUBa, nie zdefiniowano partycji w globalnej " "pamięci masowej" -#: src/modules/bootloader/main.py:895 +#: src/modules/bootloader/main.py:899 msgid "Bootloader installation error" msgstr "Błąd instalacji bootloadera" -#: src/modules/bootloader/main.py:896 +#: src/modules/bootloader/main.py:900 msgid "" "The bootloader could not be installed. The installation command " "
{!s}
returned error code {!s}." @@ -47,43 +47,43 @@ msgstr "" "Nie można zainstalować bootloadera. Polecenie instalacyjne
{!s}
" "zwróciło kod błędu {!s}." -#: src/modules/displaymanager/main.py:507 +#: src/modules/displaymanager/main.py:509 msgid "Cannot write LXDM configuration file" msgstr "Nie można zapisać pliku konfiguracji LXDM" -#: src/modules/displaymanager/main.py:508 +#: src/modules/displaymanager/main.py:510 msgid "LXDM config file {!s} does not exist" msgstr "Plik konfiguracji LXDM {!s} nie istnieje" -#: src/modules/displaymanager/main.py:596 +#: src/modules/displaymanager/main.py:598 msgid "Cannot write LightDM configuration file" msgstr "Nie można zapisać pliku konfiguracji LightDM" -#: src/modules/displaymanager/main.py:597 +#: src/modules/displaymanager/main.py:599 msgid "LightDM config file {!s} does not exist" msgstr "Plik konfiguracji LightDM {!s} nie istnieje" -#: src/modules/displaymanager/main.py:682 +#: src/modules/displaymanager/main.py:684 msgid "Cannot configure LightDM" msgstr "Nie można skonfigurować LightDM" -#: src/modules/displaymanager/main.py:683 +#: src/modules/displaymanager/main.py:685 msgid "No LightDM greeter installed." msgstr "Nie zainstalowano ekranu powitalnego LightDM." -#: src/modules/displaymanager/main.py:714 +#: src/modules/displaymanager/main.py:716 msgid "Cannot write SLIM configuration file" msgstr "Nie można zapisać pliku konfiguracji SLIM" -#: src/modules/displaymanager/main.py:715 +#: src/modules/displaymanager/main.py:717 msgid "SLIM config file {!s} does not exist" msgstr "Plik konfiguracji SLIM {!s} nie istnieje" -#: src/modules/displaymanager/main.py:933 +#: src/modules/displaymanager/main.py:935 msgid "No display managers selected for the displaymanager module." msgstr "Brak wybranych menedżerów wyświetlania dla modułu displaymanager." -#: src/modules/displaymanager/main.py:934 +#: src/modules/displaymanager/main.py:936 msgid "" "The displaymanagers list is empty or undefined in both globalstorage and " "displaymanager.conf." @@ -91,7 +91,7 @@ msgstr "" "Lista displaymanagers jest pusta lub niezdefiniowana w globalstorage oraz " "displaymanager.conf." -#: src/modules/displaymanager/main.py:1021 +#: src/modules/displaymanager/main.py:1023 msgid "Display manager configuration was incomplete" msgstr "Konfiguracja menedżera wyświetlania była niekompletna" @@ -123,8 +123,8 @@ msgid "Writing fstab." msgstr "Zapisywanie fstab." #: src/modules/fstab/main.py:377 src/modules/fstab/main.py:383 -#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:245 -#: src/modules/initcpiocfg/main.py:249 src/modules/initramfscfg/main.py:85 +#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:267 +#: src/modules/initcpiocfg/main.py:271 src/modules/initramfscfg/main.py:85 #: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:140 #: src/modules/mount/main.py:329 src/modules/networkcfg/main.py:105 #: src/modules/openrcdmcryptcfg/main.py:72 @@ -161,11 +161,11 @@ msgstr "Ustawianie zegara systemowego." msgid "Configuring mkinitcpio." msgstr "Konfigurowanie mkinitcpio." -#: src/modules/initcpiocfg/main.py:246 +#: src/modules/initcpiocfg/main.py:268 msgid "No partitions are defined for
initcpiocfg
." msgstr "Nie ma zdefiniowanych partycji dla
initcpiocfg
." -#: src/modules/initcpiocfg/main.py:250 +#: src/modules/initcpiocfg/main.py:272 msgid "No root mount point for
initcpiocfg
." msgstr "Brak głównego punktu montowania dla
initcpiocfg
." @@ -249,12 +249,12 @@ msgstr[1] "Usuwanie %(num)d pakietów." msgstr[2] "Usuwanie %(num)d pakietów." msgstr[3] "Usuwanie %(num)d pakietów." -#: src/modules/packages/main.py:725 src/modules/packages/main.py:737 -#: src/modules/packages/main.py:765 +#: src/modules/packages/main.py:740 src/modules/packages/main.py:752 +#: src/modules/packages/main.py:780 msgid "Package Manager error" msgstr "Błąd Menedżera pakietów" -#: src/modules/packages/main.py:726 +#: src/modules/packages/main.py:741 msgid "" "The package manager could not prepare updates. The command
{!s}
" "returned error code {!s}." @@ -262,7 +262,7 @@ msgstr "" "Menedżer pakietów nie może przygotować aktualizacji. Polecenie " "
{!s}
zwróciło kod błędu {!s}." -#: src/modules/packages/main.py:738 +#: src/modules/packages/main.py:753 msgid "" "The package manager could not update the system. The command
{!s}
" " returned error code {!s}." @@ -270,7 +270,7 @@ msgstr "" "Menedżer pakietów nie może zaktualizować systemu. Polecenie
{!s}
" "zwróciło kod błędu {!s}." -#: src/modules/packages/main.py:766 +#: src/modules/packages/main.py:781 msgid "" "The package manager could not make changes to the installed system. The " "command
{!s}
returned error code {!s}." diff --git a/lang/python/pt_BR/LC_MESSAGES/python.po b/lang/python/pt_BR/LC_MESSAGES/python.po index 0235bfff9..7a2c86ea4 100644 --- a/lang/python/pt_BR/LC_MESSAGES/python.po +++ b/lang/python/pt_BR/LC_MESSAGES/python.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-24 23:38+0200\n" +"POT-Creation-Date: 2023-08-28 23:53+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Guilherme MS, 2023\n" "Language-Team: Portuguese (Brazil) (https://app.transifex.com/calamares/teams/20061/pt_BR/)\n" @@ -26,16 +26,16 @@ msgstr "" msgid "Install bootloader." msgstr "Instalar carregador de inicialização." -#: src/modules/bootloader/main.py:640 +#: src/modules/bootloader/main.py:644 msgid "Failed to install grub, no partitions defined in global storage" msgstr "" "Falha ao instalar o grub, não há partições definidas no armazenamento global" -#: src/modules/bootloader/main.py:895 +#: src/modules/bootloader/main.py:899 msgid "Bootloader installation error" msgstr "Erro de instalação do carregador de inicialização" -#: src/modules/bootloader/main.py:896 +#: src/modules/bootloader/main.py:900 msgid "" "The bootloader could not be installed. The installation command " "
{!s}
returned error code {!s}." @@ -43,44 +43,44 @@ msgstr "" "O carregador de inicialização não pôde ser instalado. O comando de " "instalação
{!s}
retornou o código de erro {!s}." -#: src/modules/displaymanager/main.py:507 +#: src/modules/displaymanager/main.py:509 msgid "Cannot write LXDM configuration file" msgstr "Não foi possível gravar o arquivo de configuração do LXDM" -#: src/modules/displaymanager/main.py:508 +#: src/modules/displaymanager/main.py:510 msgid "LXDM config file {!s} does not exist" msgstr "O arquivo de configuração {!s} do LXDM não existe" -#: src/modules/displaymanager/main.py:596 +#: src/modules/displaymanager/main.py:598 msgid "Cannot write LightDM configuration file" msgstr "Não foi possível gravar o arquivo de configuração do LightDM" -#: src/modules/displaymanager/main.py:597 +#: src/modules/displaymanager/main.py:599 msgid "LightDM config file {!s} does not exist" msgstr "O arquivo de configuração {!s} do LightDM não existe" -#: src/modules/displaymanager/main.py:682 +#: src/modules/displaymanager/main.py:684 msgid "Cannot configure LightDM" msgstr "Não é possível configurar o LightDM" -#: src/modules/displaymanager/main.py:683 +#: src/modules/displaymanager/main.py:685 msgid "No LightDM greeter installed." msgstr "Não há nenhuma tela de login do LightDM instalada." -#: src/modules/displaymanager/main.py:714 +#: src/modules/displaymanager/main.py:716 msgid "Cannot write SLIM configuration file" msgstr "Não foi possível gravar o arquivo de configuração do SLIM" -#: src/modules/displaymanager/main.py:715 +#: src/modules/displaymanager/main.py:717 msgid "SLIM config file {!s} does not exist" msgstr "O arquivo de configuração {!s} do SLIM não existe" -#: src/modules/displaymanager/main.py:933 +#: src/modules/displaymanager/main.py:935 msgid "No display managers selected for the displaymanager module." msgstr "" "Nenhum gerenciador de exibição selecionado para o módulo do displaymanager." -#: src/modules/displaymanager/main.py:934 +#: src/modules/displaymanager/main.py:936 msgid "" "The displaymanagers list is empty or undefined in both globalstorage and " "displaymanager.conf." @@ -88,7 +88,7 @@ msgstr "" "A lista de displaymanagers está vazia ou indefinida em ambos globalstorage e" " displaymanager.conf." -#: src/modules/displaymanager/main.py:1021 +#: src/modules/displaymanager/main.py:1023 msgid "Display manager configuration was incomplete" msgstr "A configuração do gerenciador de exibição está incompleta" @@ -121,8 +121,8 @@ msgid "Writing fstab." msgstr "Escrevendo fstab." #: src/modules/fstab/main.py:377 src/modules/fstab/main.py:383 -#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:245 -#: src/modules/initcpiocfg/main.py:249 src/modules/initramfscfg/main.py:85 +#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:267 +#: src/modules/initcpiocfg/main.py:271 src/modules/initramfscfg/main.py:85 #: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:140 #: src/modules/mount/main.py:329 src/modules/networkcfg/main.py:105 #: src/modules/openrcdmcryptcfg/main.py:72 @@ -161,11 +161,11 @@ msgstr "Configurando relógio de hardware." msgid "Configuring mkinitcpio." msgstr "Configurando mkinitcpio." -#: src/modules/initcpiocfg/main.py:246 +#: src/modules/initcpiocfg/main.py:268 msgid "No partitions are defined for
initcpiocfg
." msgstr "Sem partições definidas para uso pelo
initcpiocfg
." -#: src/modules/initcpiocfg/main.py:250 +#: src/modules/initcpiocfg/main.py:272 msgid "No root mount point for
initcpiocfg
." msgstr "Nenhum ponto de montagem root para o
initcpiocfg
." @@ -247,12 +247,12 @@ msgstr[0] "Removendo um pacote." msgstr[1] "Removendo %(num)d pacotes." msgstr[2] "Removendo %(num)d pacotes." -#: src/modules/packages/main.py:725 src/modules/packages/main.py:737 -#: src/modules/packages/main.py:765 +#: src/modules/packages/main.py:740 src/modules/packages/main.py:752 +#: src/modules/packages/main.py:780 msgid "Package Manager error" msgstr "Erro do Gerenciador de Pacotes" -#: src/modules/packages/main.py:726 +#: src/modules/packages/main.py:741 msgid "" "The package manager could not prepare updates. The command
{!s}
" "returned error code {!s}." @@ -260,7 +260,7 @@ msgstr "" "O gerenciador de pacotes não pôde preparar as atualizações. O comando " "
{!s}
retornou o código de erro {!s}." -#: src/modules/packages/main.py:738 +#: src/modules/packages/main.py:753 msgid "" "The package manager could not update the system. The command
{!s}
" " returned error code {!s}." @@ -268,7 +268,7 @@ msgstr "" "O gerenciador de pacotes não pôde atualizar o sistema. O comando " "
{!s}
retornou o código de erro {!s}." -#: src/modules/packages/main.py:766 +#: src/modules/packages/main.py:781 msgid "" "The package manager could not make changes to the installed system. The " "command
{!s}
returned error code {!s}." diff --git a/lang/python/pt_PT/LC_MESSAGES/python.po b/lang/python/pt_PT/LC_MESSAGES/python.po index 0e5d48425..eb76254c7 100644 --- a/lang/python/pt_PT/LC_MESSAGES/python.po +++ b/lang/python/pt_PT/LC_MESSAGES/python.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-24 23:38+0200\n" +"POT-Creation-Date: 2023-08-28 23:53+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Hugo Carvalho , 2023\n" "Language-Team: Portuguese (Portugal) (https://app.transifex.com/calamares/teams/20061/pt_PT/)\n" @@ -27,16 +27,16 @@ msgstr "" msgid "Install bootloader." msgstr "Instalar o carregador de arranque." -#: src/modules/bootloader/main.py:640 +#: src/modules/bootloader/main.py:644 msgid "Failed to install grub, no partitions defined in global storage" msgstr "" "Falha ao instalar o grub, sem partições definidas no armazenamento global" -#: src/modules/bootloader/main.py:895 +#: src/modules/bootloader/main.py:899 msgid "Bootloader installation error" msgstr "Erro de instalação do carregador de arranque" -#: src/modules/bootloader/main.py:896 +#: src/modules/bootloader/main.py:900 msgid "" "The bootloader could not be installed. The installation command " "
{!s}
returned error code {!s}." @@ -44,44 +44,44 @@ msgstr "" "Não foi possível instalar o carregador de arranque. O comando de instalação " "
{!s}
apresentou o código de erro {!s}." -#: src/modules/displaymanager/main.py:507 +#: src/modules/displaymanager/main.py:509 msgid "Cannot write LXDM configuration file" msgstr "Não é possível gravar o ficheiro de configuração LXDM" -#: src/modules/displaymanager/main.py:508 +#: src/modules/displaymanager/main.py:510 msgid "LXDM config file {!s} does not exist" msgstr "O ficheiro de configuração do LXDM {!s} não existe" -#: src/modules/displaymanager/main.py:596 +#: src/modules/displaymanager/main.py:598 msgid "Cannot write LightDM configuration file" msgstr "Não é possível gravar o ficheiro de configuração LightDM" -#: src/modules/displaymanager/main.py:597 +#: src/modules/displaymanager/main.py:599 msgid "LightDM config file {!s} does not exist" msgstr "O ficheiro de configuração do LightDM {!s} não existe" -#: src/modules/displaymanager/main.py:682 +#: src/modules/displaymanager/main.py:684 msgid "Cannot configure LightDM" msgstr "Não é possível configurar o LightDM" -#: src/modules/displaymanager/main.py:683 +#: src/modules/displaymanager/main.py:685 msgid "No LightDM greeter installed." msgstr "Nenhum ecrã de boas-vindas LightDM instalado." -#: src/modules/displaymanager/main.py:714 +#: src/modules/displaymanager/main.py:716 msgid "Cannot write SLIM configuration file" msgstr "Não é possível gravar o ficheiro de configuração SLIM" -#: src/modules/displaymanager/main.py:715 +#: src/modules/displaymanager/main.py:717 msgid "SLIM config file {!s} does not exist" msgstr "O ficheiro de configuração do SLIM {!s} não existe" -#: src/modules/displaymanager/main.py:933 +#: src/modules/displaymanager/main.py:935 msgid "No display managers selected for the displaymanager module." msgstr "" "Nenhum gestor de exibição selecionado para o módulo de gestor de exibição." -#: src/modules/displaymanager/main.py:934 +#: src/modules/displaymanager/main.py:936 msgid "" "The displaymanagers list is empty or undefined in both globalstorage and " "displaymanager.conf." @@ -89,7 +89,7 @@ msgstr "" "A lista de gestores de visualização está vazia ou indefinida tanto no " "globalstorage como no displaymanager.conf." -#: src/modules/displaymanager/main.py:1021 +#: src/modules/displaymanager/main.py:1023 msgid "Display manager configuration was incomplete" msgstr "A configuração do gestor de exibição estava incompleta" @@ -122,8 +122,8 @@ msgid "Writing fstab." msgstr "A escrever o fstab." #: src/modules/fstab/main.py:377 src/modules/fstab/main.py:383 -#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:245 -#: src/modules/initcpiocfg/main.py:249 src/modules/initramfscfg/main.py:85 +#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:267 +#: src/modules/initcpiocfg/main.py:271 src/modules/initramfscfg/main.py:85 #: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:140 #: src/modules/mount/main.py:329 src/modules/networkcfg/main.py:105 #: src/modules/openrcdmcryptcfg/main.py:72 @@ -161,11 +161,11 @@ msgstr "A definir o relógio do hardware." msgid "Configuring mkinitcpio." msgstr "A configurar o mkintcpio." -#: src/modules/initcpiocfg/main.py:246 +#: src/modules/initcpiocfg/main.py:268 msgid "No partitions are defined for
initcpiocfg
." msgstr "Nenhuma partição está definida para
initcpiocfg
." -#: src/modules/initcpiocfg/main.py:250 +#: src/modules/initcpiocfg/main.py:272 msgid "No root mount point for
initcpiocfg
." msgstr "Nenhum ponto de montagem root para
initcpiocfg
." @@ -247,12 +247,12 @@ msgstr[0] "A remover um pacote." msgstr[1] "A remover %(num)d pacotes." msgstr[2] "A remover %(num)d pacotes." -#: src/modules/packages/main.py:725 src/modules/packages/main.py:737 -#: src/modules/packages/main.py:765 +#: src/modules/packages/main.py:740 src/modules/packages/main.py:752 +#: src/modules/packages/main.py:780 msgid "Package Manager error" msgstr "Erro do gestor de pacotes" -#: src/modules/packages/main.py:726 +#: src/modules/packages/main.py:741 msgid "" "The package manager could not prepare updates. The command
{!s}
" "returned error code {!s}." @@ -260,7 +260,7 @@ msgstr "" "O gestor de pacotes não conseguiu preparar atualizações. O comando " "
{!s}
apresentou o código de erro {!s}." -#: src/modules/packages/main.py:738 +#: src/modules/packages/main.py:753 msgid "" "The package manager could not update the system. The command
{!s}
" " returned error code {!s}." @@ -268,7 +268,7 @@ msgstr "" "O gestor de pacotes não conseguiu atualizar o sistema. O comando " "
{!s}
apresentou o código de erro {!s}." -#: src/modules/packages/main.py:766 +#: src/modules/packages/main.py:781 msgid "" "The package manager could not make changes to the installed system. The " "command
{!s}
returned error code {!s}." diff --git a/lang/python/ro/LC_MESSAGES/python.po b/lang/python/ro/LC_MESSAGES/python.po index 63c1075d0..389740096 100644 --- a/lang/python/ro/LC_MESSAGES/python.po +++ b/lang/python/ro/LC_MESSAGES/python.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-24 23:38+0200\n" +"POT-Creation-Date: 2023-08-28 23:53+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Chele Ion , 2021\n" "Language-Team: Romanian (https://app.transifex.com/calamares/teams/20061/ro/)\n" @@ -27,63 +27,63 @@ msgstr "" msgid "Install bootloader." msgstr "" -#: src/modules/bootloader/main.py:640 +#: src/modules/bootloader/main.py:644 msgid "Failed to install grub, no partitions defined in global storage" msgstr "" -#: src/modules/bootloader/main.py:895 +#: src/modules/bootloader/main.py:899 msgid "Bootloader installation error" msgstr "" -#: src/modules/bootloader/main.py:896 +#: src/modules/bootloader/main.py:900 msgid "" "The bootloader could not be installed. The installation command " "
{!s}
returned error code {!s}." msgstr "" -#: src/modules/displaymanager/main.py:507 +#: src/modules/displaymanager/main.py:509 msgid "Cannot write LXDM configuration file" msgstr "" -#: src/modules/displaymanager/main.py:508 +#: src/modules/displaymanager/main.py:510 msgid "LXDM config file {!s} does not exist" msgstr "" -#: src/modules/displaymanager/main.py:596 +#: src/modules/displaymanager/main.py:598 msgid "Cannot write LightDM configuration file" msgstr "" -#: src/modules/displaymanager/main.py:597 +#: src/modules/displaymanager/main.py:599 msgid "LightDM config file {!s} does not exist" msgstr "" -#: src/modules/displaymanager/main.py:682 +#: src/modules/displaymanager/main.py:684 msgid "Cannot configure LightDM" msgstr "" -#: src/modules/displaymanager/main.py:683 +#: src/modules/displaymanager/main.py:685 msgid "No LightDM greeter installed." msgstr "" -#: src/modules/displaymanager/main.py:714 +#: src/modules/displaymanager/main.py:716 msgid "Cannot write SLIM configuration file" msgstr "" -#: src/modules/displaymanager/main.py:715 +#: src/modules/displaymanager/main.py:717 msgid "SLIM config file {!s} does not exist" msgstr "" -#: src/modules/displaymanager/main.py:933 +#: src/modules/displaymanager/main.py:935 msgid "No display managers selected for the displaymanager module." msgstr "" -#: src/modules/displaymanager/main.py:934 +#: src/modules/displaymanager/main.py:936 msgid "" "The displaymanagers list is empty or undefined in both globalstorage and " "displaymanager.conf." msgstr "" -#: src/modules/displaymanager/main.py:1021 +#: src/modules/displaymanager/main.py:1023 msgid "Display manager configuration was incomplete" msgstr "" @@ -114,8 +114,8 @@ msgid "Writing fstab." msgstr "" #: src/modules/fstab/main.py:377 src/modules/fstab/main.py:383 -#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:245 -#: src/modules/initcpiocfg/main.py:249 src/modules/initramfscfg/main.py:85 +#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:267 +#: src/modules/initcpiocfg/main.py:271 src/modules/initramfscfg/main.py:85 #: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:140 #: src/modules/mount/main.py:329 src/modules/networkcfg/main.py:105 #: src/modules/openrcdmcryptcfg/main.py:72 @@ -151,11 +151,11 @@ msgstr "" msgid "Configuring mkinitcpio." msgstr "" -#: src/modules/initcpiocfg/main.py:246 +#: src/modules/initcpiocfg/main.py:268 msgid "No partitions are defined for
initcpiocfg
." msgstr "" -#: src/modules/initcpiocfg/main.py:250 +#: src/modules/initcpiocfg/main.py:272 msgid "No root mount point for
initcpiocfg
." msgstr "" @@ -237,24 +237,24 @@ msgstr[0] "Se elimină un pachet." msgstr[1] "Se elimină %(num)d pachet." msgstr[2] "Se elimină %(num)d de pachete." -#: src/modules/packages/main.py:725 src/modules/packages/main.py:737 -#: src/modules/packages/main.py:765 +#: src/modules/packages/main.py:740 src/modules/packages/main.py:752 +#: src/modules/packages/main.py:780 msgid "Package Manager error" msgstr "" -#: src/modules/packages/main.py:726 +#: src/modules/packages/main.py:741 msgid "" "The package manager could not prepare updates. The command
{!s}
" "returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:738 +#: src/modules/packages/main.py:753 msgid "" "The package manager could not update the system. The command
{!s}
" " returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:766 +#: src/modules/packages/main.py:781 msgid "" "The package manager could not make changes to the installed system. The " "command
{!s}
returned error code {!s}." diff --git a/lang/python/ru/LC_MESSAGES/python.po b/lang/python/ru/LC_MESSAGES/python.po index 1579ae3a2..b81b8685c 100644 --- a/lang/python/ru/LC_MESSAGES/python.po +++ b/lang/python/ru/LC_MESSAGES/python.po @@ -6,17 +6,17 @@ # Translators: # Aleksey Kabanov , 2018 # ZIzA, 2020 -# Victor, 2023 # Темак, 2023 +# Victor, 2023 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-24 23:38+0200\n" +"POT-Creation-Date: 2023-08-28 23:53+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" -"Last-Translator: Темак, 2023\n" +"Last-Translator: Victor, 2023\n" "Language-Team: Russian (https://app.transifex.com/calamares/teams/20061/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -28,15 +28,15 @@ msgstr "" msgid "Install bootloader." msgstr "Установить загрузчик." -#: src/modules/bootloader/main.py:640 +#: src/modules/bootloader/main.py:644 msgid "Failed to install grub, no partitions defined in global storage" msgstr "Не удалось установить grub, разделы не определены в общем хранилище" -#: src/modules/bootloader/main.py:895 +#: src/modules/bootloader/main.py:899 msgid "Bootloader installation error" msgstr "Ошибка установки загрузчика" -#: src/modules/bootloader/main.py:896 +#: src/modules/bootloader/main.py:900 msgid "" "The bootloader could not be installed. The installation command " "
{!s}
returned error code {!s}." @@ -44,43 +44,43 @@ msgstr "" "Загрузчик установить не удалось. Команда установки
{!s}
вернула " "код ошибки {!s}." -#: src/modules/displaymanager/main.py:507 +#: src/modules/displaymanager/main.py:509 msgid "Cannot write LXDM configuration file" msgstr "Не удаётся записать файл конфигурации LXDM" -#: src/modules/displaymanager/main.py:508 +#: src/modules/displaymanager/main.py:510 msgid "LXDM config file {!s} does not exist" msgstr "Файл конфигурации LXDM {!s} не существует" -#: src/modules/displaymanager/main.py:596 +#: src/modules/displaymanager/main.py:598 msgid "Cannot write LightDM configuration file" msgstr "Не удается записать файл конфигурации LightDM" -#: src/modules/displaymanager/main.py:597 +#: src/modules/displaymanager/main.py:599 msgid "LightDM config file {!s} does not exist" msgstr "Файл конфигурации LightDM {!s} не существует" -#: src/modules/displaymanager/main.py:682 +#: src/modules/displaymanager/main.py:684 msgid "Cannot configure LightDM" msgstr "Не удалось настроить LightDM" -#: src/modules/displaymanager/main.py:683 +#: src/modules/displaymanager/main.py:685 msgid "No LightDM greeter installed." msgstr "LightDM Greeter не установлен." -#: src/modules/displaymanager/main.py:714 +#: src/modules/displaymanager/main.py:716 msgid "Cannot write SLIM configuration file" msgstr "Не удается записать файл конфигурации SLIM" -#: src/modules/displaymanager/main.py:715 +#: src/modules/displaymanager/main.py:717 msgid "SLIM config file {!s} does not exist" msgstr "Файл конфигурации SLIM {!s} не существует" -#: src/modules/displaymanager/main.py:933 +#: src/modules/displaymanager/main.py:935 msgid "No display managers selected for the displaymanager module." msgstr "Для модуля displaymanager не выбраны менеджеры дисплеев." -#: src/modules/displaymanager/main.py:934 +#: src/modules/displaymanager/main.py:936 msgid "" "The displaymanagers list is empty or undefined in both globalstorage and " "displaymanager.conf." @@ -88,7 +88,7 @@ msgstr "" "Список дисплейных менеджеров пуст или не определен в globalstorage и в " "displaymanager.conf." -#: src/modules/displaymanager/main.py:1021 +#: src/modules/displaymanager/main.py:1023 msgid "Display manager configuration was incomplete" msgstr "Конфигурация дисплейного менеджера не завершена." @@ -98,12 +98,14 @@ msgstr "Создание initramfs с помощью dracut." #: src/modules/dracut/main.py:63 msgid "Failed to run dracut" -msgstr "" +msgstr "Не удалось запустить dracut" #: src/modules/dracut/main.py:64 #, python-brace-format msgid "Dracut failed to run on the target with return code: {return_code}" msgstr "" +"Dracut не удалось запустить на целевом объекте с кодом возврата: " +"{return_code}." #: src/modules/dummypython/main.py:35 msgid "Dummy python job." @@ -119,8 +121,8 @@ msgid "Writing fstab." msgstr "Запись fstab." #: src/modules/fstab/main.py:377 src/modules/fstab/main.py:383 -#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:245 -#: src/modules/initcpiocfg/main.py:249 src/modules/initramfscfg/main.py:85 +#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:267 +#: src/modules/initcpiocfg/main.py:271 src/modules/initramfscfg/main.py:85 #: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:140 #: src/modules/mount/main.py:329 src/modules/networkcfg/main.py:105 #: src/modules/openrcdmcryptcfg/main.py:72 @@ -158,11 +160,11 @@ msgstr "Установка аппаратных часов." msgid "Configuring mkinitcpio." msgstr "Настройка mkinitcpio." -#: src/modules/initcpiocfg/main.py:246 +#: src/modules/initcpiocfg/main.py:268 msgid "No partitions are defined for
initcpiocfg
." -msgstr "" +msgstr "Не определены разделы для
initcpiocfg
." -#: src/modules/initcpiocfg/main.py:250 +#: src/modules/initcpiocfg/main.py:272 msgid "No root mount point for
initcpiocfg
." msgstr "" @@ -180,7 +182,7 @@ msgstr "Создание initramfs с помощью mkinitfs." #: src/modules/mkinitfs/main.py:49 msgid "Failed to run mkinitfs on the target" -msgstr "Не удалось запустить mkinitfs на таргет" +msgstr "Не удалось запустить mkinitfs на целевой объект" #: src/modules/mkinitfs/main.py:50 msgid "The exit code was {}" @@ -246,12 +248,12 @@ msgstr[1] "Удаление %(num)d пакетов." msgstr[2] "Удаление %(num)d пакетов." msgstr[3] "Удаление %(num)d пакетов." -#: src/modules/packages/main.py:725 src/modules/packages/main.py:737 -#: src/modules/packages/main.py:765 +#: src/modules/packages/main.py:740 src/modules/packages/main.py:752 +#: src/modules/packages/main.py:780 msgid "Package Manager error" msgstr "Ошибка менеджера пакетов" -#: src/modules/packages/main.py:726 +#: src/modules/packages/main.py:741 msgid "" "The package manager could not prepare updates. The command
{!s}
" "returned error code {!s}." @@ -259,7 +261,7 @@ msgstr "" "Менеджер пакетов не смог подготовить обновления. Команда
{!s}
" "вернула код ошибки {!s}." -#: src/modules/packages/main.py:738 +#: src/modules/packages/main.py:753 msgid "" "The package manager could not update the system. The command
{!s}
" " returned error code {!s}." @@ -267,7 +269,7 @@ msgstr "" "Менеджер пакетов не смог обновить систему. Команда
{!s}
вернула " "код ошибки {!s}." -#: src/modules/packages/main.py:766 +#: src/modules/packages/main.py:781 msgid "" "The package manager could not make changes to the installed system. The " "command
{!s}
returned error code {!s}." @@ -338,11 +340,11 @@ msgstr "" #: src/modules/services-systemd/main.py:26 msgid "Configure systemd units" -msgstr "" +msgstr "Настройка юнитов systemd" #: src/modules/services-systemd/main.py:64 msgid "Cannot modify unit" -msgstr "" +msgstr "Не удается изменить юнит" #: src/modules/services-systemd/main.py:65 msgid "" @@ -352,7 +354,7 @@ msgstr "" #: src/modules/services-systemd/main.py:66 msgid "Cannot {_action!s} systemd unit {_name!s}." -msgstr "" +msgstr "Не удается {_action!s} юнит systemd {name!s}." #: src/modules/unpackfs/main.py:34 msgid "Filling up filesystems." @@ -422,4 +424,4 @@ msgstr "Назначение \"{}\" в целевой системе не явл #: src/modules/zfshostid/main.py:27 msgid "Copying zfs generated hostid." -msgstr "" +msgstr "Копирование сгенерированного zfs id хоста." diff --git a/lang/python/si/LC_MESSAGES/python.po b/lang/python/si/LC_MESSAGES/python.po index cf79d0058..54e8c5f93 100644 --- a/lang/python/si/LC_MESSAGES/python.po +++ b/lang/python/si/LC_MESSAGES/python.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-24 23:38+0200\n" +"POT-Creation-Date: 2023-08-28 23:53+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Sandaruwan Samaraweera, 2022\n" "Language-Team: Sinhala (https://app.transifex.com/calamares/teams/20061/si/)\n" @@ -26,16 +26,16 @@ msgstr "" msgid "Install bootloader." msgstr "bootloader ස්ථාපනය කරන්න." -#: src/modules/bootloader/main.py:640 +#: src/modules/bootloader/main.py:644 msgid "Failed to install grub, no partitions defined in global storage" msgstr "" "Grub ස්ථාපනය කිරීමට අපොහොසත් විය, ගෝලීය ආචයනය තුළ කොටස් අර්ථ දක්වා නොමැත" -#: src/modules/bootloader/main.py:895 +#: src/modules/bootloader/main.py:899 msgid "Bootloader installation error" msgstr "Bootloader ස්ථාපනය කිරීමේ දෝෂයකි" -#: src/modules/bootloader/main.py:896 +#: src/modules/bootloader/main.py:900 msgid "" "The bootloader could not be installed. The installation command " "
{!s}
returned error code {!s}." @@ -43,43 +43,43 @@ msgstr "" "ඇරඹුම් කාරකය ස්ථාපනය කල නොහැක. ස්ථාපන විධානය
{!s}
දෝෂ කේතය {!s} " "ලබා දුන්නේය." -#: src/modules/displaymanager/main.py:507 +#: src/modules/displaymanager/main.py:509 msgid "Cannot write LXDM configuration file" msgstr "LXDM වින්‍යාස ගොනුව ලිවිය නොහැක" -#: src/modules/displaymanager/main.py:508 +#: src/modules/displaymanager/main.py:510 msgid "LXDM config file {!s} does not exist" msgstr "LXDM වින්‍යාස ගොනුව {!s} නොපවතී" -#: src/modules/displaymanager/main.py:596 +#: src/modules/displaymanager/main.py:598 msgid "Cannot write LightDM configuration file" msgstr "LightDM වින්‍යාස ගොනුව ලිවිය නොහැක" -#: src/modules/displaymanager/main.py:597 +#: src/modules/displaymanager/main.py:599 msgid "LightDM config file {!s} does not exist" msgstr "LightDM වින්‍යාස ගොනුව {!s} නොපවතී" -#: src/modules/displaymanager/main.py:682 +#: src/modules/displaymanager/main.py:684 msgid "Cannot configure LightDM" msgstr "LightDM වින්‍යාස කළ නොහැක" -#: src/modules/displaymanager/main.py:683 +#: src/modules/displaymanager/main.py:685 msgid "No LightDM greeter installed." msgstr "LightDM ග්‍රීටර් ස්ථාපනය කර නැත." -#: src/modules/displaymanager/main.py:714 +#: src/modules/displaymanager/main.py:716 msgid "Cannot write SLIM configuration file" msgstr "SLIM වින්‍යාස ගොනුව ලිවිය නොහැක" -#: src/modules/displaymanager/main.py:715 +#: src/modules/displaymanager/main.py:717 msgid "SLIM config file {!s} does not exist" msgstr "SLIM වින්‍යාස ගොනුව {!s} නොපවතී" -#: src/modules/displaymanager/main.py:933 +#: src/modules/displaymanager/main.py:935 msgid "No display managers selected for the displaymanager module." msgstr "සංදර්ශක කළමනාකරු මොඩියුලය සඳහා සංදර්ශක කළමනාකරුවන් තෝරාගෙන නොමැත." -#: src/modules/displaymanager/main.py:934 +#: src/modules/displaymanager/main.py:936 msgid "" "The displaymanagers list is empty or undefined in both globalstorage and " "displaymanager.conf." @@ -87,7 +87,7 @@ msgstr "" "ගෝලීය ගබඩාව සහ displaymanager.conf යන දෙකෙහිම සංදර්ශක කළමනාකරු ලැයිස්තුව " "හිස් හෝ අර්ථ දක්වා නොමැත." -#: src/modules/displaymanager/main.py:1021 +#: src/modules/displaymanager/main.py:1023 msgid "Display manager configuration was incomplete" msgstr "සංදර්ශක කළමනාකරු වින්‍යාසය අසම්පූර්ණ විය" @@ -118,8 +118,8 @@ msgid "Writing fstab." msgstr "fstab ලියමින්." #: src/modules/fstab/main.py:377 src/modules/fstab/main.py:383 -#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:245 -#: src/modules/initcpiocfg/main.py:249 src/modules/initramfscfg/main.py:85 +#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:267 +#: src/modules/initcpiocfg/main.py:271 src/modules/initramfscfg/main.py:85 #: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:140 #: src/modules/mount/main.py:329 src/modules/networkcfg/main.py:105 #: src/modules/openrcdmcryptcfg/main.py:72 @@ -156,11 +156,11 @@ msgstr "දෘඩාංග ඔරලෝසුව සැකසෙමින්." msgid "Configuring mkinitcpio." msgstr "mkinitcpio වින්‍යාස කරමින්." -#: src/modules/initcpiocfg/main.py:246 +#: src/modules/initcpiocfg/main.py:268 msgid "No partitions are defined for
initcpiocfg
." msgstr "" -#: src/modules/initcpiocfg/main.py:250 +#: src/modules/initcpiocfg/main.py:272 msgid "No root mount point for
initcpiocfg
." msgstr "" @@ -240,12 +240,12 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "ඇසුරුමක් ඉවත් වෙමින්." msgstr[1] "ඇසුරුම් %(num)d ක් ඉවත් වෙමින්." -#: src/modules/packages/main.py:725 src/modules/packages/main.py:737 -#: src/modules/packages/main.py:765 +#: src/modules/packages/main.py:740 src/modules/packages/main.py:752 +#: src/modules/packages/main.py:780 msgid "Package Manager error" msgstr "පැකේජ කළමනාකරු දෝෂයකි" -#: src/modules/packages/main.py:726 +#: src/modules/packages/main.py:741 msgid "" "The package manager could not prepare updates. The command
{!s}
" "returned error code {!s}." @@ -253,7 +253,7 @@ msgstr "" "පැකේජ කළමනාකරුට යාවත්කාලීන සකස් කිරීමට නොහැකි විය. විධානය
{!s}
" "දෝෂ කේතය {!s} ලබා දුන්නේය." -#: src/modules/packages/main.py:738 +#: src/modules/packages/main.py:753 msgid "" "The package manager could not update the system. The command
{!s}
" " returned error code {!s}." @@ -261,7 +261,7 @@ msgstr "" "පැකේජ කළමනාකරුට පද්ධතිය යාවත්කාලීන කළ නොහැකි විය. විධානය
{!s}
දෝෂ" " කේතය {!s} ලබා දුන්නේය." -#: src/modules/packages/main.py:766 +#: src/modules/packages/main.py:781 msgid "" "The package manager could not make changes to the installed system. The " "command
{!s}
returned error code {!s}." diff --git a/lang/python/sk/LC_MESSAGES/python.po b/lang/python/sk/LC_MESSAGES/python.po index b0c7d642d..f578def91 100644 --- a/lang/python/sk/LC_MESSAGES/python.po +++ b/lang/python/sk/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-24 23:38+0200\n" +"POT-Creation-Date: 2023-08-28 23:53+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Dušan Kazik , 2020\n" "Language-Team: Slovak (https://app.transifex.com/calamares/teams/20061/sk/)\n" @@ -25,63 +25,63 @@ msgstr "" msgid "Install bootloader." msgstr "Inštalácia zavádzača." -#: src/modules/bootloader/main.py:640 +#: src/modules/bootloader/main.py:644 msgid "Failed to install grub, no partitions defined in global storage" msgstr "" -#: src/modules/bootloader/main.py:895 +#: src/modules/bootloader/main.py:899 msgid "Bootloader installation error" msgstr "" -#: src/modules/bootloader/main.py:896 +#: src/modules/bootloader/main.py:900 msgid "" "The bootloader could not be installed. The installation command " "
{!s}
returned error code {!s}." msgstr "" -#: src/modules/displaymanager/main.py:507 +#: src/modules/displaymanager/main.py:509 msgid "Cannot write LXDM configuration file" msgstr "Nedá sa zapísať konfiguračný súbor správcu LXDM" -#: src/modules/displaymanager/main.py:508 +#: src/modules/displaymanager/main.py:510 msgid "LXDM config file {!s} does not exist" msgstr "Konfiguračný súbor správcu LXDM {!s} neexistuje" -#: src/modules/displaymanager/main.py:596 +#: src/modules/displaymanager/main.py:598 msgid "Cannot write LightDM configuration file" msgstr "Nedá sa zapísať konfiguračný súbor správcu LightDM" -#: src/modules/displaymanager/main.py:597 +#: src/modules/displaymanager/main.py:599 msgid "LightDM config file {!s} does not exist" msgstr "Konfiguračný súbor správcu LightDM {!s} neexistuje" -#: src/modules/displaymanager/main.py:682 +#: src/modules/displaymanager/main.py:684 msgid "Cannot configure LightDM" msgstr "Nedá s nakonfigurovať správca LightDM" -#: src/modules/displaymanager/main.py:683 +#: src/modules/displaymanager/main.py:685 msgid "No LightDM greeter installed." msgstr "Nie je nainštalovaný žiadny vítací nástroj LightDM." -#: src/modules/displaymanager/main.py:714 +#: src/modules/displaymanager/main.py:716 msgid "Cannot write SLIM configuration file" msgstr "Nedá sa zapísať konfiguračný súbor správcu SLIM" -#: src/modules/displaymanager/main.py:715 +#: src/modules/displaymanager/main.py:717 msgid "SLIM config file {!s} does not exist" msgstr "Konfiguračný súbor správcu SLIM {!s} neexistuje" -#: src/modules/displaymanager/main.py:933 +#: src/modules/displaymanager/main.py:935 msgid "No display managers selected for the displaymanager module." msgstr "Neboli vybraní žiadni správcovia zobrazenia pre modul displaymanager." -#: src/modules/displaymanager/main.py:934 +#: src/modules/displaymanager/main.py:936 msgid "" "The displaymanagers list is empty or undefined in both globalstorage and " "displaymanager.conf." msgstr "" -#: src/modules/displaymanager/main.py:1021 +#: src/modules/displaymanager/main.py:1023 msgid "Display manager configuration was incomplete" msgstr "Konfigurácia správcu zobrazenia nebola úplná" @@ -112,8 +112,8 @@ msgid "Writing fstab." msgstr "Zapisovanie fstab." #: src/modules/fstab/main.py:377 src/modules/fstab/main.py:383 -#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:245 -#: src/modules/initcpiocfg/main.py:249 src/modules/initramfscfg/main.py:85 +#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:267 +#: src/modules/initcpiocfg/main.py:271 src/modules/initramfscfg/main.py:85 #: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:140 #: src/modules/mount/main.py:329 src/modules/networkcfg/main.py:105 #: src/modules/openrcdmcryptcfg/main.py:72 @@ -149,11 +149,11 @@ msgstr "Nastavovanie hardvérových hodín." msgid "Configuring mkinitcpio." msgstr "Konfigurácia mkinitcpio." -#: src/modules/initcpiocfg/main.py:246 +#: src/modules/initcpiocfg/main.py:268 msgid "No partitions are defined for
initcpiocfg
." msgstr "" -#: src/modules/initcpiocfg/main.py:250 +#: src/modules/initcpiocfg/main.py:272 msgid "No root mount point for
initcpiocfg
." msgstr "" @@ -237,24 +237,24 @@ msgstr[1] "Odstraňujú sa %(num)d balíky." msgstr[2] "Odstraňuje sa %(num)d balíkov." msgstr[3] "Odstraňuje sa %(num)d balíkov." -#: src/modules/packages/main.py:725 src/modules/packages/main.py:737 -#: src/modules/packages/main.py:765 +#: src/modules/packages/main.py:740 src/modules/packages/main.py:752 +#: src/modules/packages/main.py:780 msgid "Package Manager error" msgstr "" -#: src/modules/packages/main.py:726 +#: src/modules/packages/main.py:741 msgid "" "The package manager could not prepare updates. The command
{!s}
" "returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:738 +#: src/modules/packages/main.py:753 msgid "" "The package manager could not update the system. The command
{!s}
" " returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:766 +#: src/modules/packages/main.py:781 msgid "" "The package manager could not make changes to the installed system. The " "command
{!s}
returned error code {!s}." diff --git a/lang/python/sl/LC_MESSAGES/python.po b/lang/python/sl/LC_MESSAGES/python.po index fbb3a1866..7dbf91b4a 100644 --- a/lang/python/sl/LC_MESSAGES/python.po +++ b/lang/python/sl/LC_MESSAGES/python.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-24 23:38+0200\n" +"POT-Creation-Date: 2023-08-28 23:53+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Slovenian (https://app.transifex.com/calamares/teams/20061/sl/)\n" "MIME-Version: 1.0\n" @@ -21,63 +21,63 @@ msgstr "" msgid "Install bootloader." msgstr "" -#: src/modules/bootloader/main.py:640 +#: src/modules/bootloader/main.py:644 msgid "Failed to install grub, no partitions defined in global storage" msgstr "" -#: src/modules/bootloader/main.py:895 +#: src/modules/bootloader/main.py:899 msgid "Bootloader installation error" msgstr "" -#: src/modules/bootloader/main.py:896 +#: src/modules/bootloader/main.py:900 msgid "" "The bootloader could not be installed. The installation command " "
{!s}
returned error code {!s}." msgstr "" -#: src/modules/displaymanager/main.py:507 +#: src/modules/displaymanager/main.py:509 msgid "Cannot write LXDM configuration file" msgstr "" -#: src/modules/displaymanager/main.py:508 +#: src/modules/displaymanager/main.py:510 msgid "LXDM config file {!s} does not exist" msgstr "" -#: src/modules/displaymanager/main.py:596 +#: src/modules/displaymanager/main.py:598 msgid "Cannot write LightDM configuration file" msgstr "" -#: src/modules/displaymanager/main.py:597 +#: src/modules/displaymanager/main.py:599 msgid "LightDM config file {!s} does not exist" msgstr "" -#: src/modules/displaymanager/main.py:682 +#: src/modules/displaymanager/main.py:684 msgid "Cannot configure LightDM" msgstr "" -#: src/modules/displaymanager/main.py:683 +#: src/modules/displaymanager/main.py:685 msgid "No LightDM greeter installed." msgstr "" -#: src/modules/displaymanager/main.py:714 +#: src/modules/displaymanager/main.py:716 msgid "Cannot write SLIM configuration file" msgstr "" -#: src/modules/displaymanager/main.py:715 +#: src/modules/displaymanager/main.py:717 msgid "SLIM config file {!s} does not exist" msgstr "" -#: src/modules/displaymanager/main.py:933 +#: src/modules/displaymanager/main.py:935 msgid "No display managers selected for the displaymanager module." msgstr "" -#: src/modules/displaymanager/main.py:934 +#: src/modules/displaymanager/main.py:936 msgid "" "The displaymanagers list is empty or undefined in both globalstorage and " "displaymanager.conf." msgstr "" -#: src/modules/displaymanager/main.py:1021 +#: src/modules/displaymanager/main.py:1023 msgid "Display manager configuration was incomplete" msgstr "" @@ -108,8 +108,8 @@ msgid "Writing fstab." msgstr "" #: src/modules/fstab/main.py:377 src/modules/fstab/main.py:383 -#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:245 -#: src/modules/initcpiocfg/main.py:249 src/modules/initramfscfg/main.py:85 +#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:267 +#: src/modules/initcpiocfg/main.py:271 src/modules/initramfscfg/main.py:85 #: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:140 #: src/modules/mount/main.py:329 src/modules/networkcfg/main.py:105 #: src/modules/openrcdmcryptcfg/main.py:72 @@ -145,11 +145,11 @@ msgstr "" msgid "Configuring mkinitcpio." msgstr "" -#: src/modules/initcpiocfg/main.py:246 +#: src/modules/initcpiocfg/main.py:268 msgid "No partitions are defined for
initcpiocfg
." msgstr "" -#: src/modules/initcpiocfg/main.py:250 +#: src/modules/initcpiocfg/main.py:272 msgid "No root mount point for
initcpiocfg
." msgstr "" @@ -233,24 +233,24 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: src/modules/packages/main.py:725 src/modules/packages/main.py:737 -#: src/modules/packages/main.py:765 +#: src/modules/packages/main.py:740 src/modules/packages/main.py:752 +#: src/modules/packages/main.py:780 msgid "Package Manager error" msgstr "" -#: src/modules/packages/main.py:726 +#: src/modules/packages/main.py:741 msgid "" "The package manager could not prepare updates. The command
{!s}
" "returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:738 +#: src/modules/packages/main.py:753 msgid "" "The package manager could not update the system. The command
{!s}
" " returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:766 +#: src/modules/packages/main.py:781 msgid "" "The package manager could not make changes to the installed system. The " "command
{!s}
returned error code {!s}." diff --git a/lang/python/sq/LC_MESSAGES/python.po b/lang/python/sq/LC_MESSAGES/python.po index d62b21eeb..6785d3bd8 100644 --- a/lang/python/sq/LC_MESSAGES/python.po +++ b/lang/python/sq/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-24 23:38+0200\n" +"POT-Creation-Date: 2023-08-28 23:53+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Besnik Bleta , 2023\n" "Language-Team: Albanian (https://app.transifex.com/calamares/teams/20061/sq/)\n" @@ -25,16 +25,16 @@ msgstr "" msgid "Install bootloader." msgstr "Instalo ngarkues nisjesh." -#: src/modules/bootloader/main.py:640 +#: src/modules/bootloader/main.py:644 msgid "Failed to install grub, no partitions defined in global storage" msgstr "" "S'u arrit të instalohej grub, te depozita globale s’ka të përkufizuara pjesë" -#: src/modules/bootloader/main.py:895 +#: src/modules/bootloader/main.py:899 msgid "Bootloader installation error" msgstr "Gabim instalimi Ngarkuesi Nisësi" -#: src/modules/bootloader/main.py:896 +#: src/modules/bootloader/main.py:900 msgid "" "The bootloader could not be installed. The installation command " "
{!s}
returned error code {!s}." @@ -42,43 +42,43 @@ msgstr "" "Ngarkuesi i nisësit s’u instalua dot. Urdhri i instalimit
{!s}
u " "përgjigj me kod gabimi {!s}." -#: src/modules/displaymanager/main.py:507 +#: src/modules/displaymanager/main.py:509 msgid "Cannot write LXDM configuration file" msgstr "S’shkruhet dot kartelë formësimi LXDM" -#: src/modules/displaymanager/main.py:508 +#: src/modules/displaymanager/main.py:510 msgid "LXDM config file {!s} does not exist" msgstr "S’ekziston kartelë formësimi LXDM {!s}" -#: src/modules/displaymanager/main.py:596 +#: src/modules/displaymanager/main.py:598 msgid "Cannot write LightDM configuration file" msgstr "S’shkruhet dot kartelë formësimi LightDM" -#: src/modules/displaymanager/main.py:597 +#: src/modules/displaymanager/main.py:599 msgid "LightDM config file {!s} does not exist" msgstr "S’ekziston kartelë formësimi LightDM {!s}" -#: src/modules/displaymanager/main.py:682 +#: src/modules/displaymanager/main.py:684 msgid "Cannot configure LightDM" msgstr "S’formësohet dot LightDM" -#: src/modules/displaymanager/main.py:683 +#: src/modules/displaymanager/main.py:685 msgid "No LightDM greeter installed." msgstr "S’ka të instaluar përshëndetës LightDM." -#: src/modules/displaymanager/main.py:714 +#: src/modules/displaymanager/main.py:716 msgid "Cannot write SLIM configuration file" msgstr "S’shkruhet dot kartelë formësimi SLIM" -#: src/modules/displaymanager/main.py:715 +#: src/modules/displaymanager/main.py:717 msgid "SLIM config file {!s} does not exist" msgstr "S’ekziston kartelë formësimi SLIM {!s}" -#: src/modules/displaymanager/main.py:933 +#: src/modules/displaymanager/main.py:935 msgid "No display managers selected for the displaymanager module." msgstr "S’janë përzgjedhur përgjegjës ekrani për modulin displaymanager." -#: src/modules/displaymanager/main.py:934 +#: src/modules/displaymanager/main.py:936 msgid "" "The displaymanagers list is empty or undefined in both globalstorage and " "displaymanager.conf." @@ -86,7 +86,7 @@ msgstr "" "Lista “displaymanagers” është e zbrazët ose e papërkufizuar për të dy " "rastet, për “globalstorage” dhe për “displaymanager.conf”." -#: src/modules/displaymanager/main.py:1021 +#: src/modules/displaymanager/main.py:1023 msgid "Display manager configuration was incomplete" msgstr "Formësimi i përgjegjësit të ekranit s’qe i plotë" @@ -118,8 +118,8 @@ msgid "Writing fstab." msgstr "Po shkruhet fstab." #: src/modules/fstab/main.py:377 src/modules/fstab/main.py:383 -#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:245 -#: src/modules/initcpiocfg/main.py:249 src/modules/initramfscfg/main.py:85 +#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:267 +#: src/modules/initcpiocfg/main.py:271 src/modules/initramfscfg/main.py:85 #: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:140 #: src/modules/mount/main.py:329 src/modules/networkcfg/main.py:105 #: src/modules/openrcdmcryptcfg/main.py:72 @@ -157,11 +157,11 @@ msgstr "Po caktohet ora hardware." msgid "Configuring mkinitcpio." msgstr "Po formësohet mkinitcpio." -#: src/modules/initcpiocfg/main.py:246 +#: src/modules/initcpiocfg/main.py:268 msgid "No partitions are defined for
initcpiocfg
." msgstr "S’ka pjesë të përcaktuara për
initcpiocfg
." -#: src/modules/initcpiocfg/main.py:250 +#: src/modules/initcpiocfg/main.py:272 msgid "No root mount point for
initcpiocfg
." msgstr "S’ka pikë montimi rrënjë për
initcpiocfg
." @@ -241,12 +241,12 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "Po hiqet një paketë." msgstr[1] "Po hiqen %(num)d paketa." -#: src/modules/packages/main.py:725 src/modules/packages/main.py:737 -#: src/modules/packages/main.py:765 +#: src/modules/packages/main.py:740 src/modules/packages/main.py:752 +#: src/modules/packages/main.py:780 msgid "Package Manager error" msgstr "Gabim Përgjegjësi Paketash" -#: src/modules/packages/main.py:726 +#: src/modules/packages/main.py:741 msgid "" "The package manager could not prepare updates. The command
{!s}
" "returned error code {!s}." @@ -254,7 +254,7 @@ msgstr "" "Përgjegjësi i paketave s’përgatiti dot përditësime. Urdhri
{!s}
u" " përgjigj me kod gabimi {!s}." -#: src/modules/packages/main.py:738 +#: src/modules/packages/main.py:753 msgid "" "The package manager could not update the system. The command
{!s}
" " returned error code {!s}." @@ -262,7 +262,7 @@ msgstr "" "Përgjegjësi i paketave s’përditësoi dot sistemin. Urdhri
{!s}
u " "përgjigj me kod gabimi {!s}." -#: src/modules/packages/main.py:766 +#: src/modules/packages/main.py:781 msgid "" "The package manager could not make changes to the installed system. The " "command
{!s}
returned error code {!s}." diff --git a/lang/python/sr/LC_MESSAGES/python.po b/lang/python/sr/LC_MESSAGES/python.po index d293836fe..adc83a838 100644 --- a/lang/python/sr/LC_MESSAGES/python.po +++ b/lang/python/sr/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-24 23:38+0200\n" +"POT-Creation-Date: 2023-08-28 23:53+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Slobodan Simić , 2020\n" "Language-Team: Serbian (https://app.transifex.com/calamares/teams/20061/sr/)\n" @@ -25,63 +25,63 @@ msgstr "" msgid "Install bootloader." msgstr "" -#: src/modules/bootloader/main.py:640 +#: src/modules/bootloader/main.py:644 msgid "Failed to install grub, no partitions defined in global storage" msgstr "" -#: src/modules/bootloader/main.py:895 +#: src/modules/bootloader/main.py:899 msgid "Bootloader installation error" msgstr "" -#: src/modules/bootloader/main.py:896 +#: src/modules/bootloader/main.py:900 msgid "" "The bootloader could not be installed. The installation command " "
{!s}
returned error code {!s}." msgstr "" -#: src/modules/displaymanager/main.py:507 +#: src/modules/displaymanager/main.py:509 msgid "Cannot write LXDM configuration file" msgstr "" -#: src/modules/displaymanager/main.py:508 +#: src/modules/displaymanager/main.py:510 msgid "LXDM config file {!s} does not exist" msgstr "" -#: src/modules/displaymanager/main.py:596 +#: src/modules/displaymanager/main.py:598 msgid "Cannot write LightDM configuration file" msgstr "" -#: src/modules/displaymanager/main.py:597 +#: src/modules/displaymanager/main.py:599 msgid "LightDM config file {!s} does not exist" msgstr "" -#: src/modules/displaymanager/main.py:682 +#: src/modules/displaymanager/main.py:684 msgid "Cannot configure LightDM" msgstr "" -#: src/modules/displaymanager/main.py:683 +#: src/modules/displaymanager/main.py:685 msgid "No LightDM greeter installed." msgstr "" -#: src/modules/displaymanager/main.py:714 +#: src/modules/displaymanager/main.py:716 msgid "Cannot write SLIM configuration file" msgstr "" -#: src/modules/displaymanager/main.py:715 +#: src/modules/displaymanager/main.py:717 msgid "SLIM config file {!s} does not exist" msgstr "" -#: src/modules/displaymanager/main.py:933 +#: src/modules/displaymanager/main.py:935 msgid "No display managers selected for the displaymanager module." msgstr "" -#: src/modules/displaymanager/main.py:934 +#: src/modules/displaymanager/main.py:936 msgid "" "The displaymanagers list is empty or undefined in both globalstorage and " "displaymanager.conf." msgstr "" -#: src/modules/displaymanager/main.py:1021 +#: src/modules/displaymanager/main.py:1023 msgid "Display manager configuration was incomplete" msgstr "" @@ -112,8 +112,8 @@ msgid "Writing fstab." msgstr "Уписивање fstab." #: src/modules/fstab/main.py:377 src/modules/fstab/main.py:383 -#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:245 -#: src/modules/initcpiocfg/main.py:249 src/modules/initramfscfg/main.py:85 +#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:267 +#: src/modules/initcpiocfg/main.py:271 src/modules/initramfscfg/main.py:85 #: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:140 #: src/modules/mount/main.py:329 src/modules/networkcfg/main.py:105 #: src/modules/openrcdmcryptcfg/main.py:72 @@ -149,11 +149,11 @@ msgstr "" msgid "Configuring mkinitcpio." msgstr "" -#: src/modules/initcpiocfg/main.py:246 +#: src/modules/initcpiocfg/main.py:268 msgid "No partitions are defined for
initcpiocfg
." msgstr "" -#: src/modules/initcpiocfg/main.py:250 +#: src/modules/initcpiocfg/main.py:272 msgid "No root mount point for
initcpiocfg
." msgstr "" @@ -235,24 +235,24 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/modules/packages/main.py:725 src/modules/packages/main.py:737 -#: src/modules/packages/main.py:765 +#: src/modules/packages/main.py:740 src/modules/packages/main.py:752 +#: src/modules/packages/main.py:780 msgid "Package Manager error" msgstr "" -#: src/modules/packages/main.py:726 +#: src/modules/packages/main.py:741 msgid "" "The package manager could not prepare updates. The command
{!s}
" "returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:738 +#: src/modules/packages/main.py:753 msgid "" "The package manager could not update the system. The command
{!s}
" " returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:766 +#: src/modules/packages/main.py:781 msgid "" "The package manager could not make changes to the installed system. The " "command
{!s}
returned error code {!s}." diff --git a/lang/python/sr@latin/LC_MESSAGES/python.po b/lang/python/sr@latin/LC_MESSAGES/python.po index 68bdce7fa..3f0c69ba4 100644 --- a/lang/python/sr@latin/LC_MESSAGES/python.po +++ b/lang/python/sr@latin/LC_MESSAGES/python.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-24 23:38+0200\n" +"POT-Creation-Date: 2023-08-28 23:53+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Serbian (Latin) (https://app.transifex.com/calamares/teams/20061/sr@latin/)\n" "MIME-Version: 1.0\n" @@ -21,63 +21,63 @@ msgstr "" msgid "Install bootloader." msgstr "" -#: src/modules/bootloader/main.py:640 +#: src/modules/bootloader/main.py:644 msgid "Failed to install grub, no partitions defined in global storage" msgstr "" -#: src/modules/bootloader/main.py:895 +#: src/modules/bootloader/main.py:899 msgid "Bootloader installation error" msgstr "" -#: src/modules/bootloader/main.py:896 +#: src/modules/bootloader/main.py:900 msgid "" "The bootloader could not be installed. The installation command " "
{!s}
returned error code {!s}." msgstr "" -#: src/modules/displaymanager/main.py:507 +#: src/modules/displaymanager/main.py:509 msgid "Cannot write LXDM configuration file" msgstr "" -#: src/modules/displaymanager/main.py:508 +#: src/modules/displaymanager/main.py:510 msgid "LXDM config file {!s} does not exist" msgstr "" -#: src/modules/displaymanager/main.py:596 +#: src/modules/displaymanager/main.py:598 msgid "Cannot write LightDM configuration file" msgstr "" -#: src/modules/displaymanager/main.py:597 +#: src/modules/displaymanager/main.py:599 msgid "LightDM config file {!s} does not exist" msgstr "" -#: src/modules/displaymanager/main.py:682 +#: src/modules/displaymanager/main.py:684 msgid "Cannot configure LightDM" msgstr "" -#: src/modules/displaymanager/main.py:683 +#: src/modules/displaymanager/main.py:685 msgid "No LightDM greeter installed." msgstr "" -#: src/modules/displaymanager/main.py:714 +#: src/modules/displaymanager/main.py:716 msgid "Cannot write SLIM configuration file" msgstr "" -#: src/modules/displaymanager/main.py:715 +#: src/modules/displaymanager/main.py:717 msgid "SLIM config file {!s} does not exist" msgstr "" -#: src/modules/displaymanager/main.py:933 +#: src/modules/displaymanager/main.py:935 msgid "No display managers selected for the displaymanager module." msgstr "" -#: src/modules/displaymanager/main.py:934 +#: src/modules/displaymanager/main.py:936 msgid "" "The displaymanagers list is empty or undefined in both globalstorage and " "displaymanager.conf." msgstr "" -#: src/modules/displaymanager/main.py:1021 +#: src/modules/displaymanager/main.py:1023 msgid "Display manager configuration was incomplete" msgstr "" @@ -108,8 +108,8 @@ msgid "Writing fstab." msgstr "" #: src/modules/fstab/main.py:377 src/modules/fstab/main.py:383 -#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:245 -#: src/modules/initcpiocfg/main.py:249 src/modules/initramfscfg/main.py:85 +#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:267 +#: src/modules/initcpiocfg/main.py:271 src/modules/initramfscfg/main.py:85 #: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:140 #: src/modules/mount/main.py:329 src/modules/networkcfg/main.py:105 #: src/modules/openrcdmcryptcfg/main.py:72 @@ -145,11 +145,11 @@ msgstr "" msgid "Configuring mkinitcpio." msgstr "" -#: src/modules/initcpiocfg/main.py:246 +#: src/modules/initcpiocfg/main.py:268 msgid "No partitions are defined for
initcpiocfg
." msgstr "" -#: src/modules/initcpiocfg/main.py:250 +#: src/modules/initcpiocfg/main.py:272 msgid "No root mount point for
initcpiocfg
." msgstr "" @@ -231,24 +231,24 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/modules/packages/main.py:725 src/modules/packages/main.py:737 -#: src/modules/packages/main.py:765 +#: src/modules/packages/main.py:740 src/modules/packages/main.py:752 +#: src/modules/packages/main.py:780 msgid "Package Manager error" msgstr "" -#: src/modules/packages/main.py:726 +#: src/modules/packages/main.py:741 msgid "" "The package manager could not prepare updates. The command
{!s}
" "returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:738 +#: src/modules/packages/main.py:753 msgid "" "The package manager could not update the system. The command
{!s}
" " returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:766 +#: src/modules/packages/main.py:781 msgid "" "The package manager could not make changes to the installed system. The " "command
{!s}
returned error code {!s}." diff --git a/lang/python/sv/LC_MESSAGES/python.po b/lang/python/sv/LC_MESSAGES/python.po index 50483aa7b..7cd03528a 100644 --- a/lang/python/sv/LC_MESSAGES/python.po +++ b/lang/python/sv/LC_MESSAGES/python.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-24 23:38+0200\n" +"POT-Creation-Date: 2023-08-28 23:53+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Luna Jernberg , 2023\n" "Language-Team: Swedish (https://app.transifex.com/calamares/teams/20061/sv/)\n" @@ -27,17 +27,17 @@ msgstr "" msgid "Install bootloader." msgstr "Installera starthanterare." -#: src/modules/bootloader/main.py:640 +#: src/modules/bootloader/main.py:644 msgid "Failed to install grub, no partitions defined in global storage" msgstr "" "Det gick inte att installera grub, inga partitioner definierade i global " "lagring" -#: src/modules/bootloader/main.py:895 +#: src/modules/bootloader/main.py:899 msgid "Bootloader installation error" msgstr "Starthanterare installationsfel" -#: src/modules/bootloader/main.py:896 +#: src/modules/bootloader/main.py:900 msgid "" "The bootloader could not be installed. The installation command " "
{!s}
returned error code {!s}." @@ -45,43 +45,43 @@ msgstr "" "Starthanterare kunde inte installeras. Installationskommandot " "
{!s}
returnerade felkod {!s}." -#: src/modules/displaymanager/main.py:507 +#: src/modules/displaymanager/main.py:509 msgid "Cannot write LXDM configuration file" msgstr "Misslyckades med att skriva LXDM konfigurationsfil" -#: src/modules/displaymanager/main.py:508 +#: src/modules/displaymanager/main.py:510 msgid "LXDM config file {!s} does not exist" msgstr "LXDM konfigurationsfil {!s} existerar inte" -#: src/modules/displaymanager/main.py:596 +#: src/modules/displaymanager/main.py:598 msgid "Cannot write LightDM configuration file" msgstr "Misslyckades med att skriva LightDM konfigurationsfil" -#: src/modules/displaymanager/main.py:597 +#: src/modules/displaymanager/main.py:599 msgid "LightDM config file {!s} does not exist" msgstr "LightDM konfigurationsfil {!s} existerar inte" -#: src/modules/displaymanager/main.py:682 +#: src/modules/displaymanager/main.py:684 msgid "Cannot configure LightDM" msgstr "Kunde inte konfigurera LightDM" -#: src/modules/displaymanager/main.py:683 +#: src/modules/displaymanager/main.py:685 msgid "No LightDM greeter installed." msgstr "Ingen LightDM greeter installerad." -#: src/modules/displaymanager/main.py:714 +#: src/modules/displaymanager/main.py:716 msgid "Cannot write SLIM configuration file" msgstr "Misslyckades med att SLIM konfigurationsfil" -#: src/modules/displaymanager/main.py:715 +#: src/modules/displaymanager/main.py:717 msgid "SLIM config file {!s} does not exist" msgstr "SLIM konfigurationsfil {!s} existerar inte" -#: src/modules/displaymanager/main.py:933 +#: src/modules/displaymanager/main.py:935 msgid "No display managers selected for the displaymanager module." msgstr "Ingen skärmhanterare vald för displaymanager modulen." -#: src/modules/displaymanager/main.py:934 +#: src/modules/displaymanager/main.py:936 msgid "" "The displaymanagers list is empty or undefined in both globalstorage and " "displaymanager.conf." @@ -89,7 +89,7 @@ msgstr "" "Skärmhanterar listan är tom eller odefinierad i både globalstorage och " "displaymanager.conf." -#: src/modules/displaymanager/main.py:1021 +#: src/modules/displaymanager/main.py:1023 msgid "Display manager configuration was incomplete" msgstr "Konfiguration för displayhanteraren var inkomplett" @@ -120,8 +120,8 @@ msgid "Writing fstab." msgstr "Skriver fstab." #: src/modules/fstab/main.py:377 src/modules/fstab/main.py:383 -#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:245 -#: src/modules/initcpiocfg/main.py:249 src/modules/initramfscfg/main.py:85 +#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:267 +#: src/modules/initcpiocfg/main.py:271 src/modules/initramfscfg/main.py:85 #: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:140 #: src/modules/mount/main.py:329 src/modules/networkcfg/main.py:105 #: src/modules/openrcdmcryptcfg/main.py:72 @@ -160,11 +160,11 @@ msgstr "Ställer hårdvaruklockan." msgid "Configuring mkinitcpio." msgstr "Konfigurerar mkinitcpio." -#: src/modules/initcpiocfg/main.py:246 +#: src/modules/initcpiocfg/main.py:268 msgid "No partitions are defined for
initcpiocfg
." msgstr "Inga partitioner är definerade för
initcpiocfg
" -#: src/modules/initcpiocfg/main.py:250 +#: src/modules/initcpiocfg/main.py:272 msgid "No root mount point for
initcpiocfg
." msgstr "Ingen root monteringspunkt för
initcpiocfg
" @@ -244,12 +244,12 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "Tar bort ett paket." msgstr[1] "Tar bort %(num)d paket." -#: src/modules/packages/main.py:725 src/modules/packages/main.py:737 -#: src/modules/packages/main.py:765 +#: src/modules/packages/main.py:740 src/modules/packages/main.py:752 +#: src/modules/packages/main.py:780 msgid "Package Manager error" msgstr "Pakethanterare fel" -#: src/modules/packages/main.py:726 +#: src/modules/packages/main.py:741 msgid "" "The package manager could not prepare updates. The command
{!s}
" "returned error code {!s}." @@ -257,7 +257,7 @@ msgstr "" "Pakethanteraren kunde inte förbereda uppdateringar kommandot
{!s}
" " returnerade felkod {!s}." -#: src/modules/packages/main.py:738 +#: src/modules/packages/main.py:753 msgid "" "The package manager could not update the system. The command
{!s}
" " returned error code {!s}." @@ -265,7 +265,7 @@ msgstr "" "Pakethanteraren kunde inte uppdatera systemet. kommandot
{!s}
" "returnerade felkod {!s}." -#: src/modules/packages/main.py:766 +#: src/modules/packages/main.py:781 msgid "" "The package manager could not make changes to the installed system. The " "command
{!s}
returned error code {!s}." diff --git a/lang/python/ta_IN/LC_MESSAGES/python.po b/lang/python/ta_IN/LC_MESSAGES/python.po index 8703fff46..c443a6fb4 100644 --- a/lang/python/ta_IN/LC_MESSAGES/python.po +++ b/lang/python/ta_IN/LC_MESSAGES/python.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-24 23:38+0200\n" +"POT-Creation-Date: 2023-08-28 23:53+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Tamil (India) (https://app.transifex.com/calamares/teams/20061/ta_IN/)\n" "MIME-Version: 1.0\n" @@ -21,63 +21,63 @@ msgstr "" msgid "Install bootloader." msgstr "" -#: src/modules/bootloader/main.py:640 +#: src/modules/bootloader/main.py:644 msgid "Failed to install grub, no partitions defined in global storage" msgstr "" -#: src/modules/bootloader/main.py:895 +#: src/modules/bootloader/main.py:899 msgid "Bootloader installation error" msgstr "" -#: src/modules/bootloader/main.py:896 +#: src/modules/bootloader/main.py:900 msgid "" "The bootloader could not be installed. The installation command " "
{!s}
returned error code {!s}." msgstr "" -#: src/modules/displaymanager/main.py:507 +#: src/modules/displaymanager/main.py:509 msgid "Cannot write LXDM configuration file" msgstr "" -#: src/modules/displaymanager/main.py:508 +#: src/modules/displaymanager/main.py:510 msgid "LXDM config file {!s} does not exist" msgstr "" -#: src/modules/displaymanager/main.py:596 +#: src/modules/displaymanager/main.py:598 msgid "Cannot write LightDM configuration file" msgstr "" -#: src/modules/displaymanager/main.py:597 +#: src/modules/displaymanager/main.py:599 msgid "LightDM config file {!s} does not exist" msgstr "" -#: src/modules/displaymanager/main.py:682 +#: src/modules/displaymanager/main.py:684 msgid "Cannot configure LightDM" msgstr "" -#: src/modules/displaymanager/main.py:683 +#: src/modules/displaymanager/main.py:685 msgid "No LightDM greeter installed." msgstr "" -#: src/modules/displaymanager/main.py:714 +#: src/modules/displaymanager/main.py:716 msgid "Cannot write SLIM configuration file" msgstr "" -#: src/modules/displaymanager/main.py:715 +#: src/modules/displaymanager/main.py:717 msgid "SLIM config file {!s} does not exist" msgstr "" -#: src/modules/displaymanager/main.py:933 +#: src/modules/displaymanager/main.py:935 msgid "No display managers selected for the displaymanager module." msgstr "" -#: src/modules/displaymanager/main.py:934 +#: src/modules/displaymanager/main.py:936 msgid "" "The displaymanagers list is empty or undefined in both globalstorage and " "displaymanager.conf." msgstr "" -#: src/modules/displaymanager/main.py:1021 +#: src/modules/displaymanager/main.py:1023 msgid "Display manager configuration was incomplete" msgstr "" @@ -108,8 +108,8 @@ msgid "Writing fstab." msgstr "" #: src/modules/fstab/main.py:377 src/modules/fstab/main.py:383 -#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:245 -#: src/modules/initcpiocfg/main.py:249 src/modules/initramfscfg/main.py:85 +#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:267 +#: src/modules/initcpiocfg/main.py:271 src/modules/initramfscfg/main.py:85 #: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:140 #: src/modules/mount/main.py:329 src/modules/networkcfg/main.py:105 #: src/modules/openrcdmcryptcfg/main.py:72 @@ -145,11 +145,11 @@ msgstr "" msgid "Configuring mkinitcpio." msgstr "" -#: src/modules/initcpiocfg/main.py:246 +#: src/modules/initcpiocfg/main.py:268 msgid "No partitions are defined for
initcpiocfg
." msgstr "" -#: src/modules/initcpiocfg/main.py:250 +#: src/modules/initcpiocfg/main.py:272 msgid "No root mount point for
initcpiocfg
." msgstr "" @@ -229,24 +229,24 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "" msgstr[1] "" -#: src/modules/packages/main.py:725 src/modules/packages/main.py:737 -#: src/modules/packages/main.py:765 +#: src/modules/packages/main.py:740 src/modules/packages/main.py:752 +#: src/modules/packages/main.py:780 msgid "Package Manager error" msgstr "" -#: src/modules/packages/main.py:726 +#: src/modules/packages/main.py:741 msgid "" "The package manager could not prepare updates. The command
{!s}
" "returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:738 +#: src/modules/packages/main.py:753 msgid "" "The package manager could not update the system. The command
{!s}
" " returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:766 +#: src/modules/packages/main.py:781 msgid "" "The package manager could not make changes to the installed system. The " "command
{!s}
returned error code {!s}." diff --git a/lang/python/te/LC_MESSAGES/python.po b/lang/python/te/LC_MESSAGES/python.po index 4e04bd4ed..ccee12b2b 100644 --- a/lang/python/te/LC_MESSAGES/python.po +++ b/lang/python/te/LC_MESSAGES/python.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-24 23:38+0200\n" +"POT-Creation-Date: 2023-08-28 23:53+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Telugu (https://app.transifex.com/calamares/teams/20061/te/)\n" "MIME-Version: 1.0\n" @@ -21,63 +21,63 @@ msgstr "" msgid "Install bootloader." msgstr "" -#: src/modules/bootloader/main.py:640 +#: src/modules/bootloader/main.py:644 msgid "Failed to install grub, no partitions defined in global storage" msgstr "" -#: src/modules/bootloader/main.py:895 +#: src/modules/bootloader/main.py:899 msgid "Bootloader installation error" msgstr "" -#: src/modules/bootloader/main.py:896 +#: src/modules/bootloader/main.py:900 msgid "" "The bootloader could not be installed. The installation command " "
{!s}
returned error code {!s}." msgstr "" -#: src/modules/displaymanager/main.py:507 +#: src/modules/displaymanager/main.py:509 msgid "Cannot write LXDM configuration file" msgstr "" -#: src/modules/displaymanager/main.py:508 +#: src/modules/displaymanager/main.py:510 msgid "LXDM config file {!s} does not exist" msgstr "" -#: src/modules/displaymanager/main.py:596 +#: src/modules/displaymanager/main.py:598 msgid "Cannot write LightDM configuration file" msgstr "" -#: src/modules/displaymanager/main.py:597 +#: src/modules/displaymanager/main.py:599 msgid "LightDM config file {!s} does not exist" msgstr "" -#: src/modules/displaymanager/main.py:682 +#: src/modules/displaymanager/main.py:684 msgid "Cannot configure LightDM" msgstr "" -#: src/modules/displaymanager/main.py:683 +#: src/modules/displaymanager/main.py:685 msgid "No LightDM greeter installed." msgstr "" -#: src/modules/displaymanager/main.py:714 +#: src/modules/displaymanager/main.py:716 msgid "Cannot write SLIM configuration file" msgstr "" -#: src/modules/displaymanager/main.py:715 +#: src/modules/displaymanager/main.py:717 msgid "SLIM config file {!s} does not exist" msgstr "" -#: src/modules/displaymanager/main.py:933 +#: src/modules/displaymanager/main.py:935 msgid "No display managers selected for the displaymanager module." msgstr "" -#: src/modules/displaymanager/main.py:934 +#: src/modules/displaymanager/main.py:936 msgid "" "The displaymanagers list is empty or undefined in both globalstorage and " "displaymanager.conf." msgstr "" -#: src/modules/displaymanager/main.py:1021 +#: src/modules/displaymanager/main.py:1023 msgid "Display manager configuration was incomplete" msgstr "" @@ -108,8 +108,8 @@ msgid "Writing fstab." msgstr "" #: src/modules/fstab/main.py:377 src/modules/fstab/main.py:383 -#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:245 -#: src/modules/initcpiocfg/main.py:249 src/modules/initramfscfg/main.py:85 +#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:267 +#: src/modules/initcpiocfg/main.py:271 src/modules/initramfscfg/main.py:85 #: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:140 #: src/modules/mount/main.py:329 src/modules/networkcfg/main.py:105 #: src/modules/openrcdmcryptcfg/main.py:72 @@ -145,11 +145,11 @@ msgstr "" msgid "Configuring mkinitcpio." msgstr "" -#: src/modules/initcpiocfg/main.py:246 +#: src/modules/initcpiocfg/main.py:268 msgid "No partitions are defined for
initcpiocfg
." msgstr "" -#: src/modules/initcpiocfg/main.py:250 +#: src/modules/initcpiocfg/main.py:272 msgid "No root mount point for
initcpiocfg
." msgstr "" @@ -229,24 +229,24 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "" msgstr[1] "" -#: src/modules/packages/main.py:725 src/modules/packages/main.py:737 -#: src/modules/packages/main.py:765 +#: src/modules/packages/main.py:740 src/modules/packages/main.py:752 +#: src/modules/packages/main.py:780 msgid "Package Manager error" msgstr "" -#: src/modules/packages/main.py:726 +#: src/modules/packages/main.py:741 msgid "" "The package manager could not prepare updates. The command
{!s}
" "returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:738 +#: src/modules/packages/main.py:753 msgid "" "The package manager could not update the system. The command
{!s}
" " returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:766 +#: src/modules/packages/main.py:781 msgid "" "The package manager could not make changes to the installed system. The " "command
{!s}
returned error code {!s}." diff --git a/lang/python/tg/LC_MESSAGES/python.po b/lang/python/tg/LC_MESSAGES/python.po index e269262db..c24175e16 100644 --- a/lang/python/tg/LC_MESSAGES/python.po +++ b/lang/python/tg/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-24 23:38+0200\n" +"POT-Creation-Date: 2023-08-28 23:53+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Victor Ibragimov , 2020\n" "Language-Team: Tajik (https://app.transifex.com/calamares/teams/20061/tg/)\n" @@ -25,57 +25,57 @@ msgstr "" msgid "Install bootloader." msgstr "Насбкунии боркунандаи роҳандозӣ." -#: src/modules/bootloader/main.py:640 +#: src/modules/bootloader/main.py:644 msgid "Failed to install grub, no partitions defined in global storage" msgstr "" -#: src/modules/bootloader/main.py:895 +#: src/modules/bootloader/main.py:899 msgid "Bootloader installation error" msgstr "" -#: src/modules/bootloader/main.py:896 +#: src/modules/bootloader/main.py:900 msgid "" "The bootloader could not be installed. The installation command " "
{!s}
returned error code {!s}." msgstr "" -#: src/modules/displaymanager/main.py:507 +#: src/modules/displaymanager/main.py:509 msgid "Cannot write LXDM configuration file" msgstr "Файли танзимии LXDM сабт карда намешавад" -#: src/modules/displaymanager/main.py:508 +#: src/modules/displaymanager/main.py:510 msgid "LXDM config file {!s} does not exist" msgstr "Файли танзимии LXDM {!s} вуҷуд надорад" -#: src/modules/displaymanager/main.py:596 +#: src/modules/displaymanager/main.py:598 msgid "Cannot write LightDM configuration file" msgstr "Файли танзимии LightDM сабт карда намешавад" -#: src/modules/displaymanager/main.py:597 +#: src/modules/displaymanager/main.py:599 msgid "LightDM config file {!s} does not exist" msgstr "Файли танзимии LightDM {!s} вуҷуд надорад" -#: src/modules/displaymanager/main.py:682 +#: src/modules/displaymanager/main.py:684 msgid "Cannot configure LightDM" msgstr "LightDM танзим карда намешавад" -#: src/modules/displaymanager/main.py:683 +#: src/modules/displaymanager/main.py:685 msgid "No LightDM greeter installed." msgstr "Хушомади LightDM насб нашудааст." -#: src/modules/displaymanager/main.py:714 +#: src/modules/displaymanager/main.py:716 msgid "Cannot write SLIM configuration file" msgstr "Файли танзимии SLIM сабт карда намешавад" -#: src/modules/displaymanager/main.py:715 +#: src/modules/displaymanager/main.py:717 msgid "SLIM config file {!s} does not exist" msgstr "Файли танзимии SLIM {!s} вуҷуд надорад" -#: src/modules/displaymanager/main.py:933 +#: src/modules/displaymanager/main.py:935 msgid "No display managers selected for the displaymanager module." msgstr "Ягон мудири намоиш барои модули displaymanager интихоб нашудааст." -#: src/modules/displaymanager/main.py:934 +#: src/modules/displaymanager/main.py:936 msgid "" "The displaymanagers list is empty or undefined in both globalstorage and " "displaymanager.conf." @@ -83,7 +83,7 @@ msgstr "" "Рӯйхати displaymanagers ҳам дар globalstorage ва ҳам дар displaymanager.conf" " холӣ ё номаълум аст." -#: src/modules/displaymanager/main.py:1021 +#: src/modules/displaymanager/main.py:1023 msgid "Display manager configuration was incomplete" msgstr "Раванди танзимкунии мудири намоиш ба анҷом нарасид" @@ -114,8 +114,8 @@ msgid "Writing fstab." msgstr "Сабткунии fstab." #: src/modules/fstab/main.py:377 src/modules/fstab/main.py:383 -#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:245 -#: src/modules/initcpiocfg/main.py:249 src/modules/initramfscfg/main.py:85 +#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:267 +#: src/modules/initcpiocfg/main.py:271 src/modules/initramfscfg/main.py:85 #: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:140 #: src/modules/mount/main.py:329 src/modules/networkcfg/main.py:105 #: src/modules/openrcdmcryptcfg/main.py:72 @@ -151,11 +151,11 @@ msgstr "Танзимкунии соати сахтафзор." msgid "Configuring mkinitcpio." msgstr "Танзимкунии mkinitcpio." -#: src/modules/initcpiocfg/main.py:246 +#: src/modules/initcpiocfg/main.py:268 msgid "No partitions are defined for
initcpiocfg
." msgstr "" -#: src/modules/initcpiocfg/main.py:250 +#: src/modules/initcpiocfg/main.py:272 msgid "No root mount point for
initcpiocfg
." msgstr "" @@ -235,24 +235,24 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "Тозакунии як баста" msgstr[1] "Тозакунии %(num)d баста." -#: src/modules/packages/main.py:725 src/modules/packages/main.py:737 -#: src/modules/packages/main.py:765 +#: src/modules/packages/main.py:740 src/modules/packages/main.py:752 +#: src/modules/packages/main.py:780 msgid "Package Manager error" msgstr "" -#: src/modules/packages/main.py:726 +#: src/modules/packages/main.py:741 msgid "" "The package manager could not prepare updates. The command
{!s}
" "returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:738 +#: src/modules/packages/main.py:753 msgid "" "The package manager could not update the system. The command
{!s}
" " returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:766 +#: src/modules/packages/main.py:781 msgid "" "The package manager could not make changes to the installed system. The " "command
{!s}
returned error code {!s}." diff --git a/lang/python/th/LC_MESSAGES/python.po b/lang/python/th/LC_MESSAGES/python.po index 154adf605..cf43155c3 100644 --- a/lang/python/th/LC_MESSAGES/python.po +++ b/lang/python/th/LC_MESSAGES/python.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-24 23:38+0200\n" +"POT-Creation-Date: 2023-08-28 23:53+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Thai (https://app.transifex.com/calamares/teams/20061/th/)\n" "MIME-Version: 1.0\n" @@ -21,63 +21,63 @@ msgstr "" msgid "Install bootloader." msgstr "" -#: src/modules/bootloader/main.py:640 +#: src/modules/bootloader/main.py:644 msgid "Failed to install grub, no partitions defined in global storage" msgstr "" -#: src/modules/bootloader/main.py:895 +#: src/modules/bootloader/main.py:899 msgid "Bootloader installation error" msgstr "" -#: src/modules/bootloader/main.py:896 +#: src/modules/bootloader/main.py:900 msgid "" "The bootloader could not be installed. The installation command " "
{!s}
returned error code {!s}." msgstr "" -#: src/modules/displaymanager/main.py:507 +#: src/modules/displaymanager/main.py:509 msgid "Cannot write LXDM configuration file" msgstr "" -#: src/modules/displaymanager/main.py:508 +#: src/modules/displaymanager/main.py:510 msgid "LXDM config file {!s} does not exist" msgstr "" -#: src/modules/displaymanager/main.py:596 +#: src/modules/displaymanager/main.py:598 msgid "Cannot write LightDM configuration file" msgstr "" -#: src/modules/displaymanager/main.py:597 +#: src/modules/displaymanager/main.py:599 msgid "LightDM config file {!s} does not exist" msgstr "" -#: src/modules/displaymanager/main.py:682 +#: src/modules/displaymanager/main.py:684 msgid "Cannot configure LightDM" msgstr "" -#: src/modules/displaymanager/main.py:683 +#: src/modules/displaymanager/main.py:685 msgid "No LightDM greeter installed." msgstr "" -#: src/modules/displaymanager/main.py:714 +#: src/modules/displaymanager/main.py:716 msgid "Cannot write SLIM configuration file" msgstr "" -#: src/modules/displaymanager/main.py:715 +#: src/modules/displaymanager/main.py:717 msgid "SLIM config file {!s} does not exist" msgstr "" -#: src/modules/displaymanager/main.py:933 +#: src/modules/displaymanager/main.py:935 msgid "No display managers selected for the displaymanager module." msgstr "" -#: src/modules/displaymanager/main.py:934 +#: src/modules/displaymanager/main.py:936 msgid "" "The displaymanagers list is empty or undefined in both globalstorage and " "displaymanager.conf." msgstr "" -#: src/modules/displaymanager/main.py:1021 +#: src/modules/displaymanager/main.py:1023 msgid "Display manager configuration was incomplete" msgstr "" @@ -108,8 +108,8 @@ msgid "Writing fstab." msgstr "" #: src/modules/fstab/main.py:377 src/modules/fstab/main.py:383 -#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:245 -#: src/modules/initcpiocfg/main.py:249 src/modules/initramfscfg/main.py:85 +#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:267 +#: src/modules/initcpiocfg/main.py:271 src/modules/initramfscfg/main.py:85 #: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:140 #: src/modules/mount/main.py:329 src/modules/networkcfg/main.py:105 #: src/modules/openrcdmcryptcfg/main.py:72 @@ -145,11 +145,11 @@ msgstr "" msgid "Configuring mkinitcpio." msgstr "" -#: src/modules/initcpiocfg/main.py:246 +#: src/modules/initcpiocfg/main.py:268 msgid "No partitions are defined for
initcpiocfg
." msgstr "" -#: src/modules/initcpiocfg/main.py:250 +#: src/modules/initcpiocfg/main.py:272 msgid "No root mount point for
initcpiocfg
." msgstr "" @@ -227,24 +227,24 @@ msgid "Removing one package." msgid_plural "Removing %(num)d packages." msgstr[0] "" -#: src/modules/packages/main.py:725 src/modules/packages/main.py:737 -#: src/modules/packages/main.py:765 +#: src/modules/packages/main.py:740 src/modules/packages/main.py:752 +#: src/modules/packages/main.py:780 msgid "Package Manager error" msgstr "" -#: src/modules/packages/main.py:726 +#: src/modules/packages/main.py:741 msgid "" "The package manager could not prepare updates. The command
{!s}
" "returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:738 +#: src/modules/packages/main.py:753 msgid "" "The package manager could not update the system. The command
{!s}
" " returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:766 +#: src/modules/packages/main.py:781 msgid "" "The package manager could not make changes to the installed system. The " "command
{!s}
returned error code {!s}." diff --git a/lang/python/tr_TR/LC_MESSAGES/python.po b/lang/python/tr_TR/LC_MESSAGES/python.po index f2f6a21e7..b54354c10 100644 --- a/lang/python/tr_TR/LC_MESSAGES/python.po +++ b/lang/python/tr_TR/LC_MESSAGES/python.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-24 23:38+0200\n" +"POT-Creation-Date: 2023-08-28 23:53+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Demiray Muhterem , 2023\n" "Language-Team: Turkish (Turkey) (https://app.transifex.com/calamares/teams/20061/tr_TR/)\n" @@ -26,15 +26,15 @@ msgstr "" msgid "Install bootloader." msgstr "Önyükleyici kuruluyor" -#: src/modules/bootloader/main.py:640 +#: src/modules/bootloader/main.py:644 msgid "Failed to install grub, no partitions defined in global storage" msgstr "Grub yüklenemedi, genel depolamada tanımlı bölüm yok" -#: src/modules/bootloader/main.py:895 +#: src/modules/bootloader/main.py:899 msgid "Bootloader installation error" msgstr "Önyükleyici yükleme hatası" -#: src/modules/bootloader/main.py:896 +#: src/modules/bootloader/main.py:900 msgid "" "The bootloader could not be installed. The installation command " "
{!s}
returned error code {!s}." @@ -42,43 +42,43 @@ msgstr "" "Önyükleyici yüklenemedi. Kurulum komutu
{!s}
, {!s} hata kodunu " "döndürdü." -#: src/modules/displaymanager/main.py:507 +#: src/modules/displaymanager/main.py:509 msgid "Cannot write LXDM configuration file" msgstr "LXDM yapılandırma dosyası yazılamıyor" -#: src/modules/displaymanager/main.py:508 +#: src/modules/displaymanager/main.py:510 msgid "LXDM config file {!s} does not exist" msgstr "LXDM yapılandırma dosyası {!s} mevcut değil" -#: src/modules/displaymanager/main.py:596 +#: src/modules/displaymanager/main.py:598 msgid "Cannot write LightDM configuration file" msgstr "LightDM yapılandırma dosyası yazılamıyor" -#: src/modules/displaymanager/main.py:597 +#: src/modules/displaymanager/main.py:599 msgid "LightDM config file {!s} does not exist" msgstr "LightDM yapılandırma dosyası {!s} mevcut değil" -#: src/modules/displaymanager/main.py:682 +#: src/modules/displaymanager/main.py:684 msgid "Cannot configure LightDM" msgstr "LightDM yapılandırılamıyor" -#: src/modules/displaymanager/main.py:683 +#: src/modules/displaymanager/main.py:685 msgid "No LightDM greeter installed." msgstr "LightDM karşılama yüklü değil." -#: src/modules/displaymanager/main.py:714 +#: src/modules/displaymanager/main.py:716 msgid "Cannot write SLIM configuration file" msgstr "SLIM yapılandırma dosyası yazılamıyor" -#: src/modules/displaymanager/main.py:715 +#: src/modules/displaymanager/main.py:717 msgid "SLIM config file {!s} does not exist" msgstr "SLIM yapılandırma dosyası {!s} mevcut değil" -#: src/modules/displaymanager/main.py:933 +#: src/modules/displaymanager/main.py:935 msgid "No display managers selected for the displaymanager module." msgstr "Ekran yöneticisi modülü için ekran yöneticisi seçilmedi." -#: src/modules/displaymanager/main.py:934 +#: src/modules/displaymanager/main.py:936 msgid "" "The displaymanagers list is empty or undefined in both globalstorage and " "displaymanager.conf." @@ -86,7 +86,7 @@ msgstr "" "Displaymanagers listesi hem globalstorage hem de displaymanager.conf'ta boş " "veya tanımsız." -#: src/modules/displaymanager/main.py:1021 +#: src/modules/displaymanager/main.py:1023 msgid "Display manager configuration was incomplete" msgstr "Ekran yöneticisi yapılandırma işi tamamlanamadı" @@ -117,8 +117,8 @@ msgid "Writing fstab." msgstr "Fstab dosyasına yazılıyor." #: src/modules/fstab/main.py:377 src/modules/fstab/main.py:383 -#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:245 -#: src/modules/initcpiocfg/main.py:249 src/modules/initramfscfg/main.py:85 +#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:267 +#: src/modules/initcpiocfg/main.py:271 src/modules/initramfscfg/main.py:85 #: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:140 #: src/modules/mount/main.py:329 src/modules/networkcfg/main.py:105 #: src/modules/openrcdmcryptcfg/main.py:72 @@ -156,11 +156,11 @@ msgstr "Donanım saati ayarlanıyor." msgid "Configuring mkinitcpio." msgstr "Mkinitcpio yapılandırılıyor." -#: src/modules/initcpiocfg/main.py:246 +#: src/modules/initcpiocfg/main.py:268 msgid "No partitions are defined for
initcpiocfg
." msgstr "
initcpiocfg
için herhangi bir bölüm tanımlanmadı." -#: src/modules/initcpiocfg/main.py:250 +#: src/modules/initcpiocfg/main.py:272 msgid "No root mount point for
initcpiocfg
." msgstr "
initcpiocfg
için kök bağlama noktası yok." @@ -240,12 +240,12 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "%(num)d paket kaldırılıyor." msgstr[1] "%(num)d paket kaldırılıyor." -#: src/modules/packages/main.py:725 src/modules/packages/main.py:737 -#: src/modules/packages/main.py:765 +#: src/modules/packages/main.py:740 src/modules/packages/main.py:752 +#: src/modules/packages/main.py:780 msgid "Package Manager error" msgstr "Paket Yöneticisi hatası" -#: src/modules/packages/main.py:726 +#: src/modules/packages/main.py:741 msgid "" "The package manager could not prepare updates. The command
{!s}
" "returned error code {!s}." @@ -253,7 +253,7 @@ msgstr "" "Paket yöneticisi güncellemeleri hazırlayamadı.
{!s}
komutu {!s} " "hata kodunu döndürdü." -#: src/modules/packages/main.py:738 +#: src/modules/packages/main.py:753 msgid "" "The package manager could not update the system. The command
{!s}
" " returned error code {!s}." @@ -261,7 +261,7 @@ msgstr "" "Paket yöneticisi sistemi güncelleyemedi.
{!s}
komutu {!s} hata " "kodunu döndürdü." -#: src/modules/packages/main.py:766 +#: src/modules/packages/main.py:781 msgid "" "The package manager could not make changes to the installed system. The " "command
{!s}
returned error code {!s}." diff --git a/lang/python/uk/LC_MESSAGES/python.po b/lang/python/uk/LC_MESSAGES/python.po index cf0b01261..fdc977f41 100644 --- a/lang/python/uk/LC_MESSAGES/python.po +++ b/lang/python/uk/LC_MESSAGES/python.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-24 23:38+0200\n" +"POT-Creation-Date: 2023-08-28 23:53+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Yuri Chornoivan , 2023\n" "Language-Team: Ukrainian (https://app.transifex.com/calamares/teams/20061/uk/)\n" @@ -27,17 +27,17 @@ msgstr "" msgid "Install bootloader." msgstr "Встановити завантажувач." -#: src/modules/bootloader/main.py:640 +#: src/modules/bootloader/main.py:644 msgid "Failed to install grub, no partitions defined in global storage" msgstr "" "Не вдалося встановити grub — на загальному сховищі даних не визначено " "розділів" -#: src/modules/bootloader/main.py:895 +#: src/modules/bootloader/main.py:899 msgid "Bootloader installation error" msgstr "Помилка встановлення завантажувача" -#: src/modules/bootloader/main.py:896 +#: src/modules/bootloader/main.py:900 msgid "" "The bootloader could not be installed. The installation command " "
{!s}
returned error code {!s}." @@ -45,43 +45,43 @@ msgstr "" "Не вдалося встановити завантажувач. Програмою для встановлення " "
{!s}
повернуто код помилки {!s}." -#: src/modules/displaymanager/main.py:507 +#: src/modules/displaymanager/main.py:509 msgid "Cannot write LXDM configuration file" msgstr "Не вдалося виконати запис до файла налаштувань LXDM" -#: src/modules/displaymanager/main.py:508 +#: src/modules/displaymanager/main.py:510 msgid "LXDM config file {!s} does not exist" msgstr "Файла налаштувань LXDM {!s} не існує" -#: src/modules/displaymanager/main.py:596 +#: src/modules/displaymanager/main.py:598 msgid "Cannot write LightDM configuration file" msgstr "Не вдалося виконати запис до файла налаштувань LightDM" -#: src/modules/displaymanager/main.py:597 +#: src/modules/displaymanager/main.py:599 msgid "LightDM config file {!s} does not exist" msgstr "Файла налаштувань LightDM {!s} не існує" -#: src/modules/displaymanager/main.py:682 +#: src/modules/displaymanager/main.py:684 msgid "Cannot configure LightDM" msgstr "Не вдалося налаштувати LightDM" -#: src/modules/displaymanager/main.py:683 +#: src/modules/displaymanager/main.py:685 msgid "No LightDM greeter installed." msgstr "Засіб входу до системи LightDM не встановлено." -#: src/modules/displaymanager/main.py:714 +#: src/modules/displaymanager/main.py:716 msgid "Cannot write SLIM configuration file" msgstr "Не вдалося виконати запис до файла налаштувань SLIM" -#: src/modules/displaymanager/main.py:715 +#: src/modules/displaymanager/main.py:717 msgid "SLIM config file {!s} does not exist" msgstr "Файла налаштувань SLIM {!s} не існує" -#: src/modules/displaymanager/main.py:933 +#: src/modules/displaymanager/main.py:935 msgid "No display managers selected for the displaymanager module." msgstr "Не вибрано засобу керування дисплеєм для модуля displaymanager." -#: src/modules/displaymanager/main.py:934 +#: src/modules/displaymanager/main.py:936 msgid "" "The displaymanagers list is empty or undefined in both globalstorage and " "displaymanager.conf." @@ -89,7 +89,7 @@ msgstr "" "Список засобів керування дисплеєм є порожнім або невизначеним у " "bothglobalstorage та displaymanager.conf." -#: src/modules/displaymanager/main.py:1021 +#: src/modules/displaymanager/main.py:1023 msgid "Display manager configuration was incomplete" msgstr "Налаштування засобу керування дисплеєм є неповними" @@ -120,8 +120,8 @@ msgid "Writing fstab." msgstr "Записуємо fstab." #: src/modules/fstab/main.py:377 src/modules/fstab/main.py:383 -#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:245 -#: src/modules/initcpiocfg/main.py:249 src/modules/initramfscfg/main.py:85 +#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:267 +#: src/modules/initcpiocfg/main.py:271 src/modules/initramfscfg/main.py:85 #: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:140 #: src/modules/mount/main.py:329 src/modules/networkcfg/main.py:105 #: src/modules/openrcdmcryptcfg/main.py:72 @@ -159,11 +159,11 @@ msgstr "Встановлюємо значення для апаратного г msgid "Configuring mkinitcpio." msgstr "Налаштовуємо mkinitcpio." -#: src/modules/initcpiocfg/main.py:246 +#: src/modules/initcpiocfg/main.py:268 msgid "No partitions are defined for
initcpiocfg
." msgstr "Не визначено розділів для
initcpiocfg
." -#: src/modules/initcpiocfg/main.py:250 +#: src/modules/initcpiocfg/main.py:272 msgid "No root mount point for
initcpiocfg
." msgstr "Немає кореневої точки монтування для
initcpiocfg
." @@ -247,12 +247,12 @@ msgstr[1] "Вилучаємо %(num)d пакунки." msgstr[2] "Вилучаємо %(num)d пакунків." msgstr[3] "Вилучаємо один пакунок." -#: src/modules/packages/main.py:725 src/modules/packages/main.py:737 -#: src/modules/packages/main.py:765 +#: src/modules/packages/main.py:740 src/modules/packages/main.py:752 +#: src/modules/packages/main.py:780 msgid "Package Manager error" msgstr "Помилка засобу керування пакунками" -#: src/modules/packages/main.py:726 +#: src/modules/packages/main.py:741 msgid "" "The package manager could not prepare updates. The command
{!s}
" "returned error code {!s}." @@ -260,7 +260,7 @@ msgstr "" "Засобу керування пакунками не вдалося приготувати оновлення. Програмою " "
{!s}
повернуто код помилки {!s}." -#: src/modules/packages/main.py:738 +#: src/modules/packages/main.py:753 msgid "" "The package manager could not update the system. The command
{!s}
" " returned error code {!s}." @@ -268,7 +268,7 @@ msgstr "" "Засобу керування пакунками не вдалося оновити систему. Програмою " "
{!s}
повернуто код помилки {!s}." -#: src/modules/packages/main.py:766 +#: src/modules/packages/main.py:781 msgid "" "The package manager could not make changes to the installed system. The " "command
{!s}
returned error code {!s}." diff --git a/lang/python/ur/LC_MESSAGES/python.po b/lang/python/ur/LC_MESSAGES/python.po index 966d0eec8..535dfa247 100644 --- a/lang/python/ur/LC_MESSAGES/python.po +++ b/lang/python/ur/LC_MESSAGES/python.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-24 23:38+0200\n" +"POT-Creation-Date: 2023-08-28 23:53+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Urdu (https://app.transifex.com/calamares/teams/20061/ur/)\n" "MIME-Version: 1.0\n" @@ -21,63 +21,63 @@ msgstr "" msgid "Install bootloader." msgstr "" -#: src/modules/bootloader/main.py:640 +#: src/modules/bootloader/main.py:644 msgid "Failed to install grub, no partitions defined in global storage" msgstr "" -#: src/modules/bootloader/main.py:895 +#: src/modules/bootloader/main.py:899 msgid "Bootloader installation error" msgstr "" -#: src/modules/bootloader/main.py:896 +#: src/modules/bootloader/main.py:900 msgid "" "The bootloader could not be installed. The installation command " "
{!s}
returned error code {!s}." msgstr "" -#: src/modules/displaymanager/main.py:507 +#: src/modules/displaymanager/main.py:509 msgid "Cannot write LXDM configuration file" msgstr "" -#: src/modules/displaymanager/main.py:508 +#: src/modules/displaymanager/main.py:510 msgid "LXDM config file {!s} does not exist" msgstr "" -#: src/modules/displaymanager/main.py:596 +#: src/modules/displaymanager/main.py:598 msgid "Cannot write LightDM configuration file" msgstr "" -#: src/modules/displaymanager/main.py:597 +#: src/modules/displaymanager/main.py:599 msgid "LightDM config file {!s} does not exist" msgstr "" -#: src/modules/displaymanager/main.py:682 +#: src/modules/displaymanager/main.py:684 msgid "Cannot configure LightDM" msgstr "" -#: src/modules/displaymanager/main.py:683 +#: src/modules/displaymanager/main.py:685 msgid "No LightDM greeter installed." msgstr "" -#: src/modules/displaymanager/main.py:714 +#: src/modules/displaymanager/main.py:716 msgid "Cannot write SLIM configuration file" msgstr "" -#: src/modules/displaymanager/main.py:715 +#: src/modules/displaymanager/main.py:717 msgid "SLIM config file {!s} does not exist" msgstr "" -#: src/modules/displaymanager/main.py:933 +#: src/modules/displaymanager/main.py:935 msgid "No display managers selected for the displaymanager module." msgstr "" -#: src/modules/displaymanager/main.py:934 +#: src/modules/displaymanager/main.py:936 msgid "" "The displaymanagers list is empty or undefined in both globalstorage and " "displaymanager.conf." msgstr "" -#: src/modules/displaymanager/main.py:1021 +#: src/modules/displaymanager/main.py:1023 msgid "Display manager configuration was incomplete" msgstr "" @@ -108,8 +108,8 @@ msgid "Writing fstab." msgstr "" #: src/modules/fstab/main.py:377 src/modules/fstab/main.py:383 -#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:245 -#: src/modules/initcpiocfg/main.py:249 src/modules/initramfscfg/main.py:85 +#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:267 +#: src/modules/initcpiocfg/main.py:271 src/modules/initramfscfg/main.py:85 #: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:140 #: src/modules/mount/main.py:329 src/modules/networkcfg/main.py:105 #: src/modules/openrcdmcryptcfg/main.py:72 @@ -145,11 +145,11 @@ msgstr "" msgid "Configuring mkinitcpio." msgstr "" -#: src/modules/initcpiocfg/main.py:246 +#: src/modules/initcpiocfg/main.py:268 msgid "No partitions are defined for
initcpiocfg
." msgstr "" -#: src/modules/initcpiocfg/main.py:250 +#: src/modules/initcpiocfg/main.py:272 msgid "No root mount point for
initcpiocfg
." msgstr "" @@ -229,24 +229,24 @@ msgid_plural "Removing %(num)d packages." msgstr[0] "" msgstr[1] "" -#: src/modules/packages/main.py:725 src/modules/packages/main.py:737 -#: src/modules/packages/main.py:765 +#: src/modules/packages/main.py:740 src/modules/packages/main.py:752 +#: src/modules/packages/main.py:780 msgid "Package Manager error" msgstr "" -#: src/modules/packages/main.py:726 +#: src/modules/packages/main.py:741 msgid "" "The package manager could not prepare updates. The command
{!s}
" "returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:738 +#: src/modules/packages/main.py:753 msgid "" "The package manager could not update the system. The command
{!s}
" " returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:766 +#: src/modules/packages/main.py:781 msgid "" "The package manager could not make changes to the installed system. The " "command
{!s}
returned error code {!s}." diff --git a/lang/python/uz/LC_MESSAGES/python.po b/lang/python/uz/LC_MESSAGES/python.po index 2142f07fd..e3be91efa 100644 --- a/lang/python/uz/LC_MESSAGES/python.po +++ b/lang/python/uz/LC_MESSAGES/python.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-24 23:38+0200\n" +"POT-Creation-Date: 2023-08-28 23:53+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Uzbek (https://app.transifex.com/calamares/teams/20061/uz/)\n" "MIME-Version: 1.0\n" @@ -21,63 +21,63 @@ msgstr "" msgid "Install bootloader." msgstr "" -#: src/modules/bootloader/main.py:640 +#: src/modules/bootloader/main.py:644 msgid "Failed to install grub, no partitions defined in global storage" msgstr "" -#: src/modules/bootloader/main.py:895 +#: src/modules/bootloader/main.py:899 msgid "Bootloader installation error" msgstr "" -#: src/modules/bootloader/main.py:896 +#: src/modules/bootloader/main.py:900 msgid "" "The bootloader could not be installed. The installation command " "
{!s}
returned error code {!s}." msgstr "" -#: src/modules/displaymanager/main.py:507 +#: src/modules/displaymanager/main.py:509 msgid "Cannot write LXDM configuration file" msgstr "" -#: src/modules/displaymanager/main.py:508 +#: src/modules/displaymanager/main.py:510 msgid "LXDM config file {!s} does not exist" msgstr "" -#: src/modules/displaymanager/main.py:596 +#: src/modules/displaymanager/main.py:598 msgid "Cannot write LightDM configuration file" msgstr "" -#: src/modules/displaymanager/main.py:597 +#: src/modules/displaymanager/main.py:599 msgid "LightDM config file {!s} does not exist" msgstr "" -#: src/modules/displaymanager/main.py:682 +#: src/modules/displaymanager/main.py:684 msgid "Cannot configure LightDM" msgstr "" -#: src/modules/displaymanager/main.py:683 +#: src/modules/displaymanager/main.py:685 msgid "No LightDM greeter installed." msgstr "" -#: src/modules/displaymanager/main.py:714 +#: src/modules/displaymanager/main.py:716 msgid "Cannot write SLIM configuration file" msgstr "" -#: src/modules/displaymanager/main.py:715 +#: src/modules/displaymanager/main.py:717 msgid "SLIM config file {!s} does not exist" msgstr "" -#: src/modules/displaymanager/main.py:933 +#: src/modules/displaymanager/main.py:935 msgid "No display managers selected for the displaymanager module." msgstr "" -#: src/modules/displaymanager/main.py:934 +#: src/modules/displaymanager/main.py:936 msgid "" "The displaymanagers list is empty or undefined in both globalstorage and " "displaymanager.conf." msgstr "" -#: src/modules/displaymanager/main.py:1021 +#: src/modules/displaymanager/main.py:1023 msgid "Display manager configuration was incomplete" msgstr "" @@ -108,8 +108,8 @@ msgid "Writing fstab." msgstr "" #: src/modules/fstab/main.py:377 src/modules/fstab/main.py:383 -#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:245 -#: src/modules/initcpiocfg/main.py:249 src/modules/initramfscfg/main.py:85 +#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:267 +#: src/modules/initcpiocfg/main.py:271 src/modules/initramfscfg/main.py:85 #: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:140 #: src/modules/mount/main.py:329 src/modules/networkcfg/main.py:105 #: src/modules/openrcdmcryptcfg/main.py:72 @@ -145,11 +145,11 @@ msgstr "" msgid "Configuring mkinitcpio." msgstr "" -#: src/modules/initcpiocfg/main.py:246 +#: src/modules/initcpiocfg/main.py:268 msgid "No partitions are defined for
initcpiocfg
." msgstr "" -#: src/modules/initcpiocfg/main.py:250 +#: src/modules/initcpiocfg/main.py:272 msgid "No root mount point for
initcpiocfg
." msgstr "" @@ -227,24 +227,24 @@ msgid "Removing one package." msgid_plural "Removing %(num)d packages." msgstr[0] "" -#: src/modules/packages/main.py:725 src/modules/packages/main.py:737 -#: src/modules/packages/main.py:765 +#: src/modules/packages/main.py:740 src/modules/packages/main.py:752 +#: src/modules/packages/main.py:780 msgid "Package Manager error" msgstr "" -#: src/modules/packages/main.py:726 +#: src/modules/packages/main.py:741 msgid "" "The package manager could not prepare updates. The command
{!s}
" "returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:738 +#: src/modules/packages/main.py:753 msgid "" "The package manager could not update the system. The command
{!s}
" " returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:766 +#: src/modules/packages/main.py:781 msgid "" "The package manager could not make changes to the installed system. The " "command
{!s}
returned error code {!s}." diff --git a/lang/python/vi/LC_MESSAGES/python.po b/lang/python/vi/LC_MESSAGES/python.po index 0d847f2bf..87c79e7b4 100644 --- a/lang/python/vi/LC_MESSAGES/python.po +++ b/lang/python/vi/LC_MESSAGES/python.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-24 23:38+0200\n" +"POT-Creation-Date: 2023-08-28 23:53+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: th1nhhdk , 2021\n" "Language-Team: Vietnamese (https://app.transifex.com/calamares/teams/20061/vi/)\n" @@ -26,15 +26,15 @@ msgstr "" msgid "Install bootloader." msgstr "Đang cài đặt bộ khởi động." -#: src/modules/bootloader/main.py:640 +#: src/modules/bootloader/main.py:644 msgid "Failed to install grub, no partitions defined in global storage" msgstr "" -#: src/modules/bootloader/main.py:895 +#: src/modules/bootloader/main.py:899 msgid "Bootloader installation error" msgstr "Lỗi cài đặt trình khởi động(bootloader)" -#: src/modules/bootloader/main.py:896 +#: src/modules/bootloader/main.py:900 msgid "" "The bootloader could not be installed. The installation command " "
{!s}
returned error code {!s}." @@ -42,44 +42,44 @@ msgstr "" "Trình khởi động(bootloader) không thể được cài đặt. Lệnh cài đặt " "
{!s}
đã trả mã lỗi {!s}." -#: src/modules/displaymanager/main.py:507 +#: src/modules/displaymanager/main.py:509 msgid "Cannot write LXDM configuration file" msgstr "Không thể ghi vào tập tin cấu hình LXDM" -#: src/modules/displaymanager/main.py:508 +#: src/modules/displaymanager/main.py:510 msgid "LXDM config file {!s} does not exist" msgstr "Tập tin cấu hình LXDM {!s} không tồn tại" -#: src/modules/displaymanager/main.py:596 +#: src/modules/displaymanager/main.py:598 msgid "Cannot write LightDM configuration file" msgstr "Không thể ghi vào tập tin cấu hình LightDM" -#: src/modules/displaymanager/main.py:597 +#: src/modules/displaymanager/main.py:599 msgid "LightDM config file {!s} does not exist" msgstr "Tập tin cấu hình LightDM {!s} không tồn tại" -#: src/modules/displaymanager/main.py:682 +#: src/modules/displaymanager/main.py:684 msgid "Cannot configure LightDM" msgstr "Không thể cấu hình LXDM" -#: src/modules/displaymanager/main.py:683 +#: src/modules/displaymanager/main.py:685 msgid "No LightDM greeter installed." msgstr "Màn hình chào mừng LightDM không được cài đặt." -#: src/modules/displaymanager/main.py:714 +#: src/modules/displaymanager/main.py:716 msgid "Cannot write SLIM configuration file" msgstr "Không thể ghi vào tập tin cấu hình SLIM" -#: src/modules/displaymanager/main.py:715 +#: src/modules/displaymanager/main.py:717 msgid "SLIM config file {!s} does not exist" msgstr "Tập tin cấu hình SLIM {!s} không tồn tại" -#: src/modules/displaymanager/main.py:933 +#: src/modules/displaymanager/main.py:935 msgid "No display managers selected for the displaymanager module." msgstr "" "Không có trình quản lý hiển thị nào được chọn cho mô-đun quản lý hiển thị" -#: src/modules/displaymanager/main.py:934 +#: src/modules/displaymanager/main.py:936 msgid "" "The displaymanagers list is empty or undefined in both globalstorage and " "displaymanager.conf." @@ -87,7 +87,7 @@ msgstr "" "Danh sách quản lý hiện thị trống hoặc không được định nghĩa cả trong " "globalstorage và displaymanager.conf." -#: src/modules/displaymanager/main.py:1021 +#: src/modules/displaymanager/main.py:1023 msgid "Display manager configuration was incomplete" msgstr "Cầu hình quản lý hiện thị không hoàn tất" @@ -118,8 +118,8 @@ msgid "Writing fstab." msgstr "Đang viết vào fstab." #: src/modules/fstab/main.py:377 src/modules/fstab/main.py:383 -#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:245 -#: src/modules/initcpiocfg/main.py:249 src/modules/initramfscfg/main.py:85 +#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:267 +#: src/modules/initcpiocfg/main.py:271 src/modules/initramfscfg/main.py:85 #: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:140 #: src/modules/mount/main.py:329 src/modules/networkcfg/main.py:105 #: src/modules/openrcdmcryptcfg/main.py:72 @@ -155,11 +155,11 @@ msgstr "Đang thiết lập đồng hồ máy tính." msgid "Configuring mkinitcpio." msgstr "Đang cấu hình mkinitcpio." -#: src/modules/initcpiocfg/main.py:246 +#: src/modules/initcpiocfg/main.py:268 msgid "No partitions are defined for
initcpiocfg
." msgstr "" -#: src/modules/initcpiocfg/main.py:250 +#: src/modules/initcpiocfg/main.py:272 msgid "No root mount point for
initcpiocfg
." msgstr "" @@ -237,24 +237,24 @@ msgid "Removing one package." msgid_plural "Removing %(num)d packages." msgstr[0] "Đang gỡ bỏ %(num)d gói ứng dụng." -#: src/modules/packages/main.py:725 src/modules/packages/main.py:737 -#: src/modules/packages/main.py:765 +#: src/modules/packages/main.py:740 src/modules/packages/main.py:752 +#: src/modules/packages/main.py:780 msgid "Package Manager error" msgstr "" -#: src/modules/packages/main.py:726 +#: src/modules/packages/main.py:741 msgid "" "The package manager could not prepare updates. The command
{!s}
" "returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:738 +#: src/modules/packages/main.py:753 msgid "" "The package manager could not update the system. The command
{!s}
" " returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:766 +#: src/modules/packages/main.py:781 msgid "" "The package manager could not make changes to the installed system. The " "command
{!s}
returned error code {!s}." diff --git a/lang/python/zh/LC_MESSAGES/python.po b/lang/python/zh/LC_MESSAGES/python.po index e73a3e1e1..eccb623d0 100644 --- a/lang/python/zh/LC_MESSAGES/python.po +++ b/lang/python/zh/LC_MESSAGES/python.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-24 23:38+0200\n" +"POT-Creation-Date: 2023-08-28 23:53+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Chinese (https://app.transifex.com/calamares/teams/20061/zh/)\n" "MIME-Version: 1.0\n" @@ -21,63 +21,63 @@ msgstr "" msgid "Install bootloader." msgstr "" -#: src/modules/bootloader/main.py:640 +#: src/modules/bootloader/main.py:644 msgid "Failed to install grub, no partitions defined in global storage" msgstr "" -#: src/modules/bootloader/main.py:895 +#: src/modules/bootloader/main.py:899 msgid "Bootloader installation error" msgstr "" -#: src/modules/bootloader/main.py:896 +#: src/modules/bootloader/main.py:900 msgid "" "The bootloader could not be installed. The installation command " "
{!s}
returned error code {!s}." msgstr "" -#: src/modules/displaymanager/main.py:507 +#: src/modules/displaymanager/main.py:509 msgid "Cannot write LXDM configuration file" msgstr "" -#: src/modules/displaymanager/main.py:508 +#: src/modules/displaymanager/main.py:510 msgid "LXDM config file {!s} does not exist" msgstr "" -#: src/modules/displaymanager/main.py:596 +#: src/modules/displaymanager/main.py:598 msgid "Cannot write LightDM configuration file" msgstr "" -#: src/modules/displaymanager/main.py:597 +#: src/modules/displaymanager/main.py:599 msgid "LightDM config file {!s} does not exist" msgstr "" -#: src/modules/displaymanager/main.py:682 +#: src/modules/displaymanager/main.py:684 msgid "Cannot configure LightDM" msgstr "" -#: src/modules/displaymanager/main.py:683 +#: src/modules/displaymanager/main.py:685 msgid "No LightDM greeter installed." msgstr "" -#: src/modules/displaymanager/main.py:714 +#: src/modules/displaymanager/main.py:716 msgid "Cannot write SLIM configuration file" msgstr "" -#: src/modules/displaymanager/main.py:715 +#: src/modules/displaymanager/main.py:717 msgid "SLIM config file {!s} does not exist" msgstr "" -#: src/modules/displaymanager/main.py:933 +#: src/modules/displaymanager/main.py:935 msgid "No display managers selected for the displaymanager module." msgstr "" -#: src/modules/displaymanager/main.py:934 +#: src/modules/displaymanager/main.py:936 msgid "" "The displaymanagers list is empty or undefined in both globalstorage and " "displaymanager.conf." msgstr "" -#: src/modules/displaymanager/main.py:1021 +#: src/modules/displaymanager/main.py:1023 msgid "Display manager configuration was incomplete" msgstr "" @@ -108,8 +108,8 @@ msgid "Writing fstab." msgstr "" #: src/modules/fstab/main.py:377 src/modules/fstab/main.py:383 -#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:245 -#: src/modules/initcpiocfg/main.py:249 src/modules/initramfscfg/main.py:85 +#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:267 +#: src/modules/initcpiocfg/main.py:271 src/modules/initramfscfg/main.py:85 #: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:140 #: src/modules/mount/main.py:329 src/modules/networkcfg/main.py:105 #: src/modules/openrcdmcryptcfg/main.py:72 @@ -145,11 +145,11 @@ msgstr "" msgid "Configuring mkinitcpio." msgstr "" -#: src/modules/initcpiocfg/main.py:246 +#: src/modules/initcpiocfg/main.py:268 msgid "No partitions are defined for
initcpiocfg
." msgstr "" -#: src/modules/initcpiocfg/main.py:250 +#: src/modules/initcpiocfg/main.py:272 msgid "No root mount point for
initcpiocfg
." msgstr "" @@ -227,24 +227,24 @@ msgid "Removing one package." msgid_plural "Removing %(num)d packages." msgstr[0] "" -#: src/modules/packages/main.py:725 src/modules/packages/main.py:737 -#: src/modules/packages/main.py:765 +#: src/modules/packages/main.py:740 src/modules/packages/main.py:752 +#: src/modules/packages/main.py:780 msgid "Package Manager error" msgstr "" -#: src/modules/packages/main.py:726 +#: src/modules/packages/main.py:741 msgid "" "The package manager could not prepare updates. The command
{!s}
" "returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:738 +#: src/modules/packages/main.py:753 msgid "" "The package manager could not update the system. The command
{!s}
" " returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:766 +#: src/modules/packages/main.py:781 msgid "" "The package manager could not make changes to the installed system. The " "command
{!s}
returned error code {!s}." diff --git a/lang/python/zh_CN/LC_MESSAGES/python.po b/lang/python/zh_CN/LC_MESSAGES/python.po index 3309239ba..8f7c30895 100644 --- a/lang/python/zh_CN/LC_MESSAGES/python.po +++ b/lang/python/zh_CN/LC_MESSAGES/python.po @@ -10,15 +10,16 @@ # Bobby Rong , 2020 # Giovanni Schiano-Moriello, 2022 # 玉堂白鹤 , 2022 +# OkayPJ <1535253694@qq.com>, 2023 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-24 23:38+0200\n" +"POT-Creation-Date: 2023-08-28 23:53+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" -"Last-Translator: 玉堂白鹤 , 2022\n" +"Last-Translator: OkayPJ <1535253694@qq.com>, 2023\n" "Language-Team: Chinese (China) (https://app.transifex.com/calamares/teams/20061/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -30,63 +31,63 @@ msgstr "" msgid "Install bootloader." msgstr "安装启动加载器。" -#: src/modules/bootloader/main.py:640 +#: src/modules/bootloader/main.py:644 msgid "Failed to install grub, no partitions defined in global storage" msgstr "无法安装 grub,全局存储中未定义分区" -#: src/modules/bootloader/main.py:895 +#: src/modules/bootloader/main.py:899 msgid "Bootloader installation error" msgstr "启动加载器安装出错" -#: src/modules/bootloader/main.py:896 +#: src/modules/bootloader/main.py:900 msgid "" "The bootloader could not be installed. The installation command " "
{!s}
returned error code {!s}." msgstr "无法安装启动加载器。安装命令
{!s}
返回错误代码 {!s}。" -#: src/modules/displaymanager/main.py:507 +#: src/modules/displaymanager/main.py:509 msgid "Cannot write LXDM configuration file" msgstr "无法写入 LXDM 配置文件" -#: src/modules/displaymanager/main.py:508 +#: src/modules/displaymanager/main.py:510 msgid "LXDM config file {!s} does not exist" msgstr "LXDM 配置文件 {!s} 不存在" -#: src/modules/displaymanager/main.py:596 +#: src/modules/displaymanager/main.py:598 msgid "Cannot write LightDM configuration file" msgstr "无法写入 LightDM 配置文件" -#: src/modules/displaymanager/main.py:597 +#: src/modules/displaymanager/main.py:599 msgid "LightDM config file {!s} does not exist" msgstr "LightDM 配置文件 {!s} 不存在" -#: src/modules/displaymanager/main.py:682 +#: src/modules/displaymanager/main.py:684 msgid "Cannot configure LightDM" msgstr "无法配置 LightDM" -#: src/modules/displaymanager/main.py:683 +#: src/modules/displaymanager/main.py:685 msgid "No LightDM greeter installed." msgstr "未安装 LightDM 欢迎程序。" -#: src/modules/displaymanager/main.py:714 +#: src/modules/displaymanager/main.py:716 msgid "Cannot write SLIM configuration file" msgstr "无法写入 SLIM 配置文件" -#: src/modules/displaymanager/main.py:715 +#: src/modules/displaymanager/main.py:717 msgid "SLIM config file {!s} does not exist" msgstr "SLIM 配置文件 {!s} 不存在" -#: src/modules/displaymanager/main.py:933 +#: src/modules/displaymanager/main.py:935 msgid "No display managers selected for the displaymanager module." msgstr "显示管理器模块中未选择显示管理器。" -#: src/modules/displaymanager/main.py:934 +#: src/modules/displaymanager/main.py:936 msgid "" "The displaymanagers list is empty or undefined in both globalstorage and " "displaymanager.conf." msgstr "globalstorage 和 displaymanager.conf 配置文件中都没有配置显示管理器。" -#: src/modules/displaymanager/main.py:1021 +#: src/modules/displaymanager/main.py:1023 msgid "Display manager configuration was incomplete" msgstr "显示管理器配置不完全" @@ -117,8 +118,8 @@ msgid "Writing fstab." msgstr "正在写入 fstab。" #: src/modules/fstab/main.py:377 src/modules/fstab/main.py:383 -#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:245 -#: src/modules/initcpiocfg/main.py:249 src/modules/initramfscfg/main.py:85 +#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:267 +#: src/modules/initcpiocfg/main.py:271 src/modules/initramfscfg/main.py:85 #: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:140 #: src/modules/mount/main.py:329 src/modules/networkcfg/main.py:105 #: src/modules/openrcdmcryptcfg/main.py:72 @@ -154,11 +155,11 @@ msgstr "设置硬件时钟。" msgid "Configuring mkinitcpio." msgstr "配置 mkinitcpio." -#: src/modules/initcpiocfg/main.py:246 +#: src/modules/initcpiocfg/main.py:268 msgid "No partitions are defined for
initcpiocfg
." msgstr "" -#: src/modules/initcpiocfg/main.py:250 +#: src/modules/initcpiocfg/main.py:272 msgid "No root mount point for
initcpiocfg
." msgstr "" @@ -236,24 +237,24 @@ msgid "Removing one package." msgid_plural "Removing %(num)d packages." msgstr[0] "移除%(num)d软件包。" -#: src/modules/packages/main.py:725 src/modules/packages/main.py:737 -#: src/modules/packages/main.py:765 +#: src/modules/packages/main.py:740 src/modules/packages/main.py:752 +#: src/modules/packages/main.py:780 msgid "Package Manager error" msgstr "软件包管理器错误" -#: src/modules/packages/main.py:726 +#: src/modules/packages/main.py:741 msgid "" "The package manager could not prepare updates. The command
{!s}
" "returned error code {!s}." msgstr "软件包管理器无法准备更新。命令
{!s}
返回错误代码{!s}。" -#: src/modules/packages/main.py:738 +#: src/modules/packages/main.py:753 msgid "" "The package manager could not update the system. The command
{!s}
" " returned error code {!s}." msgstr "软件包管理器无法更新系统。命令
{!s}
返回错误代码{!s}。" -#: src/modules/packages/main.py:766 +#: src/modules/packages/main.py:781 msgid "" "The package manager could not make changes to the installed system. The " "command
{!s}
returned error code {!s}." @@ -316,17 +317,17 @@ msgstr "服务 {name!s} 的路径 {path!s} 不存在。" #: src/modules/services-systemd/main.py:26 msgid "Configure systemd units" -msgstr "" +msgstr "配置 systemd 单元" #: src/modules/services-systemd/main.py:64 msgid "Cannot modify unit" -msgstr "" +msgstr "无法修改单元" #: src/modules/services-systemd/main.py:65 msgid "" "systemctl {_action!s} call in chroot returned error code " "{_exit_code!s}." -msgstr "" +msgstr "chroot 中运行的 systemctl {_action!s} 返回错误 {_exit_code!s}。" #: src/modules/services-systemd/main.py:66 msgid "Cannot {_action!s} systemd unit {_name!s}." diff --git a/lang/python/zh_HK/LC_MESSAGES/python.po b/lang/python/zh_HK/LC_MESSAGES/python.po index 41f7facc2..73533dbbe 100644 --- a/lang/python/zh_HK/LC_MESSAGES/python.po +++ b/lang/python/zh_HK/LC_MESSAGES/python.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-24 23:38+0200\n" +"POT-Creation-Date: 2023-08-28 23:53+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Chinese (Hong Kong) (https://app.transifex.com/calamares/teams/20061/zh_HK/)\n" "MIME-Version: 1.0\n" @@ -21,63 +21,63 @@ msgstr "" msgid "Install bootloader." msgstr "" -#: src/modules/bootloader/main.py:640 +#: src/modules/bootloader/main.py:644 msgid "Failed to install grub, no partitions defined in global storage" msgstr "" -#: src/modules/bootloader/main.py:895 +#: src/modules/bootloader/main.py:899 msgid "Bootloader installation error" msgstr "" -#: src/modules/bootloader/main.py:896 +#: src/modules/bootloader/main.py:900 msgid "" "The bootloader could not be installed. The installation command " "
{!s}
returned error code {!s}." msgstr "" -#: src/modules/displaymanager/main.py:507 +#: src/modules/displaymanager/main.py:509 msgid "Cannot write LXDM configuration file" msgstr "" -#: src/modules/displaymanager/main.py:508 +#: src/modules/displaymanager/main.py:510 msgid "LXDM config file {!s} does not exist" msgstr "" -#: src/modules/displaymanager/main.py:596 +#: src/modules/displaymanager/main.py:598 msgid "Cannot write LightDM configuration file" msgstr "" -#: src/modules/displaymanager/main.py:597 +#: src/modules/displaymanager/main.py:599 msgid "LightDM config file {!s} does not exist" msgstr "" -#: src/modules/displaymanager/main.py:682 +#: src/modules/displaymanager/main.py:684 msgid "Cannot configure LightDM" msgstr "" -#: src/modules/displaymanager/main.py:683 +#: src/modules/displaymanager/main.py:685 msgid "No LightDM greeter installed." msgstr "" -#: src/modules/displaymanager/main.py:714 +#: src/modules/displaymanager/main.py:716 msgid "Cannot write SLIM configuration file" msgstr "" -#: src/modules/displaymanager/main.py:715 +#: src/modules/displaymanager/main.py:717 msgid "SLIM config file {!s} does not exist" msgstr "" -#: src/modules/displaymanager/main.py:933 +#: src/modules/displaymanager/main.py:935 msgid "No display managers selected for the displaymanager module." msgstr "" -#: src/modules/displaymanager/main.py:934 +#: src/modules/displaymanager/main.py:936 msgid "" "The displaymanagers list is empty or undefined in both globalstorage and " "displaymanager.conf." msgstr "" -#: src/modules/displaymanager/main.py:1021 +#: src/modules/displaymanager/main.py:1023 msgid "Display manager configuration was incomplete" msgstr "" @@ -108,8 +108,8 @@ msgid "Writing fstab." msgstr "" #: src/modules/fstab/main.py:377 src/modules/fstab/main.py:383 -#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:245 -#: src/modules/initcpiocfg/main.py:249 src/modules/initramfscfg/main.py:85 +#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:267 +#: src/modules/initcpiocfg/main.py:271 src/modules/initramfscfg/main.py:85 #: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:140 #: src/modules/mount/main.py:329 src/modules/networkcfg/main.py:105 #: src/modules/openrcdmcryptcfg/main.py:72 @@ -145,11 +145,11 @@ msgstr "" msgid "Configuring mkinitcpio." msgstr "" -#: src/modules/initcpiocfg/main.py:246 +#: src/modules/initcpiocfg/main.py:268 msgid "No partitions are defined for
initcpiocfg
." msgstr "" -#: src/modules/initcpiocfg/main.py:250 +#: src/modules/initcpiocfg/main.py:272 msgid "No root mount point for
initcpiocfg
." msgstr "" @@ -227,24 +227,24 @@ msgid "Removing one package." msgid_plural "Removing %(num)d packages." msgstr[0] "" -#: src/modules/packages/main.py:725 src/modules/packages/main.py:737 -#: src/modules/packages/main.py:765 +#: src/modules/packages/main.py:740 src/modules/packages/main.py:752 +#: src/modules/packages/main.py:780 msgid "Package Manager error" msgstr "" -#: src/modules/packages/main.py:726 +#: src/modules/packages/main.py:741 msgid "" "The package manager could not prepare updates. The command
{!s}
" "returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:738 +#: src/modules/packages/main.py:753 msgid "" "The package manager could not update the system. The command
{!s}
" " returned error code {!s}." msgstr "" -#: src/modules/packages/main.py:766 +#: src/modules/packages/main.py:781 msgid "" "The package manager could not make changes to the installed system. The " "command
{!s}
returned error code {!s}." diff --git a/lang/python/zh_TW/LC_MESSAGES/python.po b/lang/python/zh_TW/LC_MESSAGES/python.po index 5ccbce6c3..fd5ef0f38 100644 --- a/lang/python/zh_TW/LC_MESSAGES/python.po +++ b/lang/python/zh_TW/LC_MESSAGES/python.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-24 23:38+0200\n" +"POT-Creation-Date: 2023-08-28 23:53+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: 黃柏諺 , 2023\n" "Language-Team: Chinese (Taiwan) (https://app.transifex.com/calamares/teams/20061/zh_TW/)\n" @@ -26,63 +26,63 @@ msgstr "" msgid "Install bootloader." msgstr "安裝開機載入程式。" -#: src/modules/bootloader/main.py:640 +#: src/modules/bootloader/main.py:644 msgid "Failed to install grub, no partitions defined in global storage" msgstr "安裝 grub 失敗,全域儲存空間中未定義分割區" -#: src/modules/bootloader/main.py:895 +#: src/modules/bootloader/main.py:899 msgid "Bootloader installation error" msgstr "開機載入程式安裝錯誤" -#: src/modules/bootloader/main.py:896 +#: src/modules/bootloader/main.py:900 msgid "" "The bootloader could not be installed. The installation command " "
{!s}
returned error code {!s}." msgstr "無法安裝開機載入程式。安裝指令
{!s}
回傳了錯誤碼 {!s}。" -#: src/modules/displaymanager/main.py:507 +#: src/modules/displaymanager/main.py:509 msgid "Cannot write LXDM configuration file" msgstr "無法寫入 LXDM 設定檔" -#: src/modules/displaymanager/main.py:508 +#: src/modules/displaymanager/main.py:510 msgid "LXDM config file {!s} does not exist" msgstr "LXDM 設定檔 {!s} 不存在" -#: src/modules/displaymanager/main.py:596 +#: src/modules/displaymanager/main.py:598 msgid "Cannot write LightDM configuration file" msgstr "無法寫入 LightDM 設定檔" -#: src/modules/displaymanager/main.py:597 +#: src/modules/displaymanager/main.py:599 msgid "LightDM config file {!s} does not exist" msgstr "LightDM 設定檔 {!s} 不存在" -#: src/modules/displaymanager/main.py:682 +#: src/modules/displaymanager/main.py:684 msgid "Cannot configure LightDM" msgstr "無法設定 LightDM" -#: src/modules/displaymanager/main.py:683 +#: src/modules/displaymanager/main.py:685 msgid "No LightDM greeter installed." msgstr "未安裝 LightDM greeter。" -#: src/modules/displaymanager/main.py:714 +#: src/modules/displaymanager/main.py:716 msgid "Cannot write SLIM configuration file" msgstr "無法寫入 SLIM 設定檔" -#: src/modules/displaymanager/main.py:715 +#: src/modules/displaymanager/main.py:717 msgid "SLIM config file {!s} does not exist" msgstr "SLIM 設定檔 {!s} 不存在" -#: src/modules/displaymanager/main.py:933 +#: src/modules/displaymanager/main.py:935 msgid "No display managers selected for the displaymanager module." msgstr "未在顯示管理器模組中選取顯示管理器。" -#: src/modules/displaymanager/main.py:934 +#: src/modules/displaymanager/main.py:936 msgid "" "The displaymanagers list is empty or undefined in both globalstorage and " "displaymanager.conf." msgstr "顯示管理器清單為空或在 globalstorage 與 displaymanager.conf 中皆未定義。" -#: src/modules/displaymanager/main.py:1021 +#: src/modules/displaymanager/main.py:1023 msgid "Display manager configuration was incomplete" msgstr "顯示管理器設定不完整" @@ -113,8 +113,8 @@ msgid "Writing fstab." msgstr "正在寫入 fstab。" #: src/modules/fstab/main.py:377 src/modules/fstab/main.py:383 -#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:245 -#: src/modules/initcpiocfg/main.py:249 src/modules/initramfscfg/main.py:85 +#: src/modules/fstab/main.py:411 src/modules/initcpiocfg/main.py:267 +#: src/modules/initcpiocfg/main.py:271 src/modules/initramfscfg/main.py:85 #: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:140 #: src/modules/mount/main.py:329 src/modules/networkcfg/main.py:105 #: src/modules/openrcdmcryptcfg/main.py:72 @@ -150,11 +150,11 @@ msgstr "正在設定硬體時鐘。" msgid "Configuring mkinitcpio." msgstr "正在設定 mkinitcpio。" -#: src/modules/initcpiocfg/main.py:246 +#: src/modules/initcpiocfg/main.py:268 msgid "No partitions are defined for
initcpiocfg
." msgstr "沒有為
initcpiocfg
定義分割區。" -#: src/modules/initcpiocfg/main.py:250 +#: src/modules/initcpiocfg/main.py:272 msgid "No root mount point for
initcpiocfg
." msgstr "
initcpiocfg
無根掛載點。" @@ -232,24 +232,24 @@ msgid "Removing one package." msgid_plural "Removing %(num)d packages." msgstr[0] "正在移除 %(num)d 軟體包。" -#: src/modules/packages/main.py:725 src/modules/packages/main.py:737 -#: src/modules/packages/main.py:765 +#: src/modules/packages/main.py:740 src/modules/packages/main.py:752 +#: src/modules/packages/main.py:780 msgid "Package Manager error" msgstr "軟體包管理程式錯誤" -#: src/modules/packages/main.py:726 +#: src/modules/packages/main.py:741 msgid "" "The package manager could not prepare updates. The command
{!s}
" "returned error code {!s}." msgstr "軟體包管理程式無法準備更新。指令
{!s}
回傳了錯誤碼 {!s}。" -#: src/modules/packages/main.py:738 +#: src/modules/packages/main.py:753 msgid "" "The package manager could not update the system. The command
{!s}
" " returned error code {!s}." msgstr "軟體包管理程式無法更新系統。指令
{!s}
回傳了錯誤碼 {!s}。" -#: src/modules/packages/main.py:766 +#: src/modules/packages/main.py:781 msgid "" "The package manager could not make changes to the installed system. The " "command
{!s}
returned error code {!s}." diff --git a/src/calamares/CalamaresApplication.cpp b/src/calamares/CalamaresApplication.cpp index 67c239448..fabf38373 100644 --- a/src/calamares/CalamaresApplication.cpp +++ b/src/calamares/CalamaresApplication.cpp @@ -20,8 +20,8 @@ #include "ViewManager.h" #include "locale/TranslationsModel.h" #include "modulesystem/ModuleManager.h" -#include "utils/CalamaresUtilsGui.h" -#include "utils/CalamaresUtilsSystem.h" +#include "utils/Gui.h" +#include "utils/System.h" #include "utils/Dirs.h" #include "utils/Logger.h" #ifdef WITH_QML @@ -58,10 +58,9 @@ CalamaresApplication::CalamaresApplication( int& argc, char* argv[] ) setApplicationVersion( QStringLiteral( CALAMARES_VERSION ) ); QFont f = font(); - CalamaresUtils::setDefaultFontSize( f.pointSize() ); + Calamares::setDefaultFontSize( f.pointSize() ); } - void CalamaresApplication::init() { @@ -77,7 +76,7 @@ CalamaresApplication::init() initQmlPath(); initBranding(); - CalamaresUtils::installTranslator(); + Calamares::installTranslator(); setQuitOnLastWindowClosed( false ); setWindowIcon( QIcon( Calamares::Branding::instance()->imagePath( Calamares::Branding::ProductIcon ) ) ); @@ -89,35 +88,31 @@ CalamaresApplication::init() cDebug() << Logger::SubEntry << "STARTUP: initModuleManager: module init started"; } - CalamaresApplication::~CalamaresApplication() { Logger::CDebug( Logger::LOGVERBOSE ) << "Shutting down Calamares..."; Logger::CDebug( Logger::LOGVERBOSE ) << Logger::SubEntry << "Finished shutdown."; } - CalamaresApplication* CalamaresApplication::instance() { return qobject_cast< CalamaresApplication* >( QApplication::instance() ); } - CalamaresWindow* CalamaresApplication::mainWindow() { return m_mainwindow; } - static QStringList brandingFileCandidates( bool assumeBuilddir, const QString& brandingFilename ) { QStringList brandingPaths; - if ( CalamaresUtils::isAppDataDirOverridden() ) + if ( Calamares::isAppDataDirOverridden() ) { - brandingPaths << CalamaresUtils::appDataDir().absoluteFilePath( brandingFilename ); + brandingPaths << Calamares::appDataDir().absoluteFilePath( brandingFilename ); } else { @@ -125,31 +120,29 @@ brandingFileCandidates( bool assumeBuilddir, const QString& brandingFilename ) { brandingPaths << ( QDir::currentPath() + QStringLiteral( "/src/" ) + brandingFilename ); } - if ( CalamaresUtils::haveExtraDirs() ) - for ( auto s : CalamaresUtils::extraDataDirs() ) + if ( Calamares::haveExtraDirs() ) + for ( auto s : Calamares::extraDataDirs() ) { brandingPaths << ( s + brandingFilename ); } brandingPaths << QDir( CMAKE_INSTALL_FULL_SYSCONFDIR "/calamares/" ).absoluteFilePath( brandingFilename ); - brandingPaths << CalamaresUtils::appDataDir().absoluteFilePath( brandingFilename ); + brandingPaths << Calamares::appDataDir().absoluteFilePath( brandingFilename ); } return brandingPaths; } - void CalamaresApplication::initQmlPath() { #ifdef WITH_QML - if ( !CalamaresUtils::initQmlModulesDir() ) + if ( !Calamares::initQmlModulesDir() ) { ::exit( EXIT_FAILURE ); } #endif } - void CalamaresApplication::initBranding() { @@ -181,7 +174,7 @@ CalamaresApplication::initBranding() { cError() << "Cowardly refusing to continue startup without branding." << Logger::DebugList( brandingFileCandidatesByPriority ); - if ( CalamaresUtils::isAppDataDirOverridden() ) + if ( Calamares::isAppDataDirOverridden() ) { cError() << "FATAL: explicitly configured application data directory is missing" << brandingComponentName; } @@ -195,7 +188,6 @@ CalamaresApplication::initBranding() new Calamares::Branding( brandingFile.absoluteFilePath(), this, devicePixelRatio() ); } - void CalamaresApplication::initModuleManager() { @@ -262,7 +254,6 @@ CalamaresApplication::initView() cDebug() << "STARTUP: CalamaresWindow created; loadModules started"; } - void CalamaresApplication::initViewSteps() { @@ -294,6 +285,6 @@ void CalamaresApplication::initJobQueue() { Calamares::JobQueue* jobQueue = new Calamares::JobQueue( this ); - new CalamaresUtils::System( Calamares::Settings::instance()->doChroot(), this ); + new Calamares::System( Calamares::Settings::instance()->doChroot(), this ); Calamares::Branding::instance()->setGlobals( jobQueue->globalStorage() ); } diff --git a/src/calamares/CalamaresWindow.cpp b/src/calamares/CalamaresWindow.cpp index e421de83c..722324846 100644 --- a/src/calamares/CalamaresWindow.cpp +++ b/src/calamares/CalamaresWindow.cpp @@ -19,7 +19,7 @@ #include "Settings.h" #include "ViewManager.h" #include "progresstree/ProgressTreeView.h" -#include "utils/CalamaresUtilsGui.h" +#include "utils/Gui.h" #include "utils/Logger.h" #include "utils/Qml.h" #include "utils/Retranslator.h" @@ -64,7 +64,7 @@ windowDimensionToPixels( const Calamares::Branding::WindowDimension& u ) } if ( u.unit() == Calamares::Branding::WindowDimensionUnit::Fonties ) { - return static_cast< int >( u.value() * CalamaresUtils::defaultFontHeight() ); + return static_cast< int >( u.value() * Calamares::defaultFontHeight() ); } return 0; } @@ -145,19 +145,18 @@ getWidgetSidebar( Calamares::DebugWindowManager* debug, QHBoxLayout* extraButtons = new QHBoxLayout; sideLayout->addLayout( extraButtons ); - const int defaultFontHeight = CalamaresUtils::defaultFontHeight(); + const int defaultFontHeight = Calamares::defaultFontHeight(); if ( /* About-Calamares Button enabled */ true ) { QPushButton* aboutDialog = new QPushButton; aboutDialog->setObjectName( "aboutButton" ); - aboutDialog->setIcon( CalamaresUtils::defaultPixmap( CalamaresUtils::Information, - CalamaresUtils::Original, - 2 * QSize( defaultFontHeight, defaultFontHeight ) ) ); + aboutDialog->setIcon( Calamares::defaultPixmap( + Calamares::Information, Calamares::Original, 2 * QSize( defaultFontHeight, defaultFontHeight ) ) ); CALAMARES_RETRANSLATE_FOR( - aboutDialog, aboutDialog->setText( QCoreApplication::translate( "calamares-sidebar", "About" ) ); + aboutDialog, aboutDialog->setText( QCoreApplication::translate( "calamares-sidebar", "About", "@button" ) ); aboutDialog->setToolTip( - QCoreApplication::translate( "calamares-sidebar", "Show information about Calamares" ) ); ); + QCoreApplication::translate( "calamares-sidebar", "Show information about Calamares", "@tooltip" ) ); ); extraButtons->addWidget( aboutDialog ); aboutDialog->setFlat( true ); aboutDialog->setCheckable( true ); @@ -167,12 +166,12 @@ getWidgetSidebar( Calamares::DebugWindowManager* debug, { QPushButton* debugWindowBtn = new QPushButton; debugWindowBtn->setObjectName( "debugButton" ); - debugWindowBtn->setIcon( CalamaresUtils::defaultPixmap( - CalamaresUtils::Bugs, CalamaresUtils::Original, 2 * QSize( defaultFontHeight, defaultFontHeight ) ) ); + debugWindowBtn->setIcon( Calamares::defaultPixmap( + Calamares::Bugs, Calamares::Original, 2 * QSize( defaultFontHeight, defaultFontHeight ) ) ); CALAMARES_RETRANSLATE_FOR( - debugWindowBtn, debugWindowBtn->setText( QCoreApplication::translate( "calamares-sidebar", "Debug" ) ); + debugWindowBtn, debugWindowBtn->setText( QCoreApplication::translate( "calamares-sidebar", "Debug", "@button" ) ); debugWindowBtn->setToolTip( - QCoreApplication::translate( "calamares-sidebar", "Show debug information" ) ); ); + QCoreApplication::translate( "calamares-sidebar", "Show debug information", "@tooltip" ) ); ); extraButtons->addWidget( debugWindowBtn ); debugWindowBtn->setFlat( true ); debugWindowBtn->setCheckable( true ); @@ -181,7 +180,7 @@ getWidgetSidebar( Calamares::DebugWindowManager* debug, debug, &Calamares::DebugWindowManager::visibleChanged, debugWindowBtn, &QPushButton::setChecked ); } - CalamaresUtils::unmarginLayout( sideLayout ); + Calamares::unmarginLayout( sideLayout ); return sideBox; } @@ -200,7 +199,7 @@ getWidgetNavigation( Calamares::DebugWindowManager*, { auto* back = new QPushButton( getButtonIcon( QStringLiteral( "go-previous" ) ), - QCoreApplication::translate( CalamaresWindow::staticMetaObject.className(), "&Back" ), + QCoreApplication::translate( CalamaresWindow::staticMetaObject.className(), "&Back", "@button" ), navigation ); back->setObjectName( "view-button-back" ); back->setEnabled( viewManager->backEnabled() ); @@ -216,7 +215,7 @@ getWidgetNavigation( Calamares::DebugWindowManager*, { auto* next = new QPushButton( getButtonIcon( QStringLiteral( "go-next" ) ), - QCoreApplication::translate( CalamaresWindow::staticMetaObject.className(), "&Next" ), + QCoreApplication::translate( CalamaresWindow::staticMetaObject.className(), "&Next", "@button" ), navigation ); next->setObjectName( "view-button-next" ); next->setEnabled( viewManager->nextEnabled() ); @@ -233,7 +232,7 @@ getWidgetNavigation( Calamares::DebugWindowManager*, { auto* quit = new QPushButton( getButtonIcon( QStringLiteral( "dialog-cancel" ) ), - QCoreApplication::translate( CalamaresWindow::staticMetaObject.className(), "&Cancel" ), + QCoreApplication::translate( CalamaresWindow::staticMetaObject.className(), "&Cancel", "@button" ), navigation ); quit->setObjectName( "view-button-cancel" ); QObject::connect( quit, &QPushButton::clicked, viewManager, &Calamares::ViewManager::quit ); @@ -276,7 +275,6 @@ setDimension( QQuickWidget* w, Qt::Orientation o, int desiredWidth ) w->setResizeMode( QQuickWidget::SizeRootObjectToView ); } - static QWidget* getQmlSidebar( Calamares::DebugWindowManager* debug, Calamares::ViewManager*, @@ -284,15 +282,15 @@ getQmlSidebar( Calamares::DebugWindowManager* debug, Qt::Orientation o, int desiredWidth ) { - CalamaresUtils::registerQmlModels(); + Calamares::registerQmlModels(); QQuickWidget* w = new QQuickWidget( parent ); if ( debug ) { w->engine()->rootContext()->setContextProperty( "debug", debug ); } - w->setSource( QUrl( - CalamaresUtils::searchQmlFile( CalamaresUtils::QmlSearch::Both, QStringLiteral( "calamares-sidebar" ) ) ) ); + w->setSource( + QUrl( Calamares::searchQmlFile( Calamares::QmlSearch::Both, QStringLiteral( "calamares-sidebar" ) ) ) ); setDimension( w, o, desiredWidth ); return w; } @@ -304,14 +302,14 @@ getQmlNavigation( Calamares::DebugWindowManager* debug, Qt::Orientation o, int desiredWidth ) { - CalamaresUtils::registerQmlModels(); + Calamares::registerQmlModels(); QQuickWidget* w = new QQuickWidget( parent ); if ( debug ) { w->engine()->rootContext()->setContextProperty( "debug", debug ); } - w->setSource( QUrl( - CalamaresUtils::searchQmlFile( CalamaresUtils::QmlSearch::Both, QStringLiteral( "calamares-navigation" ) ) ) ); + w->setSource( + QUrl( Calamares::searchQmlFile( Calamares::QmlSearch::Both, QStringLiteral( "calamares-navigation" ) ) ) ); setDimension( w, o, desiredWidth ); return w; } @@ -392,7 +390,7 @@ CalamaresWindow::CalamaresWindow( QWidget* parent ) , m_debugManager( new Calamares::DebugWindowManager( this ) ) , m_viewManager( nullptr ) { - installEventFilter( CalamaresUtils::Retranslator::instance() ); + installEventFilter( Calamares::Retranslator::instance() ); // If we can never cancel, don't show the window-close button if ( Calamares::Settings::instance()->disableCancel() ) @@ -400,6 +398,7 @@ CalamaresWindow::CalamaresWindow( QWidget* parent ) setWindowFlag( Qt::WindowCloseButtonHint, false ); } + // %1 is the distribution name CALAMARES_RETRANSLATE( const auto* branding = Calamares::Branding::instance(); setWindowTitle( Calamares::Settings::instance()->isSetupMode() ? tr( "%1 Setup Program" ).arg( branding->productName() ) @@ -408,10 +407,10 @@ CalamaresWindow::CalamaresWindow( QWidget* parent ) const Calamares::Branding* const branding = Calamares::Branding::instance(); using ImageEntry = Calamares::Branding::ImageEntry; - using CalamaresUtils::windowMinimumHeight; - using CalamaresUtils::windowMinimumWidth; - using CalamaresUtils::windowPreferredHeight; - using CalamaresUtils::windowPreferredWidth; + using Calamares::windowMinimumHeight; + using Calamares::windowMinimumWidth; + using Calamares::windowPreferredHeight; + using Calamares::windowPreferredWidth; using PanelSide = Calamares::Branding::PanelSide; @@ -438,7 +437,7 @@ CalamaresWindow::CalamaresWindow( QWidget* parent ) { QWidget* label = new QWidget( this ); QVBoxLayout* l = new QVBoxLayout; - CalamaresUtils::unmarginLayout( l ); + Calamares::unmarginLayout( l ); l->addWidget( label ); setLayout( l ); label->setObjectName( "backgroundWidget" ); @@ -467,14 +466,14 @@ CalamaresWindow::CalamaresWindow( QWidget* parent ) QBoxLayout* contentsLayout = new QVBoxLayout; contentsLayout->setSpacing( 0 ); - QWidget* sideBox = flavoredWidget( - branding->sidebarFlavor(), - ::orientation( branding->sidebarSide() ), - m_debugManager, - baseWidget, - ::getWidgetSidebar, - ::getQmlSidebar, - qBound( 100, CalamaresUtils::defaultFontHeight() * 12, w < windowPreferredWidth ? 100 : 190 ) ); + QWidget* sideBox + = flavoredWidget( branding->sidebarFlavor(), + ::orientation( branding->sidebarSide() ), + m_debugManager, + baseWidget, + ::getWidgetSidebar, + ::getQmlSidebar, + qBound( 100, Calamares::defaultFontHeight() * 12, w < windowPreferredWidth ? 100 : 190 ) ); QWidget* navigation = flavoredWidget( branding->navigationFlavor(), ::orientation( branding->navigationSide() ), m_debugManager, @@ -506,8 +505,8 @@ CalamaresWindow::CalamaresWindow( QWidget* parent ) ( contentsLayout->count() > 1 ? Qt::Orientations( Qt::Horizontal ) : Qt::Orientations() ) | ( mainLayout->count() > 1 ? Qt::Orientations( Qt::Vertical ) : Qt::Orientations() ) ); - CalamaresUtils::unmarginLayout( mainLayout ); - CalamaresUtils::unmarginLayout( contentsLayout ); + Calamares::unmarginLayout( mainLayout ); + Calamares::unmarginLayout( contentsLayout ); baseWidget->setLayout( mainLayout ); setStyleSheet( Calamares::Branding::instance()->stylesheet() ); } diff --git a/src/calamares/DebugWindow.cpp b/src/calamares/DebugWindow.cpp index 826696b4f..7321e9102 100644 --- a/src/calamares/DebugWindow.cpp +++ b/src/calamares/DebugWindow.cpp @@ -21,7 +21,7 @@ #include "VariantModel.h" #include "modulesystem/Module.h" #include "modulesystem/ModuleManager.h" -#include "utils/CalamaresUtilsGui.h" +#include "utils/Gui.h" #include "utils/Logger.h" #include "utils/Paste.h" #include "utils/Retranslator.h" @@ -158,13 +158,12 @@ DebugWindow::DebugWindow() } ); // Send Log button only if it would be useful - m_ui->sendLogButton->setVisible( CalamaresUtils::Paste::isEnabled() ); - connect( m_ui->sendLogButton, &QPushButton::clicked, [ this ]() { CalamaresUtils::Paste::doLogUploadUI( this ); } ); + m_ui->sendLogButton->setVisible( Calamares::Paste::isEnabled() ); + connect( m_ui->sendLogButton, &QPushButton::clicked, [ this ]() { Calamares::Paste::doLogUploadUI( this ); } ); - CALAMARES_RETRANSLATE( m_ui->retranslateUi( this ); setWindowTitle( tr( "Debug information" ) ); ); + CALAMARES_RETRANSLATE( m_ui->retranslateUi( this ); setWindowTitle( tr( "Debug Information", "@title" ) ); ); } - void DebugWindow::closeEvent( QCloseEvent* e ) { @@ -172,13 +171,11 @@ DebugWindow::closeEvent( QCloseEvent* e ) emit closed(); } - DebugWindowManager::DebugWindowManager( QObject* parent ) : QObject( parent ) { } - bool DebugWindowManager::enabled() const { @@ -186,7 +183,6 @@ DebugWindowManager::enabled() const return ( Logger::logLevel() >= Logger::LOGVERBOSE ) || ( s ? s->debugMode() : false ); } - void DebugWindowManager::show( bool visible ) { @@ -236,22 +232,22 @@ void DebugWindowManager::about() { QString title = Calamares::Settings::instance()->isSetupMode() - ? QCoreApplication::translate( "WelcomePage", "About %1 setup" ) - : QCoreApplication::translate( "WelcomePage", "About %1 installer" ); + ? QCoreApplication::translate( "WelcomePage", "About %1 Setup", "@title" ) + : QCoreApplication::translate( "WelcomePage", "About %1 Installer", "@title" ); QMessageBox mb( QMessageBox::Information, title.arg( CALAMARES_APPLICATION_NAME ), Calamares::aboutString().arg( Calamares::Branding::instance()->versionedName() ), QMessageBox::Ok, nullptr ); Calamares::fixButtonLabels( &mb ); - mb.setIconPixmap( CalamaresUtils::defaultPixmap( - CalamaresUtils::Squid, - CalamaresUtils::Original, - QSize( CalamaresUtils::defaultFontHeight() * 6, CalamaresUtils::defaultFontHeight() * 6 ) ) ); + mb.setIconPixmap( + Calamares::defaultPixmap( Calamares::Squid, + Calamares::Original, + QSize( Calamares::defaultFontHeight() * 6, Calamares::defaultFontHeight() * 6 ) ) ); QGridLayout* layout = reinterpret_cast< QGridLayout* >( mb.layout() ); if ( layout ) { - layout->setColumnMinimumWidth( 2, CalamaresUtils::defaultFontHeight() * 24 ); + layout->setColumnMinimumWidth( 2, Calamares::defaultFontHeight() * 24 ); } mb.exec(); } diff --git a/src/calamares/DebugWindow.ui b/src/calamares/DebugWindow.ui index 2547ebd3d..16cc4a48f 100644 --- a/src/calamares/DebugWindow.ui +++ b/src/calamares/DebugWindow.ui @@ -99,7 +99,7 @@ SPDX-License-Identifier: GPL-3.0-or-later - Crashes Calamares, so that Dr. Konqui can look at it. + Crashes Calamares, so that Dr. Konqi can look at it. Crash now diff --git a/src/calamares/main.cpp b/src/calamares/main.cpp index 2b049bdd1..e0491e5f9 100644 --- a/src/calamares/main.cpp +++ b/src/calamares/main.cpp @@ -8,7 +8,6 @@ * */ - #include "CalamaresApplication.h" #include "Settings.h" @@ -93,13 +92,13 @@ handle_args( CalamaresApplication& a ) Logger::setupLogLevel( parser.isSet( debugOption ) ? Logger::LOGVERBOSE : debug_level( parser, debugLevelOption ) ); if ( parser.isSet( configOption ) ) { - CalamaresUtils::setAppDataDir( QDir( parser.value( configOption ) ) ); + Calamares::setAppDataDir( QDir( parser.value( configOption ) ) ); } if ( parser.isSet( xdgOption ) ) { - CalamaresUtils::setXdgDirs(); + Calamares::setXdgDirs(); } - CalamaresUtils::setAllowLocalTranslation( parser.isSet( debugOption ) || parser.isSet( debugTxOption ) ); + Calamares::setAllowLocalTranslation( parser.isSet( debugOption ) || parser.isSet( debugTxOption ) ); return parser.isSet( debugOption ); } diff --git a/src/calamares/progresstree/ProgressTreeDelegate.cpp b/src/calamares/progresstree/ProgressTreeDelegate.cpp index 2117a28ae..df513f28b 100644 --- a/src/calamares/progresstree/ProgressTreeDelegate.cpp +++ b/src/calamares/progresstree/ProgressTreeDelegate.cpp @@ -14,7 +14,7 @@ #include "CalamaresApplication.h" #include "CalamaresWindow.h" #include "ViewManager.h" -#include "utils/CalamaresUtilsGui.h" +#include "utils/Gui.h" #include @@ -22,7 +22,7 @@ static constexpr int const item_margin = 8; static inline int item_fontsize() { - return CalamaresUtils::defaultFontSize() + 4; + return Calamares::defaultFontSize() + 4; } static void @@ -49,7 +49,6 @@ paintViewStep( QPainter* painter, const QStyleOptionViewItem& option, const QMod } } - // Draw the text at least once. If it doesn't fit, then shrink the font // being used by 1 pt on each iteration, up to a maximum of maximumShrink // times. On each loop, we'll have to blank out the rectangle again, so this @@ -100,7 +99,6 @@ ProgressTreeDelegate::sizeHint( const QStyleOptionViewItem& option, const QModel return QSize( option.rect.width(), height ); } - void ProgressTreeDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const { diff --git a/src/calamares/testmain.cpp b/src/calamares/testmain.cpp index 87d90c882..a2175b7d4 100644 --- a/src/calamares/testmain.cpp +++ b/src/calamares/testmain.cpp @@ -38,7 +38,6 @@ #include "utils/Qml.h" #endif - #include #include #include @@ -241,7 +240,6 @@ ExecViewModule::type() const return Module::Type::View; } - Calamares::Module::Interface ExecViewModule::interface() const { @@ -304,7 +302,7 @@ load_module( const ModuleConfig& moduleConfig ) fi = QFileInfo( prefix + moduleName ); if ( fi.exists() && fi.isFile() ) { - descriptor = CalamaresUtils::loadYaml( fi, &ok ); + descriptor = Calamares::YAML::load( fi, &ok ); } if ( ok ) { @@ -318,7 +316,7 @@ load_module( const ModuleConfig& moduleConfig ) fi = QFileInfo( prefix + moduleName + "/module.desc" ); if ( fi.exists() && fi.isFile() ) { - descriptor = CalamaresUtils::loadYaml( fi, &ok ); + descriptor = Calamares::YAML::load( fi, &ok ); } if ( ok ) { @@ -478,7 +476,7 @@ main( int argc, char* argv[] ) } #endif #ifdef WITH_QML - CalamaresUtils::initQmlModulesDir(); // don't care if failed + Calamares::initQmlModulesDir(); // don't care if failed #endif cDebug() << "Calamares module-loader testing" << module.moduleName(); @@ -505,7 +503,7 @@ main( int argc, char* argv[] ) mw = module.m_ui ? new QMainWindow() : nullptr; if ( mw ) { - mw->installEventFilter( CalamaresUtils::Retranslator::instance() ); + mw->installEventFilter( Calamares::Retranslator::instance() ); } (void)new Calamares::Branding( module.m_branding ); diff --git a/src/libcalamares/CMakeLists.txt b/src/libcalamares/CMakeLists.txt index 6436da2fc..2a3d9f641 100644 --- a/src/libcalamares/CMakeLists.txt +++ b/src/libcalamares/CMakeLists.txt @@ -77,7 +77,6 @@ add_library( partition/PartitionSize.cpp partition/Sync.cpp # Utility service - utils/CalamaresUtilsSystem.cpp utils/CommandList.cpp utils/Dirs.cpp utils/Entropy.cpp @@ -88,6 +87,7 @@ add_library( utils/Runner.cpp utils/String.cpp utils/StringExpander.cpp + utils/System.cpp utils/UMask.cpp utils/Variant.cpp utils/Yaml.cpp diff --git a/src/libcalamares/GlobalStorage.cpp b/src/libcalamares/GlobalStorage.cpp index 6064a9fdb..717b8fff7 100644 --- a/src/libcalamares/GlobalStorage.cpp +++ b/src/libcalamares/GlobalStorage.cpp @@ -20,7 +20,7 @@ #include #include -using namespace CalamaresUtils::Units; +using namespace Calamares::Units; namespace Calamares { @@ -52,7 +52,6 @@ GlobalStorage::GlobalStorage( QObject* parent ) { } - bool GlobalStorage::contains( const QString& key ) const { @@ -60,7 +59,6 @@ GlobalStorage::contains( const QString& key ) const return m.contains( key ); } - int GlobalStorage::count() const { @@ -68,7 +66,6 @@ GlobalStorage::count() const return m.count(); } - void GlobalStorage::insert( const QString& key, const QVariant& value ) { @@ -76,7 +73,6 @@ GlobalStorage::insert( const QString& key, const QVariant& value ) m.insert( key, value ); } - QStringList GlobalStorage::keys() const { @@ -84,7 +80,6 @@ GlobalStorage::keys() const return m.keys(); } - int GlobalStorage::remove( const QString& key ) { @@ -93,7 +88,6 @@ GlobalStorage::remove( const QString& key ) return nItems; } - QVariant GlobalStorage::value( const QString& key ) const { @@ -166,14 +160,14 @@ bool GlobalStorage::saveYaml( const QString& filename ) const { ReadLock l( this ); - return CalamaresUtils::saveYaml( filename, m ); + return Calamares::YAML::save( filename, m ); } bool GlobalStorage::loadYaml( const QString& filename ) { bool ok = false; - auto map = CalamaresUtils::loadYaml( filename, &ok ); + auto map = Calamares::YAML::load( filename, &ok ); if ( ok ) { WriteLock l( this ); @@ -189,5 +183,4 @@ GlobalStorage::loadYaml( const QString& filename ) return false; } - } // namespace Calamares diff --git a/src/libcalamares/ProcessJob.cpp b/src/libcalamares/ProcessJob.cpp index da4edd7c2..857078220 100644 --- a/src/libcalamares/ProcessJob.cpp +++ b/src/libcalamares/ProcessJob.cpp @@ -10,7 +10,7 @@ #include "ProcessJob.h" -#include "utils/CalamaresUtilsSystem.h" +#include "utils/System.h" #include "utils/Logger.h" #include @@ -18,7 +18,6 @@ namespace Calamares { - ProcessJob::ProcessJob( const QString& command, const QString& workingPath, bool runInChroot, @@ -32,31 +31,27 @@ ProcessJob::ProcessJob( const QString& command, { } - ProcessJob::~ProcessJob() {} - QString ProcessJob::prettyName() const { return ( m_runInChroot ? tr( "Run command '%1' in target system." ) : tr( " Run command '%1'." ) ).arg( m_command ); } - QString ProcessJob::prettyStatusMessage() const { return tr( "Running command %1 %2" ).arg( m_command ).arg( m_runInChroot ? "in chroot." : " ." ); } - JobResult ProcessJob::exec() { - using CalamaresUtils::System; + using Calamares::System; if ( m_runInChroot ) - return CalamaresUtils::System::instance() + return Calamares::System::instance() ->targetEnvCommand( { m_command }, m_workingPath, QString(), m_timeoutSec ) .explainProcess( m_command, m_timeoutSec ); else diff --git a/src/libcalamares/PythonHelper.cpp b/src/libcalamares/PythonHelper.cpp index e9e2b136c..5a8b5fadb 100644 --- a/src/libcalamares/PythonHelper.cpp +++ b/src/libcalamares/PythonHelper.cpp @@ -23,7 +23,6 @@ namespace bp = boost::python; namespace CalamaresPython { - boost::python::object variantToPyObject( const QVariant& variant ) { @@ -86,7 +85,6 @@ variantToPyObject( const QVariant& variant ) #endif } - QVariant variantFromPyObject( const boost::python::object& pyObject ) { @@ -127,7 +125,6 @@ variantFromPyObject( const boost::python::object& pyObject ) } } - boost::python::list variantListToPyList( const QVariantList& variantList ) { @@ -139,7 +136,6 @@ variantListToPyList( const QVariantList& variantList ) return pyList; } - QVariantList variantListFromPyList( const boost::python::list& pyList ) { @@ -151,7 +147,6 @@ variantListFromPyList( const boost::python::list& pyList ) return list; } - boost::python::dict variantMapToPyDict( const QVariantMap& variantMap ) { @@ -163,7 +158,6 @@ variantMapToPyDict( const QVariantMap& variantMap ) return pyDict; } - QVariantMap variantMapFromPyDict( const boost::python::dict& pyDict ) { @@ -198,7 +192,6 @@ variantHashToPyDict( const QVariantHash& variantHash ) return pyDict; } - QVariantHash variantHashFromPyDict( const boost::python::dict& pyDict ) { @@ -222,7 +215,6 @@ variantHashFromPyDict( const boost::python::dict& pyDict ) return hash; } - static inline void add_if_lib_exists( const QDir& dir, const char* name, QStringList& list ) { @@ -253,7 +245,7 @@ Helper::Helper() // If we're running from the build dir add_if_lib_exists( QDir::current(), "libcalamares.so", m_pythonPaths ); - QDir calaPythonPath( CalamaresUtils::systemLibDir().absolutePath() + QDir::separator() + "calamares" ); + QDir calaPythonPath( Calamares::systemLibDir().absolutePath() + QDir::separator() + "calamares" ); add_if_lib_exists( calaPythonPath, "libcalamares.so", m_pythonPaths ); bp::object sys = bp::import( "sys" ); @@ -290,7 +282,6 @@ Helper::createCleanNamespace() return scriptNamespace; } - QString Helper::handleLastError() { @@ -385,7 +376,6 @@ Helper::handleLastError() return tr( "Unfetchable Python error." ); } - QStringList msgList; if ( !typeMsg.isEmpty() ) { @@ -429,14 +419,12 @@ GlobalStoragePythonWrapper::contains( const std::string& key ) const return m_gs->contains( QString::fromStdString( key ) ); } - int GlobalStoragePythonWrapper::count() const { return m_gs->count(); } - void GlobalStoragePythonWrapper::insert( const std::string& key, const bp::object& value ) { @@ -455,7 +443,6 @@ GlobalStoragePythonWrapper::keys() const return pyList; } - int GlobalStoragePythonWrapper::remove( const std::string& key ) { @@ -467,7 +454,6 @@ GlobalStoragePythonWrapper::remove( const std::string& key ) return m_gs->remove( gsKey ); } - bp::object GlobalStoragePythonWrapper::value( const std::string& key ) const { diff --git a/src/libcalamares/PythonJobApi.cpp b/src/libcalamares/PythonJobApi.cpp index 50a8e82aa..4bae5cdf9 100644 --- a/src/libcalamares/PythonJobApi.cpp +++ b/src/libcalamares/PythonJobApi.cpp @@ -15,7 +15,7 @@ #include "PythonHelper.h" #include "locale/Global.h" #include "partition/Mount.h" -#include "utils/CalamaresUtilsSystem.h" +#include "utils/System.h" #include "utils/Logger.h" #include "utils/RAII.h" #include "utils/Runner.h" @@ -29,7 +29,7 @@ namespace bp = boost::python; static int -handle_check_target_env_call_error( const CalamaresUtils::ProcessResult& ec, const QString& cmd ) +handle_check_target_env_call_error( const Calamares::ProcessResult& ec, const QString& cmd ) { if ( !ec.first ) { @@ -61,12 +61,12 @@ bp_list_to_qstringlist( const bp::list& args ) return list; } -static inline CalamaresUtils::ProcessResult +static inline Calamares::ProcessResult target_env_command( const QStringList& args, const std::string& input, int timeout ) { // Since Python doesn't give us the type system for distinguishing // seconds from other integral types, massage to seconds here. - return CalamaresUtils::System::instance()->targetEnvCommand( + return Calamares::System::instance()->targetEnvCommand( args, QString(), QString::fromStdString( input ), std::chrono::seconds( timeout ) ); } @@ -80,9 +80,9 @@ mount( const std::string& device_path, const std::string& options ) { return Calamares::Partition::mount( QString::fromStdString( device_path ), - QString::fromStdString( mount_point ), - QString::fromStdString( filesystem_name ), - QString::fromStdString( options ) ); + QString::fromStdString( mount_point ), + QString::fromStdString( filesystem_name ), + QString::fromStdString( options ) ); } int @@ -91,14 +91,12 @@ target_env_call( const std::string& command, const std::string& input, int timeo return target_env_command( QStringList { QString::fromStdString( command ) }, input, timeout ).first; } - int target_env_call( const bp::list& args, const std::string& input, int timeout ) { return target_env_command( bp_list_to_qstringlist( args ), input, timeout ).first; } - int check_target_env_call( const std::string& command, const std::string& input, int timeout ) { @@ -106,7 +104,6 @@ check_target_env_call( const std::string& command, const std::string& input, int return handle_check_target_env_call_error( ec, QString::fromStdString( command ) ); } - int check_target_env_call( const bp::list& args, const std::string& input, int timeout ) { @@ -120,7 +117,6 @@ check_target_env_call( const bp::list& args, const std::string& input, int timeo return handle_check_target_env_call_error( ec, failedCmdList.join( ' ' ) ); } - std::string check_target_env_output( const std::string& command, const std::string& input, int timeout ) { @@ -129,7 +125,6 @@ check_target_env_output( const std::string& command, const std::string& input, i return ec.second.toStdString(); } - std::string check_target_env_output( const bp::list& args, const std::string& input, int timeout ) { @@ -169,7 +164,7 @@ load_yaml( const std::string& path ) { const QString filePath = QString::fromStdString( path ); bool ok = false; - auto map = CalamaresUtils::loadYaml( filePath, &ok ); + auto map = Calamares::YAML::load( filePath, &ok ); if ( !ok ) { cWarning() << "Loading YAML from" << filePath << "failed."; @@ -177,7 +172,6 @@ load_yaml( const std::string& path ) return variantMapToPyDict( map ); } - PythonJobInterface::PythonJobInterface( Calamares::PythonJob* parent ) : m_parent( parent ) { @@ -188,7 +182,6 @@ PythonJobInterface::PythonJobInterface( Calamares::PythonJob* parent ) configuration = CalamaresPython::variantMapToPyDict( m_parent->m_configurationMap ); } - void PythonJobInterface::setprogress( qreal progress ) { @@ -259,7 +252,6 @@ host_env_process_output( const boost::python::list& args, return _process_output( Calamares::Utils::RunLocation::RunInHost, args, callback, input, timeout ); } - std::string obscure( const std::string& string ) { @@ -369,5 +361,4 @@ gettext_path() return bp::object(); // None } - } // namespace CalamaresPython diff --git a/src/libcalamares/Settings.cpp b/src/libcalamares/Settings.cpp index 897bc9daa..7b5f85376 100644 --- a/src/libcalamares/Settings.cpp +++ b/src/libcalamares/Settings.cpp @@ -31,7 +31,7 @@ hasValue( const YAML::Node& v ) /** @brief Helper function to grab a QString out of the config, and to warn if not present. */ static QString -requireString( const YAML::Node& config, const char* key ) +requireString( const ::YAML::Node& config, const char* key ) { auto v = config[ key ]; if ( hasValue( v ) ) @@ -47,7 +47,7 @@ requireString( const YAML::Node& config, const char* key ) /** @brief Helper function to grab a bool out of the config, and to warn if not present. */ static bool -requireBool( const YAML::Node& config, const char* key, bool d ) +requireBool( const ::YAML::Node& config, const char* key, bool d ) { auto v = config[ key ]; if ( hasValue( v ) ) @@ -133,7 +133,7 @@ interpretModulesSearch( const bool debugMode, const QStringList& rawPaths, QStri } // Install path is set in CalamaresAddPlugin.cmake - output.append( CalamaresUtils::systemLibDir().absolutePath() + QDir::separator() + "calamares" + output.append( Calamares::systemLibDir().absolutePath() + QDir::separator() + "calamares" + QDir::separator() + "modules" ); } else @@ -152,12 +152,12 @@ interpretModulesSearch( const bool debugMode, const QStringList& rawPaths, QStri } static void -interpretInstances( const YAML::Node& node, Settings::InstanceDescriptionList& customInstances ) +interpretInstances( const ::YAML::Node& node, Settings::InstanceDescriptionList& customInstances ) { // Parse the custom instances section if ( node ) { - QVariant instancesV = CalamaresUtils::yamlToVariant( node ).toList(); + QVariant instancesV = Calamares::YAML::toVariant( node ).toList(); if ( typeOf( instancesV ) == ListVariantType ) { const auto instances = instancesV.toList(); @@ -180,15 +180,15 @@ interpretInstances( const YAML::Node& node, Settings::InstanceDescriptionList& c } static void -interpretSequence( const YAML::Node& node, Settings::ModuleSequence& moduleSequence ) +interpretSequence( const ::YAML::Node& node, Settings::ModuleSequence& moduleSequence ) { // Parse the modules sequence section if ( node ) { - QVariant sequenceV = CalamaresUtils::yamlToVariant( node ); + QVariant sequenceV = Calamares::YAML::toVariant( node ); if ( typeOf( sequenceV ) != ListVariantType ) { - throw YAML::Exception( YAML::Mark(), "sequence key does not have a list-value" ); + throw ::YAML::Exception( ::YAML::Mark(), "sequence key does not have a list-value" ); } const auto sequence = sequenceV.toList(); @@ -231,7 +231,7 @@ interpretSequence( const YAML::Node& node, Settings::ModuleSequence& moduleSeque } else { - throw YAML::Exception( YAML::Mark(), "sequence key is missing" ); + throw ::YAML::Exception( ::YAML::Mark(), "sequence key is missing" ); } } @@ -317,11 +317,12 @@ Settings::setConfiguration( const QByteArray& ba, const QString& explainName ) { try { - YAML::Node config = YAML::Load( ba.constData() ); + // Not using Calamares::YAML:: convenience methods because we **want** the exception here + auto config = ::YAML::Load( ba.constData() ); Q_ASSERT( config.IsMap() ); interpretModulesSearch( - debugMode(), CalamaresUtils::yamlToStringList( config[ "modules-search" ] ), m_modulesSearchPaths ); + debugMode(), Calamares::YAML::toStringList( config[ "modules-search" ] ), m_modulesSearchPaths ); interpretInstances( config[ "instances" ], m_moduleInstances ); interpretSequence( config[ "sequence" ], m_modulesSequence ); @@ -336,9 +337,9 @@ Settings::setConfiguration( const QByteArray& ba, const QString& explainName ) reconcileInstancesAndSequence(); } - catch ( YAML::Exception& e ) + catch ( ::YAML::Exception& e ) { - CalamaresUtils::explainYamlException( e, ba, explainName ); + Calamares::YAML::explainException( e, ba, explainName ); } } @@ -348,21 +349,18 @@ Settings::modulesSearchPaths() const return m_modulesSearchPaths; } - Settings::InstanceDescriptionList Settings::moduleInstances() const { return m_moduleInstances; } - Settings::ModuleSequence Settings::modulesSequence() const { return m_modulesSequence; } - QString Settings::brandingComponentName() const { @@ -375,9 +373,9 @@ settingsFileCandidates( bool assumeBuilddir ) static const char settings[] = "settings.conf"; QStringList settingsPaths; - if ( CalamaresUtils::isAppDataDirOverridden() ) + if ( Calamares::isAppDataDirOverridden() ) { - settingsPaths << CalamaresUtils::appDataDir().absoluteFilePath( settings ); + settingsPaths << Calamares::appDataDir().absoluteFilePath( settings ); } else { @@ -385,13 +383,13 @@ settingsFileCandidates( bool assumeBuilddir ) { settingsPaths << QDir::current().absoluteFilePath( settings ); } - if ( CalamaresUtils::haveExtraDirs() ) - for ( auto s : CalamaresUtils::extraConfigDirs() ) + if ( Calamares::haveExtraDirs() ) + for ( auto s : Calamares::extraConfigDirs() ) { settingsPaths << ( s + settings ); } settingsPaths << CMAKE_INSTALL_FULL_SYSCONFDIR "/calamares/settings.conf"; // String concat - settingsPaths << CalamaresUtils::appDataDir().absoluteFilePath( settings ); + settingsPaths << Calamares::appDataDir().absoluteFilePath( settings ); } return settingsPaths; @@ -426,7 +424,7 @@ Settings::init( bool debugMode ) { cError() << "Cowardly refusing to continue startup without settings." << Logger::DebugList( settingsFileCandidatesByPriority ); - if ( CalamaresUtils::isAppDataDirOverridden() ) + if ( Calamares::isAppDataDirOverridden() ) { cError() << "FATAL: explicitly configured application data directory is missing settings.conf"; } diff --git a/src/libcalamares/geoip/GeoIPJSON.cpp b/src/libcalamares/geoip/GeoIPJSON.cpp index 36788176f..6c75bff9a 100644 --- a/src/libcalamares/geoip/GeoIPJSON.cpp +++ b/src/libcalamares/geoip/GeoIPJSON.cpp @@ -44,14 +44,14 @@ selectMap( const QVariantMap& m, const QStringList& l, int index ) QString attributeName = l[ index ]; if ( index == l.count() - 1 ) { - return CalamaresUtils::getString( m, attributeName ); + return Calamares::getString( m, attributeName ); } else { bool success = false; // bogus if ( m.contains( attributeName ) ) { - return selectMap( CalamaresUtils::getSubMap( m, attributeName, success ), l, index + 1 ); + return selectMap( Calamares::getSubMap( m, attributeName, success ), l, index + 1 ); } return QString(); } @@ -62,9 +62,9 @@ GeoIPJSON::rawReply( const QByteArray& data ) { try { - YAML::Node doc = YAML::Load( data ); + auto doc = ::YAML::Load( data ); - QVariant var = CalamaresUtils::yamlToVariant( doc ); + QVariant var = Calamares::YAML::toVariant( doc ); if ( !var.isNull() && var.isValid() && Calamares::typeOf( var ) == Calamares::MapVariantType ) { return selectMap( var.toMap(), m_element.split( '.' ), 0 ); @@ -74,9 +74,9 @@ GeoIPJSON::rawReply( const QByteArray& data ) cWarning() << "Invalid YAML data for GeoIPJSON"; } } - catch ( YAML::Exception& e ) + catch ( ::YAML::Exception& e ) { - CalamaresUtils::explainYamlException( e, data, "GeoIP data" ); + Calamares::YAML::explainException( e, data, "GeoIP data" ); } return QString(); diff --git a/src/libcalamares/locale/TranslatableConfiguration.cpp b/src/libcalamares/locale/TranslatableConfiguration.cpp index c4742d6c2..937202c4d 100644 --- a/src/libcalamares/locale/TranslatableConfiguration.cpp +++ b/src/libcalamares/locale/TranslatableConfiguration.cpp @@ -38,7 +38,7 @@ TranslatedString::TranslatedString( const QVariantMap& map, const QString& key, : m_context( context ) { // Get the un-decorated value for the key - QString value = CalamaresUtils::getString( map, key ); + QString value = Calamares::getString( map, key ); m_strings[ QString() ] = value; for ( auto it = map.constBegin(); it != map.constEnd(); ++it ) diff --git a/src/libcalamares/modulesystem/Config.cpp b/src/libcalamares/modulesystem/Config.cpp index 68d7b6514..1294c8db0 100644 --- a/src/libcalamares/modulesystem/Config.cpp +++ b/src/libcalamares/modulesystem/Config.cpp @@ -18,14 +18,12 @@ namespace Calamares namespace ModuleSystem { - class Config::Private { public: std::unique_ptr< Presets > m_presets; }; - Config::Config( QObject* parent ) : QObject( parent ) , d( std::make_unique< Private >() ) @@ -55,7 +53,7 @@ Config::isEditable( const QString& fieldName ) const Config::ApplyPresets::ApplyPresets( Calamares::ModuleSystem::Config& c, const QVariantMap& configurationMap ) : m_c( c ) , m_bogus( true ) - , m_map( CalamaresUtils::getSubMap( configurationMap, "presets", m_bogus ) ) + , m_map( Calamares::getSubMap( configurationMap, "presets", m_bogus ) ) { c.m_unlocked = true; if ( !c.d->m_presets ) @@ -113,9 +111,9 @@ Config::ApplyPresets::apply( const char* fieldName ) if ( m_map.contains( key ) ) { // Key has an explicit setting - QVariantMap m = CalamaresUtils::getSubMap( m_map, key, m_bogus ); + QVariantMap m = Calamares::getSubMap( m_map, key, m_bogus ); QVariant value = m[ "value" ]; - bool editable = CalamaresUtils::getBool( m, "editable", true ); + bool editable = Calamares::getBool( m, "editable", true ); if ( value.isValid() ) { diff --git a/src/libcalamares/modulesystem/Descriptor.cpp b/src/libcalamares/modulesystem/Descriptor.cpp index 14fee0371..38c7bd08c 100644 --- a/src/libcalamares/modulesystem/Descriptor.cpp +++ b/src/libcalamares/modulesystem/Descriptor.cpp @@ -92,21 +92,21 @@ Descriptor::fromDescriptorData( const QVariantMap& moduleDesc, const QString& de return d; } - d.m_isEmergeny = CalamaresUtils::getBool( moduleDesc, "emergency", false ); - d.m_hasConfig = !CalamaresUtils::getBool( moduleDesc, "noconfig", false ); // Inverted logic during load - d.m_requiredModules = CalamaresUtils::getStringList( moduleDesc, "requiredModules" ); - d.m_weight = int( CalamaresUtils::getInteger( moduleDesc, "weight", -1 ) ); + d.m_isEmergeny = Calamares::getBool( moduleDesc, "emergency", false ); + d.m_hasConfig = !Calamares::getBool( moduleDesc, "noconfig", false ); // Inverted logic during load + d.m_requiredModules = Calamares::getStringList( moduleDesc, "requiredModules" ); + d.m_weight = int( Calamares::getInteger( moduleDesc, "weight", -1 ) ); QStringList consumedKeys { "type", "interface", "name", "emergency", "noconfig", "requiredModules", "weight" }; switch ( d.interface() ) { case Interface::QtPlugin: - d.m_script = CalamaresUtils::getString( moduleDesc, "load" ); + d.m_script = Calamares::getString( moduleDesc, "load" ); consumedKeys << "load"; break; case Interface::Python: - d.m_script = CalamaresUtils::getString( moduleDesc, "script" ); + d.m_script = Calamares::getString( moduleDesc, "script" ); if ( d.m_script.isEmpty() ) { if ( o ) @@ -119,9 +119,9 @@ Descriptor::fromDescriptorData( const QVariantMap& moduleDesc, const QString& de consumedKeys << "script"; break; case Interface::Process: - d.m_script = CalamaresUtils::getString( moduleDesc, "command" ); - d.m_processTimeout = int( CalamaresUtils::getInteger( moduleDesc, "timeout", 30 ) ); - d.m_processChroot = CalamaresUtils::getBool( moduleDesc, "chroot", false ); + d.m_script = Calamares::getString( moduleDesc, "command" ); + d.m_processTimeout = int( Calamares::getInteger( moduleDesc, "timeout", 30 ) ); + d.m_processChroot = Calamares::getBool( moduleDesc, "chroot", false ); if ( d.m_processTimeout < 0 ) { d.m_processTimeout = 0; diff --git a/src/libcalamares/modulesystem/Module.cpp b/src/libcalamares/modulesystem/Module.cpp index 8fbb05300..0950f0f47 100644 --- a/src/libcalamares/modulesystem/Module.cpp +++ b/src/libcalamares/modulesystem/Module.cpp @@ -51,9 +51,9 @@ moduleConfigurationCandidates( bool assumeBuildDir, const QString& moduleName, c { QStringList paths; - if ( CalamaresUtils::isAppDataDirOverridden() ) + if ( Calamares::isAppDataDirOverridden() ) { - paths << CalamaresUtils::appDataDir().absoluteFilePath( QString( "modules/%1" ).arg( configFileName ) ); + paths << Calamares::appDataDir().absoluteFilePath( QString( "modules/%1" ).arg( configFileName ) ); } else { @@ -73,14 +73,14 @@ moduleConfigurationCandidates( bool assumeBuildDir, const QString& moduleName, c paths << QDir().absoluteFilePath( configFileName ); } - if ( CalamaresUtils::haveExtraDirs() ) - for ( auto s : CalamaresUtils::extraConfigDirs() ) + if ( Calamares::haveExtraDirs() ) + for ( auto s : Calamares::extraConfigDirs() ) { paths << ( s + QString( "modules/%1" ).arg( configFileName ) ); } paths << QString( "/etc/calamares/modules/%1" ).arg( configFileName ); - paths << CalamaresUtils::appDataDir().absoluteFilePath( QString( "modules/%1" ).arg( configFileName ) ); + paths << Calamares::appDataDir().absoluteFilePath( QString( "modules/%1" ).arg( configFileName ) ); } return paths; @@ -98,7 +98,7 @@ Module::loadConfigurationFile( const QString& configFileName ) //throws YAML::E { QByteArray ba = configFile.readAll(); - YAML::Node doc = YAML::Load( ba.constData() ); + auto doc = ::YAML::Load( ba.constData() ); // Throws on error if ( doc.IsNull() ) { cWarning() << "Found empty module configuration" << path; @@ -112,7 +112,7 @@ Module::loadConfigurationFile( const QString& configFileName ) //throws YAML::E return; } - m_configurationMap = CalamaresUtils::yamlMapToVariant( doc ); + m_configurationMap = Calamares::YAML::mapToVariant( doc ); m_emergency = m_maybe_emergency && m_configurationMap.contains( EMERGENCY ) && m_configurationMap[ EMERGENCY ].toBool(); return; @@ -121,7 +121,6 @@ Module::loadConfigurationFile( const QString& configFileName ) //throws YAML::E cWarning() << "No config file for" << name() << "found anywhere at" << Logger::DebugList( configCandidates ); } - QString Module::typeString() const { @@ -130,7 +129,6 @@ Module::typeString() const return ok ? v : QString(); } - QString Module::interfaceString() const { @@ -139,14 +137,12 @@ Module::interfaceString() const return ok ? v : QString(); } - QVariantMap Module::configurationMap() { return m_configurationMap; } - RequirementsList Module::checkRequirements() { diff --git a/src/libcalamares/modulesystem/Preset.cpp b/src/libcalamares/modulesystem/Preset.cpp index 1c5779afe..e980aae08 100644 --- a/src/libcalamares/modulesystem/Preset.cpp +++ b/src/libcalamares/modulesystem/Preset.cpp @@ -23,8 +23,8 @@ loadPresets( Calamares::ModuleSystem::Presets& preset, if ( !it.key().isEmpty() && pred( it.key() ) ) { QVariantMap m = it.value().toMap(); - QString value = CalamaresUtils::getString( m, "value" ); - bool editable = CalamaresUtils::getBool( m, "editable", true ); + QString value = Calamares::getString( m, "value" ); + bool editable = Calamares::getBool( m, "editable", true ); preset.append( Calamares::ModuleSystem::PresetField { it.key(), value, editable } ); diff --git a/src/libcalamares/partition/Mount.cpp b/src/libcalamares/partition/Mount.cpp index 18ec5a935..1cc30c9f9 100644 --- a/src/libcalamares/partition/Mount.cpp +++ b/src/libcalamares/partition/Mount.cpp @@ -12,7 +12,7 @@ #include "Mount.h" #include "partition/Sync.h" -#include "utils/CalamaresUtilsSystem.h" +#include "utils/System.h" #include "utils/Logger.h" #include "utils/String.h" @@ -38,7 +38,7 @@ mount( const QString& devicePath, const QString& mountPoint, const QString& file cWarning() << "Can't mount on an empty mountpoint."; } - return static_cast< int >( CalamaresUtils::ProcessResult::Code::NoWorkingDirectory ); + return static_cast< int >( Calamares::ProcessResult::Code::NoWorkingDirectory ); } QDir mountPointDir( mountPoint ); @@ -48,7 +48,7 @@ mount( const QString& devicePath, const QString& mountPoint, const QString& file if ( !ok ) { cWarning() << "Could not create mountpoint" << mountPoint; - return static_cast< int >( CalamaresUtils::ProcessResult::Code::NoWorkingDirectory ); + return static_cast< int >( Calamares::ProcessResult::Code::NoWorkingDirectory ); } } @@ -71,7 +71,7 @@ mount( const QString& devicePath, const QString& mountPoint, const QString& file } args << devicePath << mountPoint; - auto r = CalamaresUtils::System::runCommand( args, std::chrono::seconds( 10 ) ); + auto r = Calamares::System::runCommand( args, std::chrono::seconds( 10 ) ); sync(); return r.getExitCode(); } @@ -79,8 +79,7 @@ mount( const QString& devicePath, const QString& mountPoint, const QString& file int unmount( const QString& path, const QStringList& options ) { - auto r - = CalamaresUtils::System::runCommand( QStringList { "umount" } << options << path, std::chrono::seconds( 10 ) ); + auto r = Calamares::System::runCommand( QStringList { "umount" } << options << path, std::chrono::seconds( 10 ) ); sync(); return r.getExitCode(); } @@ -91,7 +90,6 @@ struct TemporaryMount::Private QTemporaryDir m_mountDir; }; - TemporaryMount::TemporaryMount( const QString& devicePath, const QString& filesystemName, const QString& options ) : m_d( std::make_unique< Private >() ) { diff --git a/src/libcalamares/partition/PartitionSize.cpp b/src/libcalamares/partition/PartitionSize.cpp index b49198afe..184e8b0b6 100644 --- a/src/libcalamares/partition/PartitionSize.cpp +++ b/src/libcalamares/partition/PartitionSize.cpp @@ -9,7 +9,6 @@ * */ - #include "partition/PartitionSize.h" #include "utils/Logger.h" #include "utils/Units.h" @@ -99,7 +98,7 @@ PartitionSize::toSectors( qint64 totalSectors, qint64 sectorSize ) const case SizeUnit::MiB: case SizeUnit::GB: case SizeUnit::GiB: - return CalamaresUtils::bytesToSectors( toBytes(), sectorSize ); + return Calamares::bytesToSectors( toBytes(), sectorSize ); } return -1; @@ -195,17 +194,17 @@ PartitionSize::toBytes() const case SizeUnit::Byte: return value(); case SizeUnit::KB: - return CalamaresUtils::KBtoBytes( static_cast< unsigned long long >( value() ) ); + return Calamares::KBtoBytes( static_cast< unsigned long long >( value() ) ); case SizeUnit::KiB: - return CalamaresUtils::KiBtoBytes( static_cast< unsigned long long >( value() ) ); + return Calamares::KiBtoBytes( static_cast< unsigned long long >( value() ) ); case SizeUnit::MB: - return CalamaresUtils::MBtoBytes( static_cast< unsigned long long >( value() ) ); + return Calamares::MBtoBytes( static_cast< unsigned long long >( value() ) ); case SizeUnit::MiB: - return CalamaresUtils::MiBtoBytes( static_cast< unsigned long long >( value() ) ); + return Calamares::MiBtoBytes( static_cast< unsigned long long >( value() ) ); case SizeUnit::GB: - return CalamaresUtils::GBtoBytes( static_cast< unsigned long long >( value() ) ); + return Calamares::GBtoBytes( static_cast< unsigned long long >( value() ) ); case SizeUnit::GiB: - return CalamaresUtils::GiBtoBytes( static_cast< unsigned long long >( value() ) ); + return Calamares::GiBtoBytes( static_cast< unsigned long long >( value() ) ); } __builtin_unreachable(); } diff --git a/src/libcalamares/partition/Sync.cpp b/src/libcalamares/partition/Sync.cpp index 99e1c544f..9f2a34220 100644 --- a/src/libcalamares/partition/Sync.cpp +++ b/src/libcalamares/partition/Sync.cpp @@ -10,7 +10,7 @@ #include "Sync.h" -#include "utils/CalamaresUtilsSystem.h" +#include "utils/System.h" #include "utils/Logger.h" void @@ -23,7 +23,7 @@ Calamares::Partition::sync() * either chroot(8) or env(1) is used to run the command, * and they do suitable lookup. */ - auto r = CalamaresUtils::System::runCommand( { "udevadm", "settle" }, std::chrono::seconds( 10 ) ); + auto r = Calamares::System::runCommand( { "udevadm", "settle" }, std::chrono::seconds( 10 ) ); if ( r.getExitCode() != 0 ) { @@ -31,5 +31,5 @@ Calamares::Partition::sync() r.explainProcess( "udevadm", std::chrono::seconds( 10 ) ); } - CalamaresUtils::System::runCommand( { "sync" }, std::chrono::seconds( 10 ) ); + Calamares::System::runCommand( { "sync" }, std::chrono::seconds( 10 ) ); } diff --git a/src/libcalamares/utils/CommandList.cpp b/src/libcalamares/utils/CommandList.cpp index 4d1b3bd0e..0125e8db2 100644 --- a/src/libcalamares/utils/CommandList.cpp +++ b/src/libcalamares/utils/CommandList.cpp @@ -14,7 +14,7 @@ #include "JobQueue.h" #include "compat/Variant.h" -#include "utils/CalamaresUtilsSystem.h" +#include "utils/System.h" #include "utils/Logger.h" #include "utils/StringExpander.h" #include "utils/Variant.h" @@ -22,14 +22,14 @@ #include #include -namespace CalamaresUtils +namespace Calamares { static CommandLine get_variant_object( const QVariantMap& m ) { - QString command = CalamaresUtils::getString( m, "command" ); - qint64 timeout = CalamaresUtils::getInteger( m, "timeout", -1 ); + QString command = Calamares::getString( m, "command" ); + qint64 timeout = Calamares::getInteger( m, "timeout", -1 ); if ( !command.isEmpty() ) { @@ -102,14 +102,13 @@ CommandLine::expand( KMacroExpanderBase& expander ) const return { c, second }; } -CalamaresUtils::CommandLine +Calamares::CommandLine CommandLine::expand() const { auto expander = get_gs_expander( System::RunLocation::RunInHost ); return expand( expander ); } - CommandList::CommandList( bool doChroot, std::chrono::seconds timeout ) : m_doChroot( doChroot ) , m_timeout( timeout ) @@ -220,5 +219,4 @@ CommandList::expand() const return expand( expander ); } - -} // namespace CalamaresUtils +} // namespace Calamares diff --git a/src/libcalamares/utils/CommandList.h b/src/libcalamares/utils/CommandList.h index af23a1f2f..574db489a 100644 --- a/src/libcalamares/utils/CommandList.h +++ b/src/libcalamares/utils/CommandList.h @@ -21,7 +21,7 @@ class KMacroExpanderBase; -namespace CalamaresUtils +namespace Calamares { using CommandLineBase = std::pair< QString, std::chrono::seconds >; @@ -119,5 +119,5 @@ private: std::chrono::seconds m_timeout; }; -} // namespace CalamaresUtils +} // namespace Calamares #endif diff --git a/src/libcalamares/utils/Dirs.cpp b/src/libcalamares/utils/Dirs.cpp index f333d6e64..c42768a08 100644 --- a/src/libcalamares/utils/Dirs.cpp +++ b/src/libcalamares/utils/Dirs.cpp @@ -30,7 +30,7 @@ using std::cerr; -namespace CalamaresUtils +namespace Calamares { static QDir s_appDataDir( CMAKE_INSTALL_FULL_DATADIR ); @@ -69,7 +69,6 @@ isWritableDir( const QDir& dir ) return true; } - void setAppDataDir( const QDir& dir ) { @@ -147,14 +146,12 @@ isAppDataDirOverridden() return s_isAppDataDirOverridden; } - QDir appDataDir() { return s_appDataDir; } - QDir systemLibDir() { @@ -162,7 +159,6 @@ systemLibDir() return path; } - QDir appLogDir() { @@ -184,4 +180,4 @@ appLogDir() return QDir::temp(); } -} // namespace CalamaresUtils +} // namespace Calamares diff --git a/src/libcalamares/utils/Dirs.h b/src/libcalamares/utils/Dirs.h index 445cbe1f1..d0edd7a4f 100644 --- a/src/libcalamares/utils/Dirs.h +++ b/src/libcalamares/utils/Dirs.h @@ -21,7 +21,7 @@ #include -namespace CalamaresUtils +namespace Calamares { /** * @brief appDataDir returns the directory with common application data. @@ -56,6 +56,6 @@ DLLEXPORT bool haveExtraDirs(); DLLEXPORT QStringList extraConfigDirs(); /** @brief XDG_DATA_DIRS, each guaranteed to end with / */ DLLEXPORT QStringList extraDataDirs(); -} // namespace CalamaresUtils +} // namespace Calamares #endif diff --git a/src/libcalamares/utils/Entropy.cpp b/src/libcalamares/utils/Entropy.cpp index 67a0718f5..4d1400c97 100644 --- a/src/libcalamares/utils/Entropy.cpp +++ b/src/libcalamares/utils/Entropy.cpp @@ -15,8 +15,10 @@ #include -CalamaresUtils::EntropySource -CalamaresUtils::getEntropy( int size, QByteArray& b ) +namespace Calamares +{ +EntropySource +getEntropy( int size, QByteArray& b ) { constexpr const char filler = char( 0xcb ); @@ -73,8 +75,8 @@ CalamaresUtils::getEntropy( int size, QByteArray& b ) return EntropySource::Twister; } -CalamaresUtils::EntropySource -CalamaresUtils::getPrintableEntropy( int size, QString& s ) +EntropySource +getPrintableEntropy( int size, QString& s ) { s.clear(); if ( size < 1 ) @@ -117,3 +119,4 @@ CalamaresUtils::getPrintableEntropy( int size, QString& s ) return r; } +} // namespace Calamares diff --git a/src/libcalamares/utils/Entropy.h b/src/libcalamares/utils/Entropy.h index 1ca40a68f..a28c95ce0 100644 --- a/src/libcalamares/utils/Entropy.h +++ b/src/libcalamares/utils/Entropy.h @@ -16,7 +16,7 @@ #include -namespace CalamaresUtils +namespace Calamares { /// @brief Which entropy source was actually used for the entropy. enum class EntropySource @@ -41,6 +41,6 @@ DLLEXPORT EntropySource getEntropy( int size, QByteArray& b ); * @see getEntropy */ DLLEXPORT EntropySource getPrintableEntropy( int size, QString& s ); -} // namespace CalamaresUtils +} // namespace Calamares #endif diff --git a/src/libcalamares/utils/Logger.cpp b/src/libcalamares/utils/Logger.cpp index 33a67f59d..15b6d65d0 100644 --- a/src/libcalamares/utils/Logger.cpp +++ b/src/libcalamares/utils/Logger.cpp @@ -44,7 +44,6 @@ static QMutex s_mutex; static const char s_Continuation[] = "\n "; static const char s_SubEntry[] = " .. "; - namespace Logger { @@ -109,7 +108,6 @@ log_implementation( const char* msg, unsigned int debugLevel, const bool withTim } } - static void CalamaresLogHandler( QtMsgType type, const QMessageLogContext&, const QString& msg ) { @@ -139,14 +137,12 @@ CalamaresLogHandler( QtMsgType type, const QMessageLogContext&, const QString& m log_implementation( msg.toUtf8().constData(), level, true ); } - QString logFile() { - return CalamaresUtils::appLogDir().filePath( "session.log" ); + return Calamares::appLogDir().filePath( "session.log" ); } - void setupLogfile() { @@ -202,7 +198,6 @@ CDebug::CDebug( unsigned int debugLevel, const char* func ) } } - CDebug::~CDebug() { if ( log_enabled( m_debugLevel ) ) diff --git a/src/libcalamares/utils/NamedSuffix.h b/src/libcalamares/utils/NamedSuffix.h index 84094e90c..85ce11f2c 100644 --- a/src/libcalamares/utils/NamedSuffix.h +++ b/src/libcalamares/utils/NamedSuffix.h @@ -73,7 +73,6 @@ public: } } - /** @brief Construct value from string. * * This is not defined in the template, because it should probably diff --git a/src/libcalamares/utils/Permissions.cpp b/src/libcalamares/utils/Permissions.cpp index 789746843..f6aad5e37 100644 --- a/src/libcalamares/utils/Permissions.cpp +++ b/src/libcalamares/utils/Permissions.cpp @@ -7,7 +7,7 @@ #include "Permissions.h" -#include "CalamaresUtilsSystem.h" +#include "System.h" #include "Logger.h" #include @@ -15,7 +15,7 @@ #include -namespace CalamaresUtils +namespace Calamares { Permissions::Permissions() @@ -26,7 +26,6 @@ Permissions::Permissions() { } - Permissions::Permissions( QString const& p ) : Permissions() { @@ -91,7 +90,7 @@ Permissions::apply( const QString& path, int mode ) } bool -Permissions::apply( const QString& path, const CalamaresUtils::Permissions& p ) +Permissions::apply( const QString& path, const Calamares::Permissions& p ) { if ( !p.isValid() ) { @@ -105,8 +104,8 @@ Permissions::apply( const QString& path, const CalamaresUtils::Permissions& p ) // uid_t and gid_t values to pass to that system call. // // Do a lame cop-out and let the chown(8) utility do the heavy lifting. - if ( CalamaresUtils::System::runCommand( { "chown", p.username() + ':' + p.group(), path }, - std::chrono::seconds( 3 ) ) + if ( Calamares::System::runCommand( { "chown", p.username() + ':' + p.group(), path }, + std::chrono::seconds( 3 ) ) .getExitCode() ) { r = false; @@ -121,5 +120,4 @@ Permissions::apply( const QString& path, const CalamaresUtils::Permissions& p ) return r; } - -} // namespace CalamaresUtils +} // namespace Calamares diff --git a/src/libcalamares/utils/Permissions.h b/src/libcalamares/utils/Permissions.h index 11d1d4bab..90f94179d 100644 --- a/src/libcalamares/utils/Permissions.h +++ b/src/libcalamares/utils/Permissions.h @@ -12,7 +12,7 @@ #include -namespace CalamaresUtils +namespace Calamares { /** @@ -90,6 +90,6 @@ private: bool m_valid; }; -} // namespace CalamaresUtils +} // namespace Calamares #endif // LIBCALAMARES_PERMISSIONS_H diff --git a/src/libcalamares/utils/Retranslator.cpp b/src/libcalamares/utils/Retranslator.cpp index 5af975002..cb71c4ea9 100644 --- a/src/libcalamares/utils/Retranslator.cpp +++ b/src/libcalamares/utils/Retranslator.cpp @@ -88,7 +88,6 @@ BrandingLoader::tryLoad( QTranslator* translator ) QString filenameBase( m_prefix ); filenameBase.remove( 0, lastDirSeparator + 1 ); - if ( QDir( brandingTranslationsDirPath ).exists() ) { const QString fileName = QStringLiteral( "%1_%2" ).arg( filenameBase, m_localeName ); @@ -119,7 +118,7 @@ tryLoad( QTranslator* translator, const QString& prefix, const QString& localeNa } // Or load from appDataDir -- often /usr/share/calamares -- subdirectory land/ - QDir localeData( CalamaresUtils::appDataDir() ); + QDir localeData( Calamares::appDataDir() ); if ( localeData.exists() && translator->load( localeData.absolutePath() + QStringLiteral( "/lang/" ) + prefix + localeName ) ) { @@ -170,7 +169,7 @@ loadSingletonTranslator( TranslationLoader&& loader, QTranslator*& translator_p } // namespace -namespace CalamaresUtils +namespace Calamares { static QTranslator* s_brandingTranslator = nullptr; static QTranslator* s_translator = nullptr; @@ -241,5 +240,4 @@ setAllowLocalTranslation( bool allow ) s_allowLocalTranslations = allow; } - -} // namespace CalamaresUtils +} // namespace Calamares diff --git a/src/libcalamares/utils/Retranslator.h b/src/libcalamares/utils/Retranslator.h index 33106d4c8..ac2b022cb 100644 --- a/src/libcalamares/utils/Retranslator.h +++ b/src/libcalamares/utils/Retranslator.h @@ -23,7 +23,7 @@ class QEvent; class QLocale; class QTranslator; -namespace CalamaresUtils +namespace Calamares { /** @brief changes the application language. * @param locale the new locale (names as defined by Calamares). @@ -69,7 +69,6 @@ loadTranslator( const Calamares::Locale::Translation::Id& locale, const QString& */ DLLEXPORT void setAllowLocalTranslation( bool allow ); - /** @brief Handles change-of-language events * * There is one single Retranslator object. Use `instance()` to get it. @@ -102,8 +101,7 @@ private: explicit Retranslator( QObject* parent ); }; - -} // namespace CalamaresUtils +} // namespace Calamares /** @brief Call code for this object when language changes * @@ -116,7 +114,7 @@ private: * immediately after setting up the connection. This allows * setup and translation code to be mixed together. */ -#define CALAMARES_RETRANSLATE( body ) CalamaresUtils::Retranslator::attach( this, [ = ] { body } ) +#define CALAMARES_RETRANSLATE( body ) Calamares::Retranslator::attach( this, [ = ] { body } ) /** @brief Call code for the given object (widget) when language changes * * This is identical to CALAMARES_RETRANSLATE, except the @p body is called @@ -126,7 +124,7 @@ private: * immediately after setting up the connection. This allows * setup and translation code to be mixed together. */ -#define CALAMARES_RETRANSLATE_FOR( object, body ) CalamaresUtils::Retranslator::attach( object, [ = ] { body } ) +#define CALAMARES_RETRANSLATE_FOR( object, body ) Calamares::Retranslator::attach( object, [ = ] { body } ) /** @brief Call a slot in this object when language changes * * Given a slot (in method-function-pointer notation), call that slot when the @@ -140,10 +138,7 @@ private: #define CALAMARES_RETRANSLATE_SLOT( slotfunc ) \ do \ { \ - connect( CalamaresUtils::Retranslator::instance(), \ - &CalamaresUtils::Retranslator::languageChanged, \ - this, \ - slotfunc ); \ + connect( Calamares::Retranslator::instance(), &Calamares::Retranslator::languageChanged, this, slotfunc ); \ ( this->*slotfunc )(); \ } while ( false ) diff --git a/src/libcalamares/utils/Runner.cpp b/src/libcalamares/utils/Runner.cpp index d45836334..632f32028 100644 --- a/src/libcalamares/utils/Runner.cpp +++ b/src/libcalamares/utils/Runner.cpp @@ -41,7 +41,6 @@ relativeChangeDirectory( QDir& directory, const QString& subdir ) return directory.cd( relPath ); } - STATICTEST std::pair< bool, QDir > calculateWorkingDirectory( Calamares::Utils::RunLocation location, const QString& directory ) { @@ -98,11 +97,9 @@ namespace Utils Runner::Runner() {} - } // namespace Utils } // namespace Calamares - Calamares::Utils::Runner::Runner( const QStringList& command ) { setCommand( command ); diff --git a/src/libcalamares/utils/Runner.h b/src/libcalamares/utils/Runner.h index 155375bbe..d6adf3bdd 100644 --- a/src/libcalamares/utils/Runner.h +++ b/src/libcalamares/utils/Runner.h @@ -11,7 +11,7 @@ #ifndef UTILS_RUNNER_H #define UTILS_RUNNER_H -#include "CalamaresUtilsSystem.h" +#include "System.h" #include #include @@ -26,8 +26,8 @@ namespace Calamares namespace Utils { -using RunLocation = CalamaresUtils::System::RunLocation; -using ProcessResult = CalamaresUtils::ProcessResult; +using RunLocation = Calamares::System::RunLocation; +using ProcessResult = Calamares::ProcessResult; /** @brief A Runner wraps a process and handles running it and processing output * diff --git a/src/libcalamares/utils/String.cpp b/src/libcalamares/utils/String.cpp index f1708d5a3..88583f5e8 100644 --- a/src/libcalamares/utils/String.cpp +++ b/src/libcalamares/utils/String.cpp @@ -86,8 +86,7 @@ removeDiacritics( const QString& string ) return output; } - -// Function CalamaresUtils::obscure based on KStringHandler::obscure, +// Function Calamares::obscure based on KStringHandler::obscure, // part of KDElibs by KDE, file kstringhandler.cpp. // Original copyright statement follows. /* This file is part of the KDE libraries @@ -124,7 +123,6 @@ obscure( const QString& string ) return result; } - QString truncateMultiLine( const QString& string, LinesStartEnd lines, CharCount chars ) { diff --git a/src/libcalamares/utils/StringExpander.cpp b/src/libcalamares/utils/StringExpander.cpp index 38093869d..321ae2110 100644 --- a/src/libcalamares/utils/StringExpander.cpp +++ b/src/libcalamares/utils/StringExpander.cpp @@ -34,10 +34,8 @@ DictionaryExpander::DictionaryExpander( Calamares::String::DictionaryExpander&& { } - DictionaryExpander::~DictionaryExpander() {} - void DictionaryExpander::insert( const QString& key, const QString& value ) { diff --git a/src/libcalamares/utils/StringExpander.h b/src/libcalamares/utils/StringExpander.h index 4cea6756d..e0b21bee8 100644 --- a/src/libcalamares/utils/StringExpander.h +++ b/src/libcalamares/utils/StringExpander.h @@ -25,7 +25,6 @@ namespace Calamares namespace String { - /** @brief Expand variables in a string against a dictionary. * * This class provides a convenience API for building up a dictionary diff --git a/src/libcalamares/utils/CalamaresUtilsSystem.cpp b/src/libcalamares/utils/System.cpp similarity index 98% rename from src/libcalamares/utils/CalamaresUtilsSystem.cpp rename to src/libcalamares/utils/System.cpp index 7622b006d..7e5e72dd7 100644 --- a/src/libcalamares/utils/CalamaresUtilsSystem.cpp +++ b/src/libcalamares/utils/System.cpp @@ -9,7 +9,7 @@ * */ -#include "CalamaresUtilsSystem.h" +#include "System.h" #include "GlobalStorage.h" #include "JobQueue.h" @@ -32,12 +32,11 @@ // clang-format on #endif -namespace CalamaresUtils +namespace Calamares { System* System::s_instance = nullptr; - System::System( bool doChroot, QObject* parent ) : QObject( parent ) , m_doChroot( doChroot ) @@ -50,10 +49,8 @@ System::System( bool doChroot, QObject* parent ) } } - System::~System() {} - System* System::instance() { @@ -66,7 +63,6 @@ System::instance() return s_instance; } - ProcessResult System::runCommand( System::RunLocation location, const QStringList& args, @@ -229,7 +225,6 @@ System::createTargetParentDirs( const QString& filePath ) const return createTargetDirs( QFileInfo( filePath ).dir().path() ); } - QPair< quint64, qreal > System::getTotalMemoryB() const { @@ -259,7 +254,6 @@ System::getTotalMemoryB() const #endif } - QString System::getCpuDescription() const { @@ -342,4 +336,4 @@ ProcessResult::explainProcess( int ec, const QString& command, const QString& ou + outputMessage ); } -} // namespace CalamaresUtils +} // namespace Calamares diff --git a/src/libcalamares/utils/CalamaresUtilsSystem.h b/src/libcalamares/utils/System.h similarity index 99% rename from src/libcalamares/utils/CalamaresUtilsSystem.h rename to src/libcalamares/utils/System.h index f4f5257c4..8385287cf 100644 --- a/src/libcalamares/utils/CalamaresUtilsSystem.h +++ b/src/libcalamares/utils/System.h @@ -21,7 +21,7 @@ #include -namespace CalamaresUtils +namespace Calamares { class ProcessResult : public QPair< int, QString > { @@ -234,7 +234,6 @@ public: return targetEnvOutput( QStringList { command }, output, workingPath, stdInput, timeoutSec ); } - /** @brief Gets a path to a file in the target system, from the host. * * @param path Path to the file; this is interpreted @@ -361,6 +360,6 @@ private: bool m_doChroot; }; -} // namespace CalamaresUtils +} // namespace Calamares #endif diff --git a/src/libcalamares/utils/TestPaths.cpp b/src/libcalamares/utils/TestPaths.cpp index 54c5fa859..db1808843 100644 --- a/src/libcalamares/utils/TestPaths.cpp +++ b/src/libcalamares/utils/TestPaths.cpp @@ -9,7 +9,7 @@ * */ -#include "CalamaresUtilsSystem.h" +#include "System.h" #include "Entropy.h" #include "Logger.h" #include "UMask.h" @@ -41,7 +41,7 @@ private Q_SLOTS: void testCreateTargetBasedirs(); private: - CalamaresUtils::System* m_system = nullptr; // Points to singleton instance, not owned + Calamares::System* m_system = nullptr; // Points to singleton instance, not owned Calamares::GlobalStorage* m_gs = nullptr; }; @@ -54,7 +54,7 @@ TestPaths::initTestCase() Logger::setupLogLevel( Logger::LOGDEBUG ); // Ensure we have a system object, expect it to be a "bogus" one - CalamaresUtils::System* system = CalamaresUtils::System::instance(); + Calamares::System* system = Calamares::System::instance(); QVERIFY( system ); QVERIFY( system->doChroot() ); @@ -88,11 +88,11 @@ TestPaths::init() void TestPaths::testCreationResult() { - using Code = CalamaresUtils::CreationResult::Code; + using Code = Calamares::CreationResult::Code; for ( auto c : { Code::OK, Code::AlreadyExists, Code::Failed, Code::Invalid } ) { - auto r = CalamaresUtils::CreationResult( c ); + auto r = Calamares::CreationResult( c ); QVERIFY( r.path().isEmpty() ); QCOMPARE( r.path(), QString() ); // Get a warning from Clang if we're not covering everything @@ -115,14 +115,13 @@ TestPaths::testCreationResult() } QString path( "/etc/os-release" ); - auto r = CalamaresUtils::CreationResult( path ); + auto r = Calamares::CreationResult( path ); QVERIFY( !r.failed() ); QVERIFY( r ); QCOMPARE( r.code(), Code::OK ); QCOMPARE( r.path(), path ); } - void TestPaths::testTargetPath() { @@ -140,7 +139,6 @@ TestPaths::testTargetPath() QCOMPARE( m_system->targetPath( QString() ), QString() ); // Without root, no path } - void TestPaths::testCreateTarget() { @@ -170,7 +168,6 @@ struct GSRollback QVariant m_value; }; - void TestPaths::testCreateTargetExists() { @@ -211,14 +208,14 @@ TestPaths::testCreateTargetOverwrite() QVERIFY( r.path().endsWith( QString( ltestFile ) ) ); QCOMPARE( QFileInfo( d.filePath( QString( ltestFile ) ) ).size(), 5 ); - r = m_system->createTargetFile( ltestFile, "Goodbye", CalamaresUtils::System::WriteMode::KeepExisting ); + r = m_system->createTargetFile( ltestFile, "Goodbye", Calamares::System::WriteMode::KeepExisting ); QVERIFY( !r.failed() ); // It didn't fail! QVERIFY( !r ); // But not unqualified success, either QVERIFY( r.path().isEmpty() ); QCOMPARE( QFileInfo( d.filePath( QString( ltestFile ) ) ).size(), 5 ); // Unchanged! - r = m_system->createTargetFile( ltestFile, "Goodbye", CalamaresUtils::System::WriteMode::Overwrite ); + r = m_system->createTargetFile( ltestFile, "Goodbye", Calamares::System::WriteMode::Overwrite ); QVERIFY( !r.failed() ); // It didn't fail! QVERIFY( r ); // Total success @@ -226,7 +223,6 @@ TestPaths::testCreateTargetOverwrite() QCOMPARE( QFileInfo( d.filePath( QString( ltestFile ) ) ).size(), 7 ); } - struct DirRemover { DirRemover( const QString& base, const QString& dir ) diff --git a/src/libcalamares/utils/Tests.cpp b/src/libcalamares/utils/Tests.cpp index 544652398..fdf7a6f9d 100644 --- a/src/libcalamares/utils/Tests.cpp +++ b/src/libcalamares/utils/Tests.cpp @@ -9,7 +9,7 @@ * */ -#include "CalamaresUtilsSystem.h" +#include "System.h" #include "CommandList.h" #include "Entropy.h" #include "Logger.h" @@ -150,7 +150,7 @@ LibCalamaresTests::testLoadSaveYaml() cDebug() << QDir().absolutePath() << f.fileName() << f.exists(); QVERIFY( f.exists() ); - auto map = CalamaresUtils::loadYaml( f.fileName() ); + auto map = Calamares::YAML::load( f.fileName() ); QVERIFY( map.contains( "sequence" ) ); QCOMPARE( Calamares::typeOf( map[ "sequence" ] ), Calamares::ListVariantType ); @@ -164,10 +164,10 @@ LibCalamaresTests::testLoadSaveYaml() QVERIFY( v.toMap().contains( "show" ) || v.toMap().contains( "exec" ) ); } - CalamaresUtils::saveYaml( "out.yaml", map ); + Calamares::YAML::save( "out.yaml", map ); - auto other_map = CalamaresUtils::loadYaml( "out.yaml" ); - CalamaresUtils::saveYaml( "out2.yaml", other_map ); + auto other_map = Calamares::YAML::load( "out.yaml" ); + Calamares::YAML::save( "out2.yaml", other_map ); QCOMPARE( map, other_map ); QFile::remove( "out.yaml" ); @@ -222,7 +222,6 @@ LibCalamaresTests::recursiveCompareMap( const QVariantMap& a, const QVariantMap& } } - void LibCalamaresTests::testLoadSaveYamlExtended() { @@ -232,10 +231,10 @@ LibCalamaresTests::testLoadSaveYamlExtended() { loaded_ok = true; cDebug() << "Testing" << confname; - auto map = CalamaresUtils::loadYaml( confname, &loaded_ok ); + auto map = Calamares::YAML::load( confname, &loaded_ok ); QVERIFY( loaded_ok ); - QVERIFY( CalamaresUtils::saveYaml( "out.yaml", map ) ); - auto othermap = CalamaresUtils::loadYaml( "out.yaml", &loaded_ok ); + QVERIFY( Calamares::YAML::save( "out.yaml", map ) ); + auto othermap = Calamares::YAML::load( "out.yaml", &loaded_ok ); QVERIFY( loaded_ok ); QCOMPARE( map.keys(), othermap.keys() ); recursiveCompareMap( map, othermap, 0 ); @@ -247,7 +246,7 @@ LibCalamaresTests::testLoadSaveYamlExtended() void LibCalamaresTests::testCommands() { - using CalamaresUtils::System; + using Calamares::System; auto r = System::runCommand( System::RunLocation::RunInHost, { "/bin/ls", "/tmp" } ); QVERIFY( r.getExitCode() == 0 ); @@ -292,8 +291,8 @@ LibCalamaresTests::testCommandExpansion() QFETCH( QString, command ); QFETCH( QString, expected ); - CalamaresUtils::CommandLine c( command, std::chrono::seconds( 0 ) ); - CalamaresUtils::CommandLine e = c.expand(); + Calamares::CommandLine c( command, std::chrono::seconds( 0 ) ); + Calamares::CommandLine e = c.expand(); QCOMPARE( c.command(), command ); QCOMPARE( e.command(), expected ); @@ -309,13 +308,13 @@ LibCalamaresTests::testUmask() // m gets the previous value of the mask (depends on the environment the // test is run in, might be 002, might be 077), .. - mode_t m = CalamaresUtils::setUMask( 022 ); - QCOMPARE( CalamaresUtils::setUMask( m ), mode_t( 022 ) ); // But now most recently set was 022 + mode_t m = Calamares::setUMask( 022 ); + QCOMPARE( Calamares::setUMask( m ), mode_t( 022 ) ); // But now most recently set was 022 for ( mode_t i = 0; i <= 0777 /* octal! */; ++i ) { QByteArray name = ( ft.fileName() + QChar( '.' ) + QString::number( i, 8 ) ).toLatin1(); - CalamaresUtils::UMask um( i ); + Calamares::UMask um( i ); int fd = creat( name, 0777 ); QVERIFY( fd >= 0 ); close( fd ); @@ -325,8 +324,8 @@ LibCalamaresTests::testUmask() QCOMPARE( mystat.st_mode & 0777, 0777 & ~i ); QCOMPARE( unlink( name ), 0 ); } - QCOMPARE( CalamaresUtils::setUMask( 022 ), m ); - QCOMPARE( CalamaresUtils::setUMask( m ), mode_t( 022 ) ); + QCOMPARE( Calamares::setUMask( 022 ), m ); + QCOMPARE( Calamares::setUMask( m ), mode_t( 022 ) ); } void @@ -334,18 +333,18 @@ LibCalamaresTests::testEntropy() { QByteArray data; - auto r0 = CalamaresUtils::getEntropy( 0, data ); - QCOMPARE( CalamaresUtils::EntropySource::None, r0 ); + auto r0 = Calamares::getEntropy( 0, data ); + QCOMPARE( Calamares::EntropySource::None, r0 ); QCOMPARE( data.size(), 0 ); - auto r1 = CalamaresUtils::getEntropy( 16, data ); - QVERIFY( r1 != CalamaresUtils::EntropySource::None ); + auto r1 = Calamares::getEntropy( 16, data ); + QVERIFY( r1 != Calamares::EntropySource::None ); QCOMPARE( data.size(), 16 ); // This can randomly fail (but not often) QVERIFY( data.at( data.size() - 1 ) != char( 0xcb ) ); - auto r2 = CalamaresUtils::getEntropy( 8, data ); - QVERIFY( r2 != CalamaresUtils::EntropySource::None ); + auto r2 = Calamares::getEntropy( 8, data ); + QVERIFY( r2 != Calamares::EntropySource::None ); QCOMPARE( data.size(), 8 ); QCOMPARE( r1, r2 ); // This can randomly fail (but not often) @@ -357,12 +356,12 @@ LibCalamaresTests::testPrintableEntropy() { QString s; - auto r0 = CalamaresUtils::getPrintableEntropy( 0, s ); - QCOMPARE( CalamaresUtils::EntropySource::None, r0 ); + auto r0 = Calamares::getPrintableEntropy( 0, s ); + QCOMPARE( Calamares::EntropySource::None, r0 ); QCOMPARE( s.length(), 0 ); - auto r1 = CalamaresUtils::getPrintableEntropy( 16, s ); - QVERIFY( r1 != CalamaresUtils::EntropySource::None ); + auto r1 = Calamares::getPrintableEntropy( 16, s ); + QVERIFY( r1 != Calamares::EntropySource::None ); QCOMPARE( s.length(), 16 ); for ( QChar c : s ) { @@ -379,14 +378,14 @@ LibCalamaresTests::testOddSizedPrintable() QString s; for ( int l = 0; l <= 37; ++l ) { - auto r = CalamaresUtils::getPrintableEntropy( l, s ); + auto r = Calamares::getPrintableEntropy( l, s ); if ( l == 0 ) { - QCOMPARE( r, CalamaresUtils::EntropySource::None ); + QCOMPARE( r, Calamares::EntropySource::None ); } else { - QVERIFY( r != CalamaresUtils::EntropySource::None ); + QVERIFY( r != Calamares::EntropySource::None ); } QCOMPARE( s.length(), l ); @@ -443,7 +442,6 @@ LibCalamaresTests::testPointerSetter() QCOMPARE( special, 34 ); } - /* Demonstration of Traits support for has-a-method or not. * * We have two classes, c1 and c2; one has a method do_the_thing() and the @@ -484,7 +482,6 @@ public: } }; - void LibCalamaresTests::testTraits() { @@ -507,7 +504,7 @@ LibCalamaresTests::testTraits() void LibCalamaresTests::testVariantStringListCode() { - using namespace CalamaresUtils; + using namespace Calamares; const QString key( "strings" ); { // Things that are not stringlists @@ -547,7 +544,7 @@ LibCalamaresTests::testVariantStringListCode() void LibCalamaresTests::testVariantStringListYAMLDashed() { - using namespace CalamaresUtils; + using namespace Calamares; const QString key( "strings" ); // Looks like a stringlist to me @@ -561,7 +558,7 @@ LibCalamaresTests::testVariantStringListYAMLDashed() )" ); f.close(); bool ok = false; - QVariantMap m = loadYaml( f.fileName(), &ok ); + QVariantMap m = Calamares::YAML::load( f.fileName(), &ok ); QVERIFY( ok ); QCOMPARE( m.count(), 1 ); @@ -575,7 +572,7 @@ LibCalamaresTests::testVariantStringListYAMLDashed() void LibCalamaresTests::testVariantStringListYAMLBracketed() { - using namespace CalamaresUtils; + using namespace Calamares; const QString key( "strings" ); // Looks like a stringlist to me @@ -586,7 +583,7 @@ LibCalamaresTests::testVariantStringListYAMLBracketed() )" ); f.close(); bool ok = false; - QVariantMap m = loadYaml( f.fileName(), &ok ); + QVariantMap m = Calamares::YAML::load( f.fileName(), &ok ); QVERIFY( ok ); QCOMPARE( m.count(), 1 ); @@ -686,7 +683,6 @@ LibCalamaresTests::testStringTruncationShorter() using namespace Calamares::String; - // *INDENT-OFF* const QString longString( R"(Some strange string artifacts appeared, leading to `{1?}` being displayed in various user-facing messages. These have been removed @@ -1034,24 +1030,24 @@ LibCalamaresTests::testCalculateWorkingDirectory() gs->insert( "rootMountPoint", tempRoot.path() ); { - auto [ ok, d ] = calculateWorkingDirectory( CalamaresUtils::System::RunLocation::RunInHost, QString() ); + auto [ ok, d ] = calculateWorkingDirectory( Calamares::System::RunLocation::RunInHost, QString() ); QVERIFY( ok ); QCOMPARE( d, QDir::current() ); } { - auto [ ok, d ] = calculateWorkingDirectory( CalamaresUtils::System::RunLocation::RunInTarget, QString() ); + auto [ ok, d ] = calculateWorkingDirectory( Calamares::System::RunLocation::RunInTarget, QString() ); QVERIFY( ok ); QCOMPARE( d.absolutePath(), tempRoot.path() ); } gs->remove( "rootMountPoint" ); { - auto [ ok, d ] = calculateWorkingDirectory( CalamaresUtils::System::RunLocation::RunInHost, QString() ); + auto [ ok, d ] = calculateWorkingDirectory( Calamares::System::RunLocation::RunInHost, QString() ); QVERIFY( ok ); QCOMPARE( d, QDir::current() ); } { - auto [ ok, d ] = calculateWorkingDirectory( CalamaresUtils::System::RunLocation::RunInTarget, QString() ); + auto [ ok, d ] = calculateWorkingDirectory( Calamares::System::RunLocation::RunInTarget, QString() ); QVERIFY( !ok ); QCOMPARE( d, QDir::current() ); } @@ -1121,14 +1117,13 @@ LibCalamaresTests::testRunnerOutput() } } - -CalamaresUtils::System* +Calamares::System* file_setup( const QTemporaryDir& tempRoot ) { - CalamaresUtils::System* ss = CalamaresUtils::System::instance(); + Calamares::System* ss = Calamares::System::instance(); if ( !ss ) { - ss = new CalamaresUtils::System( true ); + ss = new Calamares::System( true ); } Calamares::GlobalStorage* gs @@ -1157,7 +1152,7 @@ LibCalamaresTests::testReadWriteFile() QVERIFY( ss ); { - auto fullPath = ss->createTargetFile( "test0", QByteArray(), CalamaresUtils::System::WriteMode::Overwrite ); + auto fullPath = ss->createTargetFile( "test0", QByteArray(), Calamares::System::WriteMode::Overwrite ); QVERIFY( fullPath ); QVERIFY( !fullPath.path().isEmpty() ); @@ -1180,7 +1175,7 @@ LibCalamaresTests::testReadWriteFile() } // But it will if you say so explicitly { - auto fullPath = ss->createTargetFile( "test0", otherContents, CalamaresUtils::System::WriteMode::Overwrite ); + auto fullPath = ss->createTargetFile( "test0", otherContents, Calamares::System::WriteMode::Overwrite ); QVERIFY( fullPath ); QVERIFY( !fullPath.path().isEmpty() ); @@ -1200,7 +1195,6 @@ LibCalamaresTests::testReadWriteFile() } } - QTEST_GUILESS_MAIN( LibCalamaresTests ) #include "utils/moc-warnings.h" diff --git a/src/libcalamares/utils/Traits.h b/src/libcalamares/utils/Traits.h index 8d7eda4a9..9c0282b78 100644 --- a/src/libcalamares/utils/Traits.h +++ b/src/libcalamares/utils/Traits.h @@ -13,8 +13,7 @@ #include - -namespace CalamaresUtils +namespace Calamares { /** @brief Traits machinery lives in this namespace @@ -54,10 +53,10 @@ struct sfinae_true : std::true_type { }; } // namespace Traits -} // namespace CalamaresUtils +} // namespace Calamares #define DECLARE_HAS_METHOD( m ) \ - namespace CalamaresUtils \ + namespace Calamares \ { \ namespace Traits \ { \ @@ -73,6 +72,6 @@ struct sfinae_true : std::true_type } \ } \ template < class T > \ - using has_##m = CalamaresUtils::Traits::has_##m ::t< T >; + using has_##m = Calamares::Traits::has_##m ::t< T >; #endif diff --git a/src/libcalamares/utils/UMask.cpp b/src/libcalamares/utils/UMask.cpp index 3dd7e84f0..19e1493b8 100644 --- a/src/libcalamares/utils/UMask.cpp +++ b/src/libcalamares/utils/UMask.cpp @@ -14,7 +14,7 @@ #include #include -namespace CalamaresUtils +namespace Calamares { mode_t setUMask( mode_t u ) @@ -34,4 +34,4 @@ UMask::~UMask() static_assert( UMask::Safe == ( S_IRGRP | S_IWGRP | S_IXGRP | S_IROTH | S_IWOTH | S_IXOTH ), "Bad permissions." ); -} // namespace CalamaresUtils +} // namespace Calamares diff --git a/src/libcalamares/utils/UMask.h b/src/libcalamares/utils/UMask.h index aea79fbc3..552445cb6 100644 --- a/src/libcalamares/utils/UMask.h +++ b/src/libcalamares/utils/UMask.h @@ -15,7 +15,7 @@ #include -namespace CalamaresUtils +namespace Calamares { /** @brief Wrapper for umask(2) * @@ -45,6 +45,6 @@ public: private: mode_t m_mode; }; -} // namespace CalamaresUtils +} // namespace Calamares #endif diff --git a/src/libcalamares/utils/Units.h b/src/libcalamares/utils/Units.h index 3b909dc02..173f83a24 100644 --- a/src/libcalamares/utils/Units.h +++ b/src/libcalamares/utils/Units.h @@ -15,7 +15,7 @@ #include -namespace CalamaresUtils +namespace Calamares { /// @brief Type for expressing units using intunit_t = quint64; @@ -170,6 +170,6 @@ bytesToSectors( qint64 bytes, qint64 blocksize ) return alignBytesToBlockSize( alignBytesToBlockSize( bytes, blocksize ), MiBtoBytes( 1ULL ) ) / blocksize; } -} // namespace CalamaresUtils +} // namespace Calamares #endif diff --git a/src/libcalamares/utils/Variant.cpp b/src/libcalamares/utils/Variant.cpp index e2df5f669..98cb7efce 100644 --- a/src/libcalamares/utils/Variant.cpp +++ b/src/libcalamares/utils/Variant.cpp @@ -22,7 +22,7 @@ #include #include -namespace CalamaresUtils +namespace Calamares { bool getBool( const QVariantMap& map, const QString& key, bool d ) @@ -136,4 +136,4 @@ getSubMap( const QVariantMap& map, const QString& key, bool& success, const QVar return d; } -} // namespace CalamaresUtils +} // namespace Calamares diff --git a/src/libcalamares/utils/Variant.h b/src/libcalamares/utils/Variant.h index 6bd7b8def..1c1784f44 100644 --- a/src/libcalamares/utils/Variant.h +++ b/src/libcalamares/utils/Variant.h @@ -19,7 +19,7 @@ #include #include -namespace CalamaresUtils +namespace Calamares { /** * Get a bool value from a mapping with a given key; returns @p d if no value. @@ -73,6 +73,6 @@ DLLEXPORT QVariantMap getSubMap( const QVariantMap& map, const QString& key, bool& success, const QVariantMap& d = QVariantMap() ); -} // namespace CalamaresUtils +} // namespace Calamares #endif diff --git a/src/libcalamares/utils/Yaml.cpp b/src/libcalamares/utils/Yaml.cpp index 25077e985..cc3fd079c 100644 --- a/src/libcalamares/utils/Yaml.cpp +++ b/src/libcalamares/utils/Yaml.cpp @@ -21,7 +21,7 @@ #include void -operator>>( const YAML::Node& node, QStringList& v ) +operator>>( const ::YAML::Node& node, QStringList& v ) { for ( size_t i = 0; i < node.size(); ++i ) { @@ -29,33 +29,33 @@ operator>>( const YAML::Node& node, QStringList& v ) } } -namespace CalamaresUtils +namespace Calamares +{ +namespace YAML { - QVariant -yamlToVariant( const YAML::Node& node ) +toVariant( const ::YAML::Node& node ) { switch ( node.Type() ) { - case YAML::NodeType::Scalar: - return yamlScalarToVariant( node ); + case ::YAML::NodeType::Scalar: + return scalarToVariant( node ); - case YAML::NodeType::Sequence: - return yamlSequenceToVariant( node ); + case ::YAML::NodeType::Sequence: + return sequenceToVariant( node ); - case YAML::NodeType::Map: - return yamlMapToVariant( node ); + case ::YAML::NodeType::Map: + return mapToVariant( node ); - case YAML::NodeType::Null: - case YAML::NodeType::Undefined: + case ::YAML::NodeType::Null: + case ::YAML::NodeType::Undefined: return QVariant(); } __builtin_unreachable(); } - QVariant -yamlScalarToVariant( const YAML::Node& scalarNode ) +scalarToVariant( const ::YAML::Node& scalarNode ) { static const auto yamlScalarTrueValues = QRegularExpression( "^(true|True|TRUE|on|On|ON)$" ); static const auto yamlScalarFalseValues = QRegularExpression( "^(false|False|FALSE|off|Off|OFF)$" ); @@ -83,32 +83,30 @@ yamlScalarToVariant( const YAML::Node& scalarNode ) return QVariant( scalarString ); } - QVariantList -yamlSequenceToVariant( const YAML::Node& sequenceNode ) +sequenceToVariant( const ::YAML::Node& sequenceNode ) { QVariantList vl; - for ( YAML::const_iterator it = sequenceNode.begin(); it != sequenceNode.end(); ++it ) + for ( ::YAML::const_iterator it = sequenceNode.begin(); it != sequenceNode.end(); ++it ) { - vl << yamlToVariant( *it ); + vl << toVariant( *it ); } return vl; } - QVariantMap -yamlMapToVariant( const YAML::Node& mapNode ) +mapToVariant( const ::YAML::Node& mapNode ) { QVariantMap vm; - for ( YAML::const_iterator it = mapNode.begin(); it != mapNode.end(); ++it ) + for ( ::YAML::const_iterator it = mapNode.begin(); it != mapNode.end(); ++it ) { - vm.insert( QString::fromStdString( it->first.as< std::string >() ), yamlToVariant( it->second ) ); + vm.insert( QString::fromStdString( it->first.as< std::string >() ), toVariant( it->second ) ); } return vm; } QStringList -yamlToStringList( const YAML::Node& listNode ) +toStringList( const ::YAML::Node& listNode ) { QStringList l; listNode >> l; @@ -116,21 +114,21 @@ yamlToStringList( const YAML::Node& listNode ) } void -explainYamlException( const YAML::Exception& e, const QByteArray& yamlData, const char* label ) +explainException( const ::YAML::Exception& e, const QByteArray& yamlData, const char* label ) { cWarning() << "YAML error " << e.what() << "in" << label << '.'; - explainYamlException( e, yamlData ); + explainException( e, yamlData ); } void -explainYamlException( const YAML::Exception& e, const QByteArray& yamlData, const QString& label ) +explainException( const ::YAML::Exception& e, const QByteArray& yamlData, const QString& label ) { cWarning() << "YAML error " << e.what() << "in" << label << '.'; - explainYamlException( e, yamlData ); + explainException( e, yamlData ); } void -explainYamlException( const YAML::Exception& e, const QByteArray& yamlData ) +explainException( const ::YAML::Exception& e, const QByteArray& yamlData ) { if ( ( e.mark.line >= 0 ) && ( e.mark.column >= 0 ) ) { @@ -176,13 +174,13 @@ explainYamlException( const YAML::Exception& e, const QByteArray& yamlData ) } QVariantMap -loadYaml( const QFileInfo& fi, bool* ok ) +load( const QFileInfo& fi, bool* ok ) { - return loadYaml( fi.absoluteFilePath(), ok ); + return load( fi.absoluteFilePath(), ok ); } QVariantMap -loadYaml( const QString& filename, bool* ok ) +load( const QString& filename, bool* ok ) { if ( ok ) { @@ -196,17 +194,16 @@ loadYaml( const QString& filename, bool* ok ) QByteArray ba = yamlFile.readAll(); try { - YAML::Node doc = YAML::Load( ba.constData() ); - yamlContents = CalamaresUtils::yamlToVariant( doc ); + ::YAML::Node doc = ::YAML::Load( ba.constData() ); + yamlContents = toVariant( doc ); } - catch ( YAML::Exception& e ) + catch ( ::YAML::Exception& e ) { - explainYamlException( e, ba, filename ); + explainException( e, ba, filename ); return QVariantMap(); } } - if ( yamlContents.isValid() && !yamlContents.isNull() && Calamares::typeOf( yamlContents ) == Calamares::MapVariantType ) { @@ -317,7 +314,7 @@ dumpYaml( QFile& f, const QVariantMap& map, int indent ) } bool -saveYaml( const QString& filename, const QVariantMap& map ) +save( const QString& filename, const QVariantMap& map ) { QFile f( filename ); if ( !f.open( QFile::WriteOnly ) ) @@ -329,5 +326,5 @@ saveYaml( const QString& filename, const QVariantMap& map ) return dumpYaml( f, map, 0 ); } - -} // namespace CalamaresUtils +} // namespace YAML +} // namespace Calamares diff --git a/src/libcalamares/utils/Yaml.h b/src/libcalamares/utils/Yaml.h index fa2121b75..4e626eb5d 100644 --- a/src/libcalamares/utils/Yaml.h +++ b/src/libcalamares/utils/Yaml.h @@ -48,9 +48,11 @@ class QFileInfo; #endif /// @brief Appends all the elements of @p node to the string list @p v -void operator>>( const YAML::Node& node, QStringList& v ); +void operator>>( const ::YAML::Node& node, QStringList& v ); -namespace CalamaresUtils +namespace Calamares +{ +namespace YAML { /** * Loads a given @p filename and returns the YAML data @@ -58,30 +60,31 @@ namespace CalamaresUtils * malformed in some way, returns an empty map and sets * @p *ok to false. Otherwise sets @p *ok to true. */ -QVariantMap loadYaml( const QString& filename, bool* ok = nullptr ); +QVariantMap load( const QString& filename, bool* ok = nullptr ); /** Convenience overload. */ -QVariantMap loadYaml( const QFileInfo&, bool* ok = nullptr ); +QVariantMap load( const QFileInfo&, bool* ok = nullptr ); -QVariant yamlToVariant( const YAML::Node& node ); -QVariant yamlScalarToVariant( const YAML::Node& scalarNode ); -QVariantList yamlSequenceToVariant( const YAML::Node& sequenceNode ); -QVariantMap yamlMapToVariant( const YAML::Node& mapNode ); +QVariant toVariant( const ::YAML::Node& node ); +QVariant scalarToVariant( const ::YAML::Node& scalarNode ); +QVariantList sequenceToVariant( const ::YAML::Node& sequenceNode ); +QVariantMap mapToVariant( const ::YAML::Node& mapNode ); /// @brief Returns all the elements of @p listNode in a StringList -QStringList yamlToStringList( const YAML::Node& listNode ); +QStringList toStringList( const ::YAML::Node& listNode ); /// @brief Save a @p map to @p filename as YAML -bool saveYaml( const QString& filename, const QVariantMap& map ); +bool save( const QString& filename, const QVariantMap& map ); /** * Given an exception from the YAML parser library, explain * what is going on in terms of the data passed to the parser. * Uses @p label when labeling the data source (e.g. "netinstall data") */ -void explainYamlException( const YAML::Exception& e, const QByteArray& data, const char* label ); -void explainYamlException( const YAML::Exception& e, const QByteArray& data, const QString& label ); -void explainYamlException( const YAML::Exception& e, const QByteArray& data ); +void explainException( const ::YAML::Exception& e, const QByteArray& data, const char* label ); +void explainException( const ::YAML::Exception& e, const QByteArray& data, const QString& label ); +void explainException( const ::YAML::Exception& e, const QByteArray& data ); -} // namespace CalamaresUtils +} // namespace YAML +} // namespace Calamares #endif diff --git a/src/libcalamaresui/Branding.cpp b/src/libcalamaresui/Branding.cpp index 1a79d124d..30062fe5f 100644 --- a/src/libcalamaresui/Branding.cpp +++ b/src/libcalamaresui/Branding.cpp @@ -14,7 +14,7 @@ #include "Branding.h" #include "GlobalStorage.h" -#include "utils/CalamaresUtilsGui.h" +#include "utils/Gui.h" #include "utils/ImageRegistry.h" #include "utils/Logger.h" #include "utils/NamedEnum.h" @@ -57,7 +57,6 @@ Branding::instance() return s_instance; } - // *INDENT-OFF* // clang-format off const QStringList Branding::s_stringEntryStrings = @@ -76,7 +75,6 @@ const QStringList Branding::s_stringEntryStrings = "donateUrl" }; - const QStringList Branding::s_imageEntryStrings = { "productBanner", @@ -150,16 +148,16 @@ Branding::WindowDimension::suffixes() */ static void loadStrings( QMap< QString, QString >& map, - const YAML::Node& doc, + const ::YAML::Node& doc, const std::string& key, const std::function< QString( const QString& ) >& transform ) { if ( !doc[ key ].IsMap() ) { - throw YAML::Exception( YAML::Mark(), std::string( "Branding configuration is not a map: " ) + key ); + throw ::YAML::Exception( ::YAML::Mark(), std::string( "Branding configuration is not a map: " ) + key ); } - const QVariantMap config = CalamaresUtils::yamlMapToVariant( doc[ key ] ); + const QVariantMap config = Calamares::YAML::mapToVariant( doc[ key ] ); for ( auto it = config.constBegin(); it != config.constEnd(); ++it ) { map.insert( it.key(), transform( it.value().toString() ) ); @@ -189,11 +187,11 @@ uploadServerFromMap( const QVariantMap& map ) } bool bogus = false; // we don't care about type-name lookup success here - return Branding::UploadServerInfo { - names.find( typestring, bogus ), - QUrl( urlstring, QUrl::ParsingMode::StrictMode ), - sizeLimitKiB >= 0 ? CalamaresUtils::KiBtoBytes( static_cast< unsigned long long >( sizeLimitKiB ) ) : -1 - }; + return Branding::UploadServerInfo { names.find( typestring, bogus ), + QUrl( urlstring, QUrl::ParsingMode::StrictMode ), + sizeLimitKiB >= 0 + ? Calamares::KiBtoBytes( static_cast< unsigned long long >( sizeLimitKiB ) ) + : -1 }; } /** @brief Load the @p map with strings from @p config @@ -226,7 +224,7 @@ Branding::Branding( const QString& brandingFilePath, QObject* parent, qreal devi try { - YAML::Node doc = YAML::Load( ba.constData() ); + auto doc = ::YAML::Load( ba.constData() ); Q_ASSERT( doc.IsMap() ); m_componentName = QString::fromStdString( doc[ "componentName" ].as< std::string >() ); @@ -290,11 +288,11 @@ Branding::Branding( const QString& brandingFilePath, QObject* parent, qreal devi } ); loadStrings( m_style, doc, "style", []( const QString& s ) -> QString { return s; } ); - m_uploadServer = uploadServerFromMap( CalamaresUtils::yamlMapToVariant( doc[ "uploadServer" ] ) ); + m_uploadServer = uploadServerFromMap( Calamares::YAML::mapToVariant( doc[ "uploadServer" ] ) ); } - catch ( YAML::Exception& e ) + catch ( ::YAML::Exception& e ) { - CalamaresUtils::explainYamlException( e, ba, file.fileName() ); + Calamares::YAML::explainException( e, ba, file.fileName() ); bail( m_descriptorPath, e.what() ); } @@ -323,7 +321,6 @@ Branding::Branding( const QString& brandingFilePath, QObject* parent, qreal devi validateStyleEntries( m_style ); } - QString Branding::componentDirectory() const { @@ -331,14 +328,12 @@ Branding::componentDirectory() const return fi.absoluteDir().absolutePath(); } - QString Branding::string( Branding::StringEntry stringEntry ) const { return m_strings.value( s_stringEntryStrings.value( stringEntry ) ); } - QString Branding::styleString( Branding::StyleEntry styleEntry ) const { @@ -346,7 +341,6 @@ Branding::styleString( Branding::StyleEntry styleEntry ) const return m_style.value( meta.valueToKey( styleEntry ) ); } - QString Branding::imagePath( Branding::ImageEntry imageEntry ) const { @@ -410,7 +404,6 @@ Branding::image( const QStringList& list, const QSize& size ) const return QPixmap(); } - static QString _stylesheet( const QDir& dir ) { @@ -451,10 +444,9 @@ Branding::WindowDimension::isValid() const return ( unit() != none ) && ( value() > 0 ); } - /// @brief Get a string (empty is @p key doesn't exist) from @p key in @p doc static inline QString -getString( const YAML::Node& doc, const char* key ) +getString( const ::YAML::Node& doc, const char* key ) { if ( doc[ key ] ) { @@ -464,19 +456,19 @@ getString( const YAML::Node& doc, const char* key ) } /// @brief Get a node (throws if @p key doesn't exist) from @p key in @p doc -static inline YAML::Node -get( const YAML::Node& doc, const char* key ) +static inline ::YAML::Node +get( const ::YAML::Node& doc, const char* key ) { auto r = doc[ key ]; if ( !r.IsDefined() ) { - throw YAML::KeyNotFound( YAML::Mark::null_mark(), std::string( key ) ); + throw ::YAML::KeyNotFound( ::YAML::Mark::null_mark(), std::string( key ) ); } return r; } static inline void -flavorAndSide( const YAML::Node& doc, const char* key, Branding::PanelFlavor& flavor, Branding::PanelSide& side ) +flavorAndSide( const ::YAML::Node& doc, const char* key, Branding::PanelFlavor& flavor, Branding::PanelSide& side ) { using PanelFlavor = Branding::PanelFlavor; using PanelSide = Branding::PanelSide; @@ -552,7 +544,7 @@ flavorAndSide( const YAML::Node& doc, const char* key, Branding::PanelFlavor& fl } void -Branding::initSimpleSettings( const YAML::Node& doc ) +Branding::initSimpleSettings( const ::YAML::Node& doc ) { // *INDENT-OFF* // clang-format off @@ -598,16 +590,16 @@ Branding::initSimpleSettings( const YAML::Node& doc ) } if ( !m_windowWidth.isValid() ) { - m_windowWidth = WindowDimension( CalamaresUtils::windowPreferredWidth, WindowDimensionUnit::Pixies ); + m_windowWidth = WindowDimension( Calamares::windowPreferredWidth, WindowDimensionUnit::Pixies ); } if ( !m_windowHeight.isValid() ) { - m_windowHeight = WindowDimension( CalamaresUtils::windowPreferredHeight, WindowDimensionUnit::Pixies ); + m_windowHeight = WindowDimension( Calamares::windowPreferredHeight, WindowDimensionUnit::Pixies ); } } void -Branding::initSlideshowSettings( const YAML::Node& doc ) +Branding::initSlideshowSettings( const ::YAML::Node& doc ) { QDir componentDir( componentDirectory() ); @@ -666,5 +658,4 @@ Branding::initSlideshowSettings( const YAML::Node& doc ) } } - } // namespace Calamares diff --git a/src/libcalamaresui/CMakeLists.txt b/src/libcalamaresui/CMakeLists.txt index dfa9d5177..41305e249 100644 --- a/src/libcalamaresui/CMakeLists.txt +++ b/src/libcalamaresui/CMakeLists.txt @@ -16,7 +16,7 @@ set(calamaresui_SOURCES modulesystem/ModuleManager.cpp modulesystem/ProcessJobModule.cpp modulesystem/ViewModule.cpp - utils/CalamaresUtilsGui.cpp + utils/Gui.cpp utils/ImageRegistry.cpp utils/Paste.cpp viewpages/BlankViewStep.cpp @@ -45,6 +45,7 @@ endif() calamares_add_library(calamaresui SOURCES ${calamaresui_SOURCES} + TARGET_TYPE SHARED EXPORT_MACRO UIDLLEXPORT_PRO LINK_LIBRARIES ${qtname}::Svg diff --git a/src/libcalamaresui/ViewManager.cpp b/src/libcalamaresui/ViewManager.cpp index 3daddc0dc..2cd7a9fc5 100644 --- a/src/libcalamaresui/ViewManager.cpp +++ b/src/libcalamaresui/ViewManager.cpp @@ -93,21 +93,18 @@ ViewManager::ViewManager( QObject* parent ) #endif } - ViewManager::~ViewManager() { m_widget->deleteLater(); s_instance = nullptr; } - QWidget* ViewManager::centralWidget() { return m_widget; } - void ViewManager::addViewStep( ViewStep* step ) { @@ -120,7 +117,6 @@ ViewManager::addViewStep( ViewStep* step ) } } - void ViewManager::insertViewStep( int before, ViewStep* step ) { @@ -174,13 +170,12 @@ ViewManager::onInstallationFailed( const QString& message, const QString& detail { if ( result == QDialog::Accepted && errorDialog->shouldOfferWebPaste() ) { - CalamaresUtils::Paste::doLogUploadUI( errorDialog ); + Calamares::Paste::doLogUploadUI( errorDialog ); } QApplication::quit(); } ); } - void ViewManager::onInitFailed( const QStringList& modules ) { @@ -237,21 +232,18 @@ ViewManager::updateNextStatus( bool status ) } } - ViewStepList ViewManager::viewSteps() const { return m_steps; } - ViewStep* ViewManager::currentStep() const { return currentStepValid() ? m_steps.value( m_currentStep ) : nullptr; } - int ViewManager::currentStepIndex() const { @@ -487,7 +479,6 @@ ViewManager::back() updateButtonLabels(); } - void ViewManager::quit() { @@ -594,7 +585,6 @@ ViewManager::data( const QModelIndex& index, int role ) const } } - int ViewManager::rowCount( const QModelIndex& parent ) const { diff --git a/src/libcalamaresui/modulesystem/ModuleFactory.cpp b/src/libcalamaresui/modulesystem/ModuleFactory.cpp index 7f44a0052..eecc85f14 100644 --- a/src/libcalamaresui/modulesystem/ModuleFactory.cpp +++ b/src/libcalamaresui/modulesystem/ModuleFactory.cpp @@ -29,7 +29,6 @@ #include #include - namespace Calamares { @@ -126,7 +125,7 @@ moduleFromDescriptor( const Calamares::ModuleSystem::Descriptor& moduleDescripto { m->loadConfigurationFile( configFileName ); } - catch ( YAML::Exception& e ) + catch ( ::YAML::Exception& e ) { cError() << "YAML parser error " << e.what(); return nullptr; @@ -135,5 +134,4 @@ moduleFromDescriptor( const Calamares::ModuleSystem::Descriptor& moduleDescripto return m.release(); } - } // namespace Calamares diff --git a/src/libcalamaresui/modulesystem/ModuleManager.cpp b/src/libcalamaresui/modulesystem/ModuleManager.cpp index beca304a5..0e1a3b07e 100644 --- a/src/libcalamaresui/modulesystem/ModuleManager.cpp +++ b/src/libcalamaresui/modulesystem/ModuleManager.cpp @@ -34,7 +34,6 @@ ModuleManager::instance() return s_instance; } - ModuleManager::ModuleManager( const QStringList& paths, QObject* parent ) : QObject( parent ) , m_paths( paths ) @@ -44,7 +43,6 @@ ModuleManager::ModuleManager( const QStringList& paths, QObject* parent ) s_instance = this; } - ModuleManager::~ModuleManager() { // The map is populated with Module::fromDescriptor(), which allocates on the heap. @@ -54,7 +52,6 @@ ModuleManager::~ModuleManager() } } - void ModuleManager::init() { @@ -98,7 +95,7 @@ ModuleManager::doInit() } bool ok = false; - QVariantMap moduleDescriptorMap = CalamaresUtils::loadYaml( descriptorFileInfo, &ok ); + QVariantMap moduleDescriptorMap = Calamares::YAML::load( descriptorFileInfo, &ok ); QString moduleName = ok ? moduleDescriptorMap.value( "name" ).toString() : QString(); if ( ok && !moduleName.isEmpty() && ( moduleName == currentDir.dirName() ) @@ -136,14 +133,12 @@ ModuleManager::doInit() QTimer::singleShot( 10, this, &ModuleManager::initDone ); } - QList< ModuleSystem::InstanceKey > ModuleManager::loadedInstanceKeys() { return m_loadedModulesByInstanceKey.keys(); } - Calamares::ModuleSystem::Descriptor ModuleManager::moduleDescriptor( const QString& name ) { @@ -156,7 +151,6 @@ ModuleManager::moduleInstance( const ModuleSystem::InstanceKey& instanceKey ) return m_loadedModulesByInstanceKey.value( instanceKey ); } - /** @brief Returns the config file name for the given @p instanceKey * * Custom instances have custom config files, non-custom ones @@ -185,7 +179,6 @@ getConfigFileName( const Settings::InstanceDescriptionList& descriptorList, } } - // This should already have been checked and failed the module already return QString(); } diff --git a/src/libcalamaresui/utils/CalamaresUtilsGui.cpp b/src/libcalamaresui/utils/Gui.cpp similarity index 98% rename from src/libcalamaresui/utils/CalamaresUtilsGui.cpp rename to src/libcalamaresui/utils/Gui.cpp index a1030d03e..57f67aefc 100644 --- a/src/libcalamaresui/utils/CalamaresUtilsGui.cpp +++ b/src/libcalamaresui/utils/Gui.cpp @@ -8,7 +8,7 @@ * */ -#include "CalamaresUtilsGui.h" +#include "Gui.h" #include "ImageRegistry.h" @@ -22,13 +22,12 @@ #define RESPATH ":/data/" -namespace CalamaresUtils +namespace Calamares { static int s_defaultFontSize = 0; static int s_defaultFontHeight = 0; - QPixmap defaultPixmap( ImageType type, ImageMode mode, const QSize& size ) { @@ -127,7 +126,6 @@ defaultPixmap( ImageType type, ImageMode mode, const QSize& size ) return pixmap; } - void unmarginLayout( QLayout* layout ) { @@ -148,7 +146,6 @@ unmarginLayout( QLayout* layout ) } } - int defaultFontSize() { @@ -159,7 +156,6 @@ defaultFontSize() return s_defaultFontSize; } - int defaultFontHeight() { @@ -173,7 +169,6 @@ defaultFontHeight() return s_defaultFontHeight; } - QFont largeFont() { @@ -182,7 +177,6 @@ largeFont() return f; } - void setDefaultFontSize( int points ) { @@ -190,7 +184,6 @@ setDefaultFontSize( int points ) s_defaultFontHeight = 0; // Recalculate on next call to defaultFontHeight() } - QSize defaultIconSize() { @@ -198,4 +191,4 @@ defaultIconSize() return QSize( w, w ); } -} // namespace CalamaresUtils +} // namespace Calamares diff --git a/src/libcalamaresui/utils/CalamaresUtilsGui.h b/src/libcalamaresui/utils/Gui.h similarity index 94% rename from src/libcalamaresui/utils/CalamaresUtilsGui.h rename to src/libcalamaresui/utils/Gui.h index 5a0ee336f..1264bc129 100644 --- a/src/libcalamaresui/utils/CalamaresUtilsGui.h +++ b/src/libcalamaresui/utils/Gui.h @@ -19,7 +19,7 @@ class QLayout; -namespace CalamaresUtils +namespace Calamares { /** @@ -74,7 +74,7 @@ enum ImageMode * @return the new pixmap. */ UIDLLEXPORT QPixmap defaultPixmap( ImageType type, - ImageMode mode = CalamaresUtils::Original, + ImageMode mode = Calamares::Original, const QSize& size = QSize( 0, 0 ) ); /** @@ -97,6 +97,6 @@ constexpr int windowMinimumHeight = 520; constexpr int windowPreferredWidth = 1024; constexpr int windowPreferredHeight = 520; -} // namespace CalamaresUtils +} // namespace Calamares #endif // CALAMARESUTILSGUI_H diff --git a/src/libcalamaresui/utils/ImageRegistry.cpp b/src/libcalamaresui/utils/ImageRegistry.cpp index 96dd79e78..46fda0c01 100644 --- a/src/libcalamaresui/utils/ImageRegistry.cpp +++ b/src/libcalamaresui/utils/ImageRegistry.cpp @@ -15,7 +15,6 @@ static QHash< QString, QHash< int, QHash< qint64, QPixmap > > > s_cache; - ImageRegistry* ImageRegistry::instance() { @@ -23,26 +22,22 @@ ImageRegistry::instance() return s_instance; } - ImageRegistry::ImageRegistry() {} - QIcon -ImageRegistry::icon( const QString& image, CalamaresUtils::ImageMode mode ) +ImageRegistry::icon( const QString& image, Calamares::ImageMode mode ) { - return pixmap( image, CalamaresUtils::defaultIconSize(), mode ); + return pixmap( image, Calamares::defaultIconSize(), mode ); } - qint64 ImageRegistry::cacheKey( const QSize& size ) { return size.width() * 100 + size.height() * 10; } - QPixmap -ImageRegistry::pixmap( const QString& image, const QSize& size, CalamaresUtils::ImageMode mode ) +ImageRegistry::pixmap( const QString& image, const QSize& size, Calamares::ImageMode mode ) { Q_ASSERT( !( size.width() < 0 || size.height() < 0 ) ); if ( size.width() < 0 || size.height() < 0 ) @@ -112,12 +107,8 @@ ImageRegistry::pixmap( const QString& image, const QSize& size, CalamaresUtils:: return pixmap; } - void -ImageRegistry::putInCache( const QString& image, - const QSize& size, - CalamaresUtils::ImageMode mode, - const QPixmap& pixmap ) +ImageRegistry::putInCache( const QString& image, const QSize& size, Calamares::ImageMode mode, const QPixmap& pixmap ) { QHash< qint64, QPixmap > subsubcache; QHash< int, QHash< qint64, QPixmap > > subcache; diff --git a/src/libcalamaresui/utils/ImageRegistry.h b/src/libcalamaresui/utils/ImageRegistry.h index 513fd254c..0ced78077 100644 --- a/src/libcalamaresui/utils/ImageRegistry.h +++ b/src/libcalamaresui/utils/ImageRegistry.h @@ -12,7 +12,7 @@ #include #include "DllMacro.h" -#include "utils/CalamaresUtilsGui.h" +#include "utils/Gui.h" class UIDLLEXPORT ImageRegistry { @@ -21,13 +21,12 @@ public: explicit ImageRegistry(); - QIcon icon( const QString& image, CalamaresUtils::ImageMode mode = CalamaresUtils::Original ); - QPixmap - pixmap( const QString& image, const QSize& size, CalamaresUtils::ImageMode mode = CalamaresUtils::Original ); + QIcon icon( const QString& image, Calamares::ImageMode mode = Calamares::Original ); + QPixmap pixmap( const QString& image, const QSize& size, Calamares::ImageMode mode = Calamares::Original ); private: qint64 cacheKey( const QSize& size ); - void putInCache( const QString& image, const QSize& size, CalamaresUtils::ImageMode mode, const QPixmap& pixmap ); + void putInCache( const QString& image, const QSize& size, Calamares::ImageMode mode, const QPixmap& pixmap ); }; #endif // IMAGE_REGISTRY_H diff --git a/src/libcalamaresui/utils/Paste.cpp b/src/libcalamaresui/utils/Paste.cpp index d782d138e..bcabc7152 100644 --- a/src/libcalamaresui/utils/Paste.cpp +++ b/src/libcalamaresui/utils/Paste.cpp @@ -24,7 +24,7 @@ #include #include -using namespace CalamaresUtils::Units; +using namespace Calamares::Units; /** @brief Reads the logfile, returns its contents. * @@ -64,7 +64,6 @@ logFileContents( const qint64 sizeLimitBytes ) return pasteSourceFile.read( sizeLimitBytes ); } - STATICTEST QString ficheLogUpload( const QByteArray& pasteData, const QUrl& serverUrl, QObject* parent ) { @@ -117,7 +116,7 @@ ficheLogUpload( const QByteArray& pasteData, const QUrl& serverUrl, QObject* par } QString -CalamaresUtils::Paste::doLogUpload( QObject* parent ) +Calamares::Paste::doLogUpload( QObject* parent ) { auto [ type, serverUrl, sizeLimitBytes ] = Calamares::Branding::instance()->uploadServer(); if ( !serverUrl.isValid() ) @@ -156,10 +155,10 @@ CalamaresUtils::Paste::doLogUpload( QObject* parent ) } QString -CalamaresUtils::Paste::doLogUploadUI( QWidget* parent ) +Calamares::Paste::doLogUploadUI( QWidget* parent ) { // These strings originated in the ViewManager class - QString pasteUrl = CalamaresUtils::Paste::doLogUpload( parent ); + QString pasteUrl = Calamares::Paste::doLogUpload( parent ); QString pasteUrlMessage; if ( pasteUrl.isEmpty() ) { @@ -189,9 +188,8 @@ CalamaresUtils::Paste::doLogUploadUI( QWidget* parent ) return pasteUrl; } - bool -CalamaresUtils::Paste::isEnabled() +Calamares::Paste::isEnabled() { auto [ type, serverUrl, sizeLimitBytes ] = Calamares::Branding::instance()->uploadServer(); return type != Calamares::Branding::UploadServerType::None && sizeLimitBytes != 0; diff --git a/src/libcalamaresui/utils/Paste.h b/src/libcalamaresui/utils/Paste.h index c77625415..6bdcec0d6 100644 --- a/src/libcalamaresui/utils/Paste.h +++ b/src/libcalamaresui/utils/Paste.h @@ -15,7 +15,7 @@ class QObject; class QWidget; -namespace CalamaresUtils +namespace Calamares { namespace Paste { @@ -39,6 +39,6 @@ QString doLogUploadUI( QWidget* parent ); bool isEnabled(); } // namespace Paste -} // namespace CalamaresUtils +} // namespace Calamares #endif diff --git a/src/libcalamaresui/utils/Qml.cpp b/src/libcalamaresui/utils/Qml.cpp index 7f3df6ee8..d731838a5 100644 --- a/src/libcalamaresui/utils/Qml.cpp +++ b/src/libcalamaresui/utils/Qml.cpp @@ -26,7 +26,7 @@ static QDir s_qmlModulesDir( QString( CMAKE_INSTALL_FULL_DATADIR ) + "/qml" ); -namespace CalamaresUtils +namespace Calamares { QDir qmlModulesDir() @@ -46,9 +46,9 @@ qmlDirCandidates( bool assumeBuilddir ) static const char QML[] = "qml"; QStringList qmlDirs; - if ( CalamaresUtils::isAppDataDirOverridden() ) + if ( Calamares::isAppDataDirOverridden() ) { - qmlDirs << CalamaresUtils::appDataDir().absoluteFilePath( QML ); + qmlDirs << Calamares::appDataDir().absoluteFilePath( QML ); } else { @@ -56,12 +56,12 @@ qmlDirCandidates( bool assumeBuilddir ) { qmlDirs << QDir::current().absoluteFilePath( "src/qml" ); // In build-dir } - if ( CalamaresUtils::haveExtraDirs() ) - for ( auto s : CalamaresUtils::extraDataDirs() ) + if ( Calamares::haveExtraDirs() ) + for ( auto s : Calamares::extraDataDirs() ) { qmlDirs << ( s + QML ); } - qmlDirs << CalamaresUtils::appDataDir().absoluteFilePath( QML ); + qmlDirs << Calamares::appDataDir().absoluteFilePath( QML ); } return qmlDirs; @@ -79,14 +79,14 @@ initQmlModulesDir() if ( dir.exists() && dir.isReadable() ) { cDebug() << "Using Calamares QML directory" << dir.absolutePath(); - CalamaresUtils::setQmlModulesDir( dir ); + Calamares::setQmlModulesDir( dir ); return true; } } cError() << "Cowardly refusing to continue startup without a QML directory." << Logger::DebugList( qmlDirCandidatesByPriority ); - if ( CalamaresUtils::isAppDataDirOverridden() ) + if ( Calamares::isAppDataDirOverridden() ) { cError() << "FATAL: explicitly configured application data directory is missing qml/"; } @@ -240,13 +240,13 @@ registerQmlModels() 0, "Global", []( QQmlEngine*, QJSEngine* ) -> QObject* { return Calamares::JobQueue::instance()->globalStorage(); } ); - qmlRegisterSingletonType< Calamares::Network::Manager >( - "io.calamares.core", - 1, - 0, - "Network", - []( QQmlEngine*, QJSEngine* ) -> QObject* { return &Calamares::Network::Manager::instance(); } ); + qmlRegisterSingletonType< Calamares::Network::Manager >( "io.calamares.core", + 1, + 0, + "Network", + []( QQmlEngine*, QJSEngine* ) -> QObject* + { return &Calamares::Network::Manager::instance(); } ); } } -} // namespace CalamaresUtils +} // namespace Calamares diff --git a/src/libcalamaresui/utils/Qml.h b/src/libcalamaresui/utils/Qml.h index 2d6655e9e..6f44bc36c 100644 --- a/src/libcalamaresui/utils/Qml.h +++ b/src/libcalamaresui/utils/Qml.h @@ -19,7 +19,7 @@ class QQuickItem; -namespace CalamaresUtils +namespace Calamares { /// @brief the extra directory where Calamares searches for QML files UIDLLEXPORT QDir qmlModulesDir(); @@ -85,6 +85,6 @@ UIDLLEXPORT QString searchQmlFile( QmlSearch method, const Calamares::ModuleSystem::InstanceKey& i ); UIDLLEXPORT QString searchQmlFile( QmlSearch method, const QString& fileNameNoSuffix ); -} // namespace CalamaresUtils +} // namespace Calamares #endif diff --git a/src/libcalamaresui/viewpages/BlankViewStep.cpp b/src/libcalamaresui/viewpages/BlankViewStep.cpp index ea51e3f02..8f101af04 100644 --- a/src/libcalamaresui/viewpages/BlankViewStep.cpp +++ b/src/libcalamaresui/viewpages/BlankViewStep.cpp @@ -8,7 +8,7 @@ */ #include "BlankViewStep.h" -#include "utils/CalamaresUtilsGui.h" +#include "utils/Gui.h" #include #include @@ -31,7 +31,7 @@ BlankViewStep::BlankViewStep( const QString& title, auto* label = new QLabel( title ); label->setAlignment( Qt::AlignHCenter ); - label->setFont( CalamaresUtils::largeFont() ); + label->setFont( Calamares::largeFont() ); layout->addWidget( label ); label = new QLabel( description ); diff --git a/src/libcalamaresui/viewpages/ExecutionViewStep.cpp b/src/libcalamaresui/viewpages/ExecutionViewStep.cpp index 7eae78cbc..4f0e586ac 100644 --- a/src/libcalamaresui/viewpages/ExecutionViewStep.cpp +++ b/src/libcalamaresui/viewpages/ExecutionViewStep.cpp @@ -21,8 +21,8 @@ #include "ViewManager.h" #include "modulesystem/Module.h" #include "modulesystem/ModuleManager.h" -#include "utils/CalamaresUtilsGui.h" #include "utils/Dirs.h" +#include "utils/Gui.h" #include "utils/Logger.h" #include "utils/Retranslator.h" #include "widgets/LogWidget.h" @@ -73,7 +73,7 @@ ExecutionViewStep::ExecutionViewStep( QObject* parent ) { m_widget->setObjectName( "slideshow" ); m_progressBar->setObjectName( "exec-progress" ); - m_progressBar->setFormat(tr("%p%", "Progress percentage indicator: %p is where the number 0..100 is placed")); + m_progressBar->setFormat( tr( "%p%", "Progress percentage indicator: %p is where the number 0..100 is placed" ) ); m_label->setObjectName( "exec-message" ); QVBoxLayout* layout = new QVBoxLayout( m_widget ); @@ -87,10 +87,10 @@ ExecutionViewStep::ExecutionViewStep( QObject* parent ) m_tab_widget->tabBar()->hide(); layout->addWidget( m_tab_widget ); - CalamaresUtils::unmarginLayout( layout ); + Calamares::unmarginLayout( layout ); layout->addLayout( bottomLayout ); - bottomLayout->addSpacing( CalamaresUtils::defaultFontHeight() / 2 ); + bottomLayout->addSpacing( Calamares::defaultFontHeight() / 2 ); bottomLayout->addLayout( barLayout ); bottomLayout->addWidget( m_label ); @@ -104,62 +104,52 @@ ExecutionViewStep::ExecutionViewStep( QObject* parent ) auto toggleLogButton = dynamic_cast< QToolButton* >( toolBar->widgetForAction( toggleLogAction ) ); connect( toggleLogButton, &QToolButton::clicked, this, &ExecutionViewStep::toggleLog ); - barLayout->addWidget( m_progressBar ); barLayout->addWidget( toolBar ); - connect( JobQueue::instance(), &JobQueue::progress, this, &ExecutionViewStep::updateFromJobQueue ); } - QString ExecutionViewStep::prettyName() const { return Calamares::Settings::instance()->isSetupMode() ? tr( "Set up" ) : tr( "Install" ); } - QWidget* ExecutionViewStep::widget() { return m_widget; } - void ExecutionViewStep::next() { } - void ExecutionViewStep::back() { } - bool ExecutionViewStep::isNextEnabled() const { return false; } - bool ExecutionViewStep::isBackEnabled() const { return false; } - bool ExecutionViewStep::isAtBeginning() const { return true; } - bool ExecutionViewStep::isAtEnd() const { @@ -206,21 +196,18 @@ ExecutionViewStep::onActivate() queue->start(); } - JobList ExecutionViewStep::jobs() const { return JobList(); } - void ExecutionViewStep::appendJobModuleInstanceKey( const ModuleSystem::InstanceKey& instanceKey ) { m_jobInstanceKeys.append( instanceKey ); } - void ExecutionViewStep::updateFromJobQueue( qreal percent, const QString& message ) { @@ -253,5 +240,4 @@ ExecutionViewStep::onLeave() m_slideshow->changeSlideShowState( Slideshow::Stop ); } - } // namespace Calamares diff --git a/src/libcalamaresui/viewpages/QmlViewStep.cpp b/src/libcalamaresui/viewpages/QmlViewStep.cpp index aa034ca7e..d96e65eaf 100644 --- a/src/libcalamaresui/viewpages/QmlViewStep.cpp +++ b/src/libcalamaresui/viewpages/QmlViewStep.cpp @@ -24,11 +24,15 @@ #include #include #include +#if QT_VERSION >= QT_VERSION_CHECK( 6, 0, 0 ) +#include +#else #include +#endif + #include #include - /// @brief State-change of the QML, for changeQMLState() enum class QMLAction { @@ -50,7 +54,7 @@ changeQMLState( QMLAction action, QQuickItem* item ) static const char propertyName[] = "activatedInCalamares"; bool activate = action == QMLAction::Start; - CalamaresUtils::callQmlFunction( item, activate ? "onActivate" : "onLeave" ); + Calamares::callQmlFunction( item, activate ? "onActivate" : "onLeave" ); auto property = item->property( propertyName ); if ( property.isValid() && ( Calamares::typeOf( property ) == Calamares::BoolVariantType ) @@ -67,16 +71,22 @@ QmlViewStep::QmlViewStep( QObject* parent ) : ViewStep( parent ) , m_widget( new QWidget ) , m_spinner( new WaitingWidget( tr( "Loading ..." ) ) ) - , m_qmlWidget( new QQuickWidget ) { - CalamaresUtils::registerQmlModels(); + Calamares::registerQmlModels(); + +#if QT_VERSION >= QT_VERSION_CHECK( 6, 0, 0 ) + m_qmlEngine = new QQmlEngine( this ); +#else + m_qmlWidget = new QQuickWidget; + m_qmlWidget->setResizeMode( QQuickWidget::SizeRootObjectToView ); + m_qmlWidget->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ); + m_qmlEngine = m_qmlWidget->engine(); +#endif QVBoxLayout* layout = new QVBoxLayout( m_widget ); layout->addWidget( m_spinner ); - m_qmlWidget->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ); - m_qmlWidget->setResizeMode( QQuickWidget::SizeRootObjectToView ); - m_qmlWidget->engine()->addImportPath( CalamaresUtils::qmlModulesDir().absolutePath() ); + m_qmlEngine->addImportPath( Calamares::qmlModulesDir().absolutePath() ); // QML Loading starts when the configuration for the module is set. } @@ -90,7 +100,6 @@ QmlViewStep::prettyName() const return tr( "QML Step %1." ).arg( moduleInstanceKey().module() ); } - bool QmlViewStep::isAtBeginning() const { @@ -183,11 +192,20 @@ QmlViewStep::loadComplete() } else { +#if QT_VERSION >= QT_VERSION_CHECK( 6, 0, 0 ) + auto* quick = new QQuickWindow; + auto* root = quick->contentItem(); + m_qmlObject->setParentItem( root ); + m_qmlObject->bindableWidth().setBinding( [ = ]() { return root->width(); } ); + m_qmlObject->bindableHeight().setBinding( [ = ]() { return root->height(); } ); + m_qmlWidget = QWidget::createWindowContainer( quick, m_widget ); +#else // setContent() is public API, but not documented publicly. // It is marked \internal in the Qt sources, but does exactly // what is needed: sets up visual parent by replacing the root // item, and handling resizes. m_qmlWidget->setContent( QUrl( m_qmlFileName ), m_qmlComponent, m_qmlObject ); +#endif showQml(); } } @@ -221,19 +239,17 @@ QmlViewStep::showQml() } } - void QmlViewStep::setConfigurationMap( const QVariantMap& configurationMap ) { bool ok = false; - m_searchMethod - = CalamaresUtils::qmlSearchNames().find( CalamaresUtils::getString( configurationMap, "qmlSearch" ), ok ); + m_searchMethod = Calamares::qmlSearchNames().find( Calamares::getString( configurationMap, "qmlSearch" ), ok ); if ( !ok ) { cWarning() << "Bad QML search mode set for" << moduleInstanceKey(); } - QString qmlFile = CalamaresUtils::getString( configurationMap, "qmlFilename" ); + QString qmlFile = Calamares::getString( configurationMap, "qmlFilename" ); if ( !m_qmlComponent ) { m_qmlFileName = searchQmlFile( m_searchMethod, qmlFile, moduleInstanceKey() ); @@ -245,8 +261,8 @@ QmlViewStep::setConfigurationMap( const QVariantMap& configurationMap ) } cDebug() << "QmlViewStep" << moduleInstanceKey() << "loading" << m_qmlFileName; - m_qmlComponent = new QQmlComponent( - m_qmlWidget->engine(), QUrl( m_qmlFileName ), QQmlComponent::CompilationMode::Asynchronous ); + m_qmlComponent + = new QQmlComponent( m_qmlEngine, QUrl( m_qmlFileName ), QQmlComponent::CompilationMode::Asynchronous ); connect( m_qmlComponent, &QQmlComponent::statusChanged, this, &QmlViewStep::loadComplete ); if ( m_qmlComponent->status() == QQmlComponent::Error ) { @@ -279,7 +295,7 @@ QmlViewStep::getConfig() void QmlViewStep::setContextProperty( const char* name, QObject* property ) { - m_qmlWidget->engine()->rootContext()->setContextProperty( name, property ); + m_qmlEngine->rootContext()->setContextProperty( name, property ); } } // namespace Calamares diff --git a/src/libcalamaresui/viewpages/QmlViewStep.h b/src/libcalamaresui/viewpages/QmlViewStep.h index 9817851b6..0c36243e6 100644 --- a/src/libcalamaresui/viewpages/QmlViewStep.h +++ b/src/libcalamaresui/viewpages/QmlViewStep.h @@ -14,6 +14,7 @@ #include "viewpages/ViewStep.h" class QQmlComponent; +class QQmlEngine; class QQuickItem; class QQuickWidget; class WaitingWidget; @@ -102,14 +103,21 @@ private: void showFailedQml(); /// @brief Controls where m_name is searched - CalamaresUtils::QmlSearch m_searchMethod; + Calamares::QmlSearch m_searchMethod; QString m_name; QString m_qmlFileName; QWidget* m_widget = nullptr; WaitingWidget* m_spinner = nullptr; - QQuickWidget* m_qmlWidget = nullptr; + +#if QT_VERSION >= QT_VERSION_CHECK( 6, 0, 0 ) + QWidget* m_qmlWidget = nullptr; // Qt6: container for QQuickWindow +#else + QQuickWidget * m_qmlWidget = nullptr; +#endif + + QQmlEngine* m_qmlEngine = nullptr; // Qt5: points to QuickWidget engine, Qt6: separate engine QQmlComponent* m_qmlComponent = nullptr; QQuickItem* m_qmlObject = nullptr; }; diff --git a/src/libcalamaresui/viewpages/Slideshow.cpp b/src/libcalamaresui/viewpages/Slideshow.cpp index 2aa5060b1..66a1afaaf 100644 --- a/src/libcalamaresui/viewpages/Slideshow.cpp +++ b/src/libcalamaresui/viewpages/Slideshow.cpp @@ -47,11 +47,11 @@ SlideshowQML::SlideshowQML( QWidget* parent ) { m_qmlShow->setObjectName( "qml" ); - CalamaresUtils::registerQmlModels(); + Calamares::registerQmlModels(); m_qmlShow->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ); m_qmlShow->setResizeMode( QQuickWidget::SizeRootObjectToView ); - m_qmlShow->engine()->addImportPath( CalamaresUtils::qmlModulesDir().absolutePath() ); + m_qmlShow->engine()->addImportPath( Calamares::qmlModulesDir().absolutePath() ); cDebug() << "QML import paths:" << Logger::DebugList( m_qmlShow->engine()->importPathList() ); #if QT_VERSION >= QT_VERSION_CHECK( 5, 10, 0 ) @@ -149,7 +149,6 @@ SlideshowQML::startSlideShow() changeSlideShowState( Slideshow::Start ); } - /* * Applies V1 and V2 QML activation / deactivation: * - V1 loads the QML in @p widget on activation. Sets root object property @@ -166,7 +165,7 @@ SlideshowQML::changeSlideShowState( Action state ) if ( Branding::instance()->slideshowAPI() == 2 ) { // The QML was already loaded in the constructor, need to start it - CalamaresUtils::callQmlFunction( m_qmlObject, activate ? "onActivate" : "onLeave" ); + Calamares::callQmlFunction( m_qmlObject, activate ? "onActivate" : "onLeave" ); } else if ( !Calamares::Branding::instance()->slideshowPath().isEmpty() ) { @@ -184,7 +183,8 @@ SlideshowQML::changeSlideShowState( Action state ) { static const char propertyName[] = "activatedInCalamares"; auto property = m_qmlObject->property( propertyName ); - if ( property.isValid() && ( Calamares::typeOf( property ) == Calamares::BoolVariantType ) && ( property.toBool() != activate ) ) + if ( property.isValid() && ( Calamares::typeOf( property ) == Calamares::BoolVariantType ) + && ( property.toBool() != activate ) ) { m_qmlObject->setProperty( propertyName, activate ); } @@ -282,5 +282,4 @@ SlideshowPictures::next() m_label->setPixmap( QPixmap( m_images.at( m_imageIndex ) ) ); } - } // namespace Calamares diff --git a/src/libcalamaresui/viewpages/ViewStep.cpp b/src/libcalamaresui/viewpages/ViewStep.cpp index 26c7ee778..417f5413c 100644 --- a/src/libcalamaresui/viewpages/ViewStep.cpp +++ b/src/libcalamaresui/viewpages/ViewStep.cpp @@ -21,10 +21,8 @@ ViewStep::ViewStep( QObject* parent ) { } - ViewStep::~ViewStep() {} - QString ViewStep::prettyStatus() const { @@ -42,7 +40,6 @@ ViewStep::onActivate() { } - void ViewStep::onLeave() { @@ -58,21 +55,18 @@ ViewStep::back() { } - void ViewStep::setModuleInstanceKey( const Calamares::ModuleSystem::InstanceKey& instanceKey ) { m_instanceKey = instanceKey; } - void ViewStep::setConfigurationMap( const QVariantMap& configurationMap ) { Q_UNUSED( configurationMap ) } - RequirementsList ViewStep::checkRequirements() { diff --git a/src/libcalamaresui/widgets/PrettyRadioButton.cpp b/src/libcalamaresui/widgets/PrettyRadioButton.cpp index 62e462a58..404d9c6de 100644 --- a/src/libcalamaresui/widgets/PrettyRadioButton.cpp +++ b/src/libcalamaresui/widgets/PrettyRadioButton.cpp @@ -9,7 +9,7 @@ #include "PrettyRadioButton.h" -#include "utils/CalamaresUtilsGui.h" +#include "utils/Gui.h" #include "widgets/ClickableLabel.h" #include diff --git a/src/libcalamaresui/widgets/WaitingWidget.cpp b/src/libcalamaresui/widgets/WaitingWidget.cpp index 18acc11b7..7adc00405 100644 --- a/src/libcalamaresui/widgets/WaitingWidget.cpp +++ b/src/libcalamaresui/widgets/WaitingWidget.cpp @@ -10,7 +10,7 @@ #include "WaitingWidget.h" -#include "utils/CalamaresUtilsGui.h" +#include "utils/Gui.h" #include #include @@ -19,7 +19,7 @@ WaitingWidget::WaitingWidget( const QString& text, QWidget* parent ) : WaitingSpinnerWidget( parent, false, false ) { - int spnrSize = CalamaresUtils::defaultFontHeight() * 4; + int spnrSize = Calamares::defaultFontHeight() * 4; setFixedSize( spnrSize, spnrSize ); setInnerRadius( spnrSize / 2 ); setLineLength( spnrSize / 2 ); @@ -51,7 +51,7 @@ CountdownWaitingWidget::CountdownWaitingWidget( std::chrono::seconds duration, Q , d( std::make_unique< Private >( duration, this ) ) { // Set up the label first for sizing - const int labelHeight = qBound( 16, CalamaresUtils::defaultFontHeight() * 3 / 2, 64 ); + const int labelHeight = qBound( 16, Calamares::defaultFontHeight() * 3 / 2, 64 ); // Set up the spinner setFixedSize( labelHeight, labelHeight ); diff --git a/src/modules/contextualprocess/Binding.h b/src/modules/contextualprocess/Binding.h index 77a966caf..186118ff8 100644 --- a/src/modules/contextualprocess/Binding.h +++ b/src/modules/contextualprocess/Binding.h @@ -19,19 +19,16 @@ #include #include -namespace CalamaresUtils -{ -class CommandList; -} // namespace CalamaresUtils namespace Calamares { +class CommandList; class GlobalStorage; } // namespace Calamares -struct ValueCheck : public QPair< QString, CalamaresUtils::CommandList* > +struct ValueCheck : public QPair< QString, Calamares::CommandList* > { - ValueCheck( const QString& value, CalamaresUtils::CommandList* commands ) - : QPair< QString, CalamaresUtils::CommandList* >( value, commands ) + ValueCheck( const QString& value, Calamares::CommandList* commands ) + : QPair< QString, Calamares::CommandList* >( value, commands ) { } @@ -44,7 +41,7 @@ struct ValueCheck : public QPair< QString, CalamaresUtils::CommandList* > // by) pass-by-value in QList::append(). QString value() const { return first; } - CalamaresUtils::CommandList* commands() const { return second; } + Calamares::CommandList* commands() const { return second; } }; class ContextualProcessBinding @@ -65,7 +62,7 @@ public: * * Ownership of the CommandList passes to this binding. */ - void append( const QString& value, CalamaresUtils::CommandList* commands ); + void append( const QString& value, Calamares::CommandList* commands ); ///@brief The bound variable has @p value , run the associated commands. Calamares::JobResult run( const QString& value ) const; @@ -81,8 +78,7 @@ public: private: QString m_variable; QList< ValueCheck > m_checks; - CalamaresUtils::CommandList* m_wildcard = nullptr; + Calamares::CommandList* m_wildcard = nullptr; }; - #endif diff --git a/src/modules/contextualprocess/ContextualProcessJob.cpp b/src/modules/contextualprocess/ContextualProcessJob.cpp index 74b259114..84f9dc69a 100644 --- a/src/modules/contextualprocess/ContextualProcessJob.cpp +++ b/src/modules/contextualprocess/ContextualProcessJob.cpp @@ -20,7 +20,6 @@ #include "utils/Logger.h" #include "utils/Variant.h" - ContextualProcessBinding::~ContextualProcessBinding() { m_wildcard = nullptr; @@ -31,7 +30,7 @@ ContextualProcessBinding::~ContextualProcessBinding() } void -ContextualProcessBinding::append( const QString& value, CalamaresUtils::CommandList* commands ) +ContextualProcessBinding::append( const QString& value, Calamares::CommandList* commands ) { m_checks.append( ValueCheck( value, commands ) ); if ( value == QString( "*" ) ) @@ -80,7 +79,6 @@ fetch( QString& value, QStringList& selector, int index, const QVariant& v ) } } - bool ContextualProcessBinding::fetch( Calamares::GlobalStorage* storage, QString& value ) const { @@ -101,26 +99,22 @@ ContextualProcessBinding::fetch( Calamares::GlobalStorage* storage, QString& val } } - ContextualProcessJob::ContextualProcessJob( QObject* parent ) : Calamares::CppJob( parent ) { } - ContextualProcessJob::~ContextualProcessJob() { qDeleteAll( m_commands ); } - QString ContextualProcessJob::prettyName() const { return tr( "Contextual Processes Job" ); } - Calamares::JobResult ContextualProcessJob::exec() { @@ -145,12 +139,11 @@ ContextualProcessJob::exec() return Calamares::JobResult::ok(); } - void ContextualProcessJob::setConfigurationMap( const QVariantMap& configurationMap ) { - bool dontChroot = CalamaresUtils::getBool( configurationMap, "dontChroot", false ); - qint64 timeout = CalamaresUtils::getInteger( configurationMap, "timeout", 10 ); + bool dontChroot = Calamares::getBool( configurationMap, "dontChroot", false ); + qint64 timeout = Calamares::getInteger( configurationMap, "timeout", 10 ); if ( timeout < 1 ) { timeout = 10; @@ -183,8 +176,8 @@ ContextualProcessJob::setConfigurationMap( const QVariantMap& configurationMap ) continue; } - CalamaresUtils::CommandList* commands - = new CalamaresUtils::CommandList( valueiter.value(), !dontChroot, std::chrono::seconds( timeout ) ); + Calamares::CommandList* commands + = new Calamares::CommandList( valueiter.value(), !dontChroot, std::chrono::seconds( timeout ) ); binding->append( valueString, commands ); } diff --git a/src/modules/contextualprocess/Tests.cpp b/src/modules/contextualprocess/Tests.cpp index aa51e1192..d5a0fde49 100644 --- a/src/modules/contextualprocess/Tests.cpp +++ b/src/modules/contextualprocess/Tests.cpp @@ -14,7 +14,7 @@ #include "GlobalStorage.h" #include "JobQueue.h" -#include "utils/CalamaresUtilsSystem.h" +#include "utils/System.h" #include "utils/CommandList.h" #include "utils/Logger.h" #include "utils/Yaml.h" @@ -26,7 +26,7 @@ QTEST_GUILESS_MAIN( ContextualProcessTests ) -using CommandList = CalamaresUtils::CommandList; +using CommandList = Calamares::CommandList; ContextualProcessTests::ContextualProcessTests() {} @@ -38,7 +38,7 @@ ContextualProcessTests::initTestCase() Logger::setupLogLevel( Logger::LOGDEBUG ); // Ensure we have a system object, expect it to be a "bogus" one - CalamaresUtils::System* system = CalamaresUtils::System::instance(); + Calamares::System* system = Calamares::System::instance(); QVERIFY( system ); QVERIFY( system->doChroot() ); @@ -70,7 +70,7 @@ ContextualProcessTests::testProcessListSampleConfig() } ContextualProcessJob job; - job.setConfigurationMap( CalamaresUtils::yamlMapToVariant( doc ) ); + job.setConfigurationMap( Calamares::YAML::mapToVariant( doc ) ); QCOMPARE( job.count(), 2 ); // Only "firmwareType" and "branding.shortVersion" QCOMPARE( job.count( "firmwareType" ), 4 ); diff --git a/src/modules/dummycpp/DummyCppJob.cpp b/src/modules/dummycpp/DummyCppJob.cpp index 6f2e0ab0e..483197682 100644 --- a/src/modules/dummycpp/DummyCppJob.cpp +++ b/src/modules/dummycpp/DummyCppJob.cpp @@ -19,7 +19,7 @@ #include "JobQueue.h" #include "compat/Variant.h" -#include "utils/CalamaresUtilsSystem.h" +#include "utils/System.h" #include "utils/Logger.h" DummyCppJob::DummyCppJob( QObject* parent ) @@ -27,22 +27,18 @@ DummyCppJob::DummyCppJob( QObject* parent ) { } - DummyCppJob::~DummyCppJob() {} - QString DummyCppJob::prettyName() const { return tr( "Dummy C++ Job" ); } - static QString variantListToString( const QVariantList& variantList ); static QString variantMapToString( const QVariantMap& variantMap ); static QString variantHashToString( const QVariantHash& variantHash ); - static QString variantToString( const QVariant& variant ) { @@ -65,7 +61,6 @@ variantToString( const QVariant& variant ) } } - static QString variantListToString( const QVariantList& variantList ) { @@ -77,7 +72,6 @@ variantListToString( const QVariantList& variantList ) return '{' + result.join( ',' ) + '}'; } - static QString variantMapToString( const QVariantMap& variantMap ) { @@ -89,7 +83,6 @@ variantMapToString( const QVariantMap& variantMap ) return '[' + result.join( ',' ) + ']'; } - static QString variantHashToString( const QVariantHash& variantHash ) { @@ -101,15 +94,14 @@ variantHashToString( const QVariantHash& variantHash ) return '<' + result.join( ',' ) + '>'; } - Calamares::JobResult DummyCppJob::exec() { // Ported from dummypython - CalamaresUtils::System::runCommand( CalamaresUtils::System::RunLocation::RunInHost, - QStringList() << "/bin/sh" - << "-c" - << "touch ~/calamares-dummycpp" ); + Calamares::System::runCommand( Calamares::System::RunLocation::RunInHost, + QStringList() << "/bin/sh" + << "-c" + << "touch ~/calamares-dummycpp" ); QString accumulator = QDateTime::currentDateTimeUtc().toString( Qt::ISODate ) + '\n'; accumulator += QStringLiteral( "Calamares version: " ) + CALAMARES_VERSION_SHORT + '\n'; accumulator += QStringLiteral( "This job's name: " ) + prettyName() + '\n'; @@ -141,7 +133,6 @@ DummyCppJob::exec() return Calamares::JobResult::ok(); } - void DummyCppJob::setConfigurationMap( const QVariantMap& configurationMap ) { diff --git a/src/modules/finished/Config.cpp b/src/modules/finished/Config.cpp index d6d602db0..36f4a0bae 100644 --- a/src/modules/finished/Config.cpp +++ b/src/modules/finished/Config.cpp @@ -34,7 +34,6 @@ restartModes() return table; } - Config::Config( QObject* parent ) : QObject( parent ) { @@ -107,7 +106,6 @@ Config::onInstallationFailed( const QString& message, const QString& details ) } } - void Config::doRestart( bool restartAnyway ) { @@ -120,7 +118,6 @@ Config::doRestart( bool restartAnyway ) } } - void Config::doNotify( bool hasFailed, bool sendAnyway ) { @@ -176,14 +173,13 @@ Config::doNotify( bool hasFailed, bool sendAnyway ) } } - void Config::setConfigurationMap( const QVariantMap& configurationMap ) { RestartMode mode = RestartMode::Never; //TODO:3.3 remove deprecated restart settings - QString restartMode = CalamaresUtils::getString( configurationMap, "restartNowMode" ); + QString restartMode = Calamares::getString( configurationMap, "restartNowMode" ); if ( restartMode.isEmpty() ) { if ( configurationMap.contains( "restartNowEnabled" ) ) @@ -191,8 +187,8 @@ Config::setConfigurationMap( const QVariantMap& configurationMap ) cWarning() << "Configuring the finished module with deprecated restartNowEnabled settings"; } - bool restartNowEnabled = CalamaresUtils::getBool( configurationMap, "restartNowEnabled", false ); - bool restartNowChecked = CalamaresUtils::getBool( configurationMap, "restartNowChecked", false ); + bool restartNowEnabled = Calamares::getBool( configurationMap, "restartNowEnabled", false ); + bool restartNowChecked = Calamares::getBool( configurationMap, "restartNowChecked", false ); if ( !restartNowEnabled ) { @@ -220,7 +216,7 @@ Config::setConfigurationMap( const QVariantMap& configurationMap ) if ( mode != RestartMode::Never ) { - QString restartNowCommand = CalamaresUtils::getString( configurationMap, "restartNowCommand" ); + QString restartNowCommand = Calamares::getString( configurationMap, "restartNowCommand" ); if ( restartNowCommand.isEmpty() ) { restartNowCommand = QStringLiteral( "shutdown -r now" ); @@ -228,5 +224,5 @@ Config::setConfigurationMap( const QVariantMap& configurationMap ) m_restartNowCommand = restartNowCommand; } - m_notifyOnFinished = CalamaresUtils::getBool( configurationMap, "notifyOnFinished", false ); + m_notifyOnFinished = Calamares::getBool( configurationMap, "notifyOnFinished", false ); } diff --git a/src/modules/fsresizer/ResizeFSJob.cpp b/src/modules/fsresizer/ResizeFSJob.cpp index e17d30ebb..98e1e8253 100644 --- a/src/modules/fsresizer/ResizeFSJob.cpp +++ b/src/modules/fsresizer/ResizeFSJob.cpp @@ -35,10 +35,8 @@ ResizeFSJob::ResizeFSJob( QObject* parent ) { } - ResizeFSJob::~ResizeFSJob() {} - QString ResizeFSJob::prettyName() const { @@ -155,7 +153,6 @@ ResizeFSJob::findGrownEnd( ResizeFSJob::PartitionMatch m ) return last_available; } - Calamares::JobResult ResizeFSJob::exec() { @@ -230,7 +227,6 @@ ResizeFSJob::exec() return Calamares::JobResult::ok(); } - void ResizeFSJob::setConfigurationMap( const QVariantMap& configurationMap ) { @@ -246,7 +242,7 @@ ResizeFSJob::setConfigurationMap( const QVariantMap& configurationMap ) m_size = PartitionSize( configurationMap[ "size" ].toString() ); m_atleast = PartitionSize( configurationMap[ "atleast" ].toString() ); - m_required = CalamaresUtils::getBool( configurationMap, "required", false ); + m_required = Calamares::getBool( configurationMap, "required", false ); } CALAMARES_PLUGIN_FACTORY_DEFINITION( ResizeFSJobFactory, registerPlugin< ResizeFSJob >(); ) diff --git a/src/modules/fsresizer/Tests.cpp b/src/modules/fsresizer/Tests.cpp index 3a3e5ef30..ff12310d9 100644 --- a/src/modules/fsresizer/Tests.cpp +++ b/src/modules/fsresizer/Tests.cpp @@ -49,10 +49,10 @@ FSResizerTests::testConfigurationRobust() // Config is missing fs and dev, so it isn't valid YAML::Node doc0 = YAML::Load( R"(--- -size: 100% -atleast: 600MiB -)" ); - j.setConfigurationMap( CalamaresUtils::yamlMapToVariant( doc0 ) ); + size: 100% + atleast: 600MiB + )" ); + j.setConfigurationMap( Calamares::YAML::mapToVariant( doc0 ) ); QVERIFY( j.name().isEmpty() ); QCOMPARE( j.size().unit(), SizeUnit::None ); QCOMPARE( j.minimumSize().unit(), SizeUnit::None ); @@ -67,11 +67,11 @@ FSResizerTests::testConfigurationValues() // Check both YAML::Node doc0 = YAML::Load( R"(--- -fs: / -size: 100% -atleast: 600MiB -)" ); - j.setConfigurationMap( CalamaresUtils::yamlMapToVariant( doc0 ) ); + fs: / + size: 100% + atleast: 600MiB + )" ); + j.setConfigurationMap( Calamares::YAML::mapToVariant( doc0 ) ); QVERIFY( !j.name().isEmpty() ); QCOMPARE( j.name(), QString( "/" ) ); QCOMPARE( j.size().unit(), SizeUnit::Percent ); @@ -81,12 +81,12 @@ atleast: 600MiB // Silly config has bad atleast value doc0 = YAML::Load( R"(--- -fs: / -dev: /dev/m00 -size: 72 MiB -atleast: 127 % -)" ); - j.setConfigurationMap( CalamaresUtils::yamlMapToVariant( doc0 ) ); + fs: / + dev: /dev/m00 + size: 72 MiB + atleast: 127 % + )" ); + j.setConfigurationMap( Calamares::YAML::mapToVariant( doc0 ) ); QVERIFY( !j.name().isEmpty() ); QCOMPARE( j.name(), QString( "/" ) ); QCOMPARE( j.size().unit(), SizeUnit::MiB ); @@ -96,11 +96,11 @@ atleast: 127 % // Silly config has bad atleast value doc0 = YAML::Load( R"(--- -dev: /dev/m00 -size: 72 MiB -atleast: 127 % -)" ); - j.setConfigurationMap( CalamaresUtils::yamlMapToVariant( doc0 ) ); + dev: /dev/m00 + size: 72 MiB + atleast: 127 % + )" ); + j.setConfigurationMap( Calamares::YAML::mapToVariant( doc0 ) ); QVERIFY( !j.name().isEmpty() ); QCOMPARE( j.name(), QString( "/dev/m00" ) ); QCOMPARE( j.size().unit(), SizeUnit::MiB ); @@ -110,12 +110,12 @@ atleast: 127 % // Normal config doc0 = YAML::Load( R"(--- -fs: / + fs: / # dev: /dev/m00 -size: 71MiB + size: 71MiB # atleast: 127% -)" ); - j.setConfigurationMap( CalamaresUtils::yamlMapToVariant( doc0 ) ); + )" ); + j.setConfigurationMap( Calamares::YAML::mapToVariant( doc0 ) ); QVERIFY( !j.name().isEmpty() ); QCOMPARE( j.name(), QString( "/" ) ); QCOMPARE( j.size().unit(), SizeUnit::MiB ); diff --git a/src/modules/hostinfo/HostInfoJob.cpp b/src/modules/hostinfo/HostInfoJob.cpp index 0be419978..7b11c2c7d 100644 --- a/src/modules/hostinfo/HostInfoJob.cpp +++ b/src/modules/hostinfo/HostInfoJob.cpp @@ -11,7 +11,7 @@ #include "GlobalStorage.h" #include "JobQueue.h" -#include "utils/CalamaresUtilsSystem.h" +#include "utils/System.h" #include "utils/Logger.h" #include "utils/Units.h" @@ -35,7 +35,6 @@ HostInfoJob::HostInfoJob( QObject* parent ) HostInfoJob::~HostInfoJob() {} - QString HostInfoJob::prettyName() const { @@ -172,7 +171,6 @@ hostCPU() #endif } - Calamares::JobResult HostInfoJob::exec() { @@ -184,7 +182,7 @@ HostInfoJob::exec() gs->insert( "hostCPU", hostCPU() ); // Memory can't be negative, so it's reported as unsigned long. - auto ram = CalamaresUtils::BytesToMiB( qint64( CalamaresUtils::System::instance()->getTotalMemoryB().first ) ); + auto ram = Calamares::BytesToMiB( qint64( Calamares::System::instance()->getTotalMemoryB().first ) ); if ( ram ) { gs->insert( "hostRAMMiB", ram ); diff --git a/src/modules/initcpio/InitcpioJob.cpp b/src/modules/initcpio/InitcpioJob.cpp index df995ccbf..18c49ffd3 100644 --- a/src/modules/initcpio/InitcpioJob.cpp +++ b/src/modules/initcpio/InitcpioJob.cpp @@ -10,7 +10,7 @@ #include "InitcpioJob.h" -#include "utils/CalamaresUtilsSystem.h" +#include "utils/System.h" #include "utils/Logger.h" #include "utils/UMask.h" #include "utils/Variant.h" @@ -25,7 +25,6 @@ InitcpioJob::InitcpioJob( QObject* parent ) InitcpioJob::~InitcpioJob() {} - QString InitcpioJob::prettyName() const { @@ -56,7 +55,7 @@ fixPermissions( const QDir& d ) Calamares::JobResult InitcpioJob::exec() { - CalamaresUtils::UMask m( CalamaresUtils::UMask::Safe ); + Calamares::UMask m( Calamares::UMask::Safe ); if ( m_unsafe ) { @@ -64,7 +63,7 @@ InitcpioJob::exec() } else { - QDir d( CalamaresUtils::System::instance()->targetPath( "/boot" ) ); + QDir d( Calamares::System::instance()->targetPath( "/boot" ) ); if ( d.exists() ) { fixPermissions( d ); @@ -83,16 +82,16 @@ InitcpioJob::exec() } cDebug() << "Updating initramfs with kernel" << m_kernel; - auto r = CalamaresUtils::System::instance()->targetEnvCommand( command, QString(), QString() /* no timeout , 0 */ ); + auto r = Calamares::System::instance()->targetEnvCommand( command, QString(), QString() /* no timeout , 0 */ ); return r.explainProcess( "mkinitcpio", std::chrono::seconds( 10 ) /* fake timeout */ ); } void InitcpioJob::setConfigurationMap( const QVariantMap& configurationMap ) { - m_kernel = CalamaresUtils::getString( configurationMap, "kernel" ); + m_kernel = Calamares::getString( configurationMap, "kernel" ); - m_unsafe = CalamaresUtils::getBool( configurationMap, "be_unsafe", false ); + m_unsafe = Calamares::getBool( configurationMap, "be_unsafe", false ); } CALAMARES_PLUGIN_FACTORY_DEFINITION( InitcpioJobFactory, registerPlugin< InitcpioJob >(); ) diff --git a/src/modules/initramfs/InitramfsJob.cpp b/src/modules/initramfs/InitramfsJob.cpp index d83b4673c..5683775d7 100644 --- a/src/modules/initramfs/InitramfsJob.cpp +++ b/src/modules/initramfs/InitramfsJob.cpp @@ -9,7 +9,7 @@ #include "InitramfsJob.h" -#include "utils/CalamaresUtilsSystem.h" +#include "utils/System.h" #include "utils/Logger.h" #include "utils/UMask.h" #include "utils/Variant.h" @@ -21,18 +21,16 @@ InitramfsJob::InitramfsJob( QObject* parent ) InitramfsJob::~InitramfsJob() {} - QString InitramfsJob::prettyName() const { return tr( "Creating initramfs." ); } - Calamares::JobResult InitramfsJob::exec() { - CalamaresUtils::UMask m( CalamaresUtils::UMask::Safe ); + Calamares::UMask m( Calamares::UMask::Safe ); cDebug() << "Updating initramfs with kernel" << m_kernel; @@ -45,7 +43,7 @@ InitramfsJob::exec() // First make sure we generate a safe initramfs with suitable permissions. static const char confFile[] = "/etc/initramfs-tools/conf.d/calamares-safe-initramfs.conf"; static const char contents[] = "UMASK=0077\n"; - if ( CalamaresUtils::System::instance()->createTargetFile( confFile, QByteArray( contents ) ).failed() ) + if ( Calamares::System::instance()->createTargetFile( confFile, QByteArray( contents ) ).failed() ) { cWarning() << Logger::SubEntry << "Could not configure safe UMASK for initramfs."; // But continue anyway. @@ -53,27 +51,26 @@ InitramfsJob::exec() } // And then do the ACTUAL work. - auto r = CalamaresUtils::System::instance()->targetEnvCommand( + auto r = Calamares::System::instance()->targetEnvCommand( { "update-initramfs", "-k", m_kernel, "-c", "-t" }, QString(), QString() /* no timeout, 0 */ ); return r.explainProcess( "update-initramfs", std::chrono::seconds( 10 ) /* fake timeout */ ); } - void InitramfsJob::setConfigurationMap( const QVariantMap& configurationMap ) { - m_kernel = CalamaresUtils::getString( configurationMap, "kernel" ); + m_kernel = Calamares::getString( configurationMap, "kernel" ); if ( m_kernel.isEmpty() ) { m_kernel = QStringLiteral( "all" ); } else if ( m_kernel == "$uname" ) { - auto r = CalamaresUtils::System::runCommand( CalamaresUtils::System::RunLocation::RunInHost, - { "/bin/uname", "-r" }, - QString(), - QString(), - std::chrono::seconds( 3 ) ); + auto r = Calamares::System::runCommand( Calamares::System::RunLocation::RunInHost, + { "/bin/uname", "-r" }, + QString(), + QString(), + std::chrono::seconds( 3 ) ); if ( r.getExitCode() == 0 ) { m_kernel = r.getOutput(); @@ -87,7 +84,7 @@ InitramfsJob::setConfigurationMap( const QVariantMap& configurationMap ) } } - m_unsafe = CalamaresUtils::getBool( configurationMap, "be_unsafe", false ); + m_unsafe = Calamares::getBool( configurationMap, "be_unsafe", false ); } CALAMARES_PLUGIN_FACTORY_DEFINITION( InitramfsJobFactory, registerPlugin< InitramfsJob >(); ) diff --git a/src/modules/initramfs/Tests.cpp b/src/modules/initramfs/Tests.cpp index f1c9b5e24..44cff8b29 100644 --- a/src/modules/initramfs/Tests.cpp +++ b/src/modules/initramfs/Tests.cpp @@ -13,7 +13,7 @@ #include "JobQueue.h" #include "Settings.h" -#include "utils/CalamaresUtilsSystem.h" +#include "utils/System.h" #include "utils/Logger.h" #include "utils/Yaml.h" @@ -34,7 +34,7 @@ InitramfsTests::initTestCase() Logger::setupLogLevel( Logger::LOGDEBUG ); (void)new Calamares::JobQueue(); - (void)new CalamaresUtils::System( true ); + (void)new Calamares::System( true ); } static const char contents[] = "UMASK=0077\n"; @@ -51,7 +51,7 @@ InitramfsTests::testCreateTargetFile() { static const char short_confFile[] = "/calamares-safe-umask"; - auto* s = CalamaresUtils::System::instance(); + auto* s = Calamares::System::instance(); auto r = s->createTargetFile( short_confFile, QByteArray( contents ) ); QVERIFY( r.failed() ); QVERIFY( !r ); diff --git a/src/modules/interactiveterminal/InteractiveTerminalPage.cpp b/src/modules/interactiveterminal/InteractiveTerminalPage.cpp index 63ab722a1..46bc6d831 100644 --- a/src/modules/interactiveterminal/InteractiveTerminalPage.cpp +++ b/src/modules/interactiveterminal/InteractiveTerminalPage.cpp @@ -9,7 +9,7 @@ #include "InteractiveTerminalPage.h" -#include "utils/CalamaresUtilsGui.h" +#include "utils/Gui.h" #include "utils/Logger.h" #include "utils/Retranslator.h" #include "viewpages/ViewStep.h" diff --git a/src/modules/keyboard/Config.cpp b/src/modules/keyboard/Config.cpp index c158efcbf..8fa549bf9 100644 --- a/src/modules/keyboard/Config.cpp +++ b/src/modules/keyboard/Config.cpp @@ -43,7 +43,6 @@ xkbmap_model_args( const QString& model ) return r; } - /* Returns stringlist with suitable setxkbmap command-line arguments * to set the given @p layout and @p variant. */ @@ -213,7 +212,10 @@ Config::Config( QObject* parent ) connect( m_keyboardModelsModel, &KeyboardModelsModel::currentIndexChanged, this, &Config::selectionChange ); connect( m_keyboardLayoutsModel, &KeyboardLayoutModel::currentIndexChanged, this, &Config::selectionChange ); connect( m_keyboardVariantsModel, &KeyboardVariantsModel::currentIndexChanged, this, &Config::selectionChange ); - connect( m_KeyboardGroupSwitcherModel, &KeyboardGroupsSwitchersModel::currentIndexChanged, this, &Config::selectionChange ); + connect( m_KeyboardGroupSwitcherModel, + &KeyboardGroupsSwitchersModel::currentIndexChanged, + this, + &Config::selectionChange ); m_selectedModel = m_keyboardModelsModel->key( m_keyboardModelsModel->currentIndex() ); m_selectedLayout = m_keyboardLayoutsModel->item( m_keyboardLayoutsModel->currentIndex() ).first; @@ -306,7 +308,6 @@ Config::xkbApply() { m_additionalLayoutInfo.additionalVariant, m_selectedVariant }, m_additionalLayoutInfo.groupSwitcher ) ); - cDebug() << "xkbmap selection changed to: " << m_selectedLayout << '-' << m_selectedVariant << "(added " << m_additionalLayoutInfo.additionalLayout << "-" << m_additionalLayoutInfo.additionalVariant << " since current layout is not ASCII-capable)"; @@ -319,7 +320,6 @@ Config::xkbApply() m_setxkbmapTimer.disconnect( this ); } - KeyboardModelsModel* Config::keyboardModels() const { @@ -706,7 +706,7 @@ Config::updateVariants( const QPersistentModelIndex& currentItem, QString curren void Config::setConfigurationMap( const QVariantMap& configurationMap ) { - using namespace CalamaresUtils; + using namespace Calamares; bool isX11 = QGuiApplication::platformName() == "xcb"; const auto xorgConfDefault = QStringLiteral( "00-keyboard.conf" ); diff --git a/src/modules/keyboard/KeyboardLayoutModel.cpp b/src/modules/keyboard/KeyboardLayoutModel.cpp index 8ba30b02e..c3a8104f7 100644 --- a/src/modules/keyboard/KeyboardLayoutModel.cpp +++ b/src/modules/keyboard/KeyboardLayoutModel.cpp @@ -27,11 +27,9 @@ retranslateKeyboardModels() { s_kbtranslator = new QTranslator; } - (void)CalamaresUtils::loadTranslator( - CalamaresUtils::translatorLocaleName(), QStringLiteral( "kb_" ), s_kbtranslator ); + (void)Calamares::loadTranslator( Calamares::translatorLocaleName(), QStringLiteral( "kb_" ), s_kbtranslator ); } - XKBListModel::XKBListModel( QObject* parent ) : QAbstractListModel( parent ) { @@ -141,7 +139,6 @@ KeyboardModelsModel::KeyboardModelsModel( QObject* parent ) setCurrentIndex(); // If pc105 was seen, select it now } - KeyboardLayoutModel::KeyboardLayoutModel( QObject* parent ) : QAbstractListModel( parent ) { @@ -155,7 +152,6 @@ KeyboardLayoutModel::rowCount( const QModelIndex& parent ) const return m_layouts.count(); } - QVariant KeyboardLayoutModel::data( const QModelIndex& index, int role ) const { @@ -252,7 +248,6 @@ KeyboardLayoutModel::currentIndex() const return m_currentIndex; } - KeyboardVariantsModel::KeyboardVariantsModel( QObject* parent ) : XKBListModel( parent ) { diff --git a/src/modules/keyboard/SetKeyboardLayoutJob.cpp b/src/modules/keyboard/SetKeyboardLayoutJob.cpp index 30833a893..1337b7543 100644 --- a/src/modules/keyboard/SetKeyboardLayoutJob.cpp +++ b/src/modules/keyboard/SetKeyboardLayoutJob.cpp @@ -19,7 +19,7 @@ #include "GlobalStorage.h" #include "JobQueue.h" -#include "utils/CalamaresUtilsSystem.h" +#include "utils/System.h" #include "utils/Logger.h" #include "utils/String.h" diff --git a/src/modules/license/LicensePage.cpp b/src/modules/license/LicensePage.cpp index eb609b2da..4331c1371 100644 --- a/src/modules/license/LicensePage.cpp +++ b/src/modules/license/LicensePage.cpp @@ -19,7 +19,7 @@ #include "JobQueue.h" #include "ViewManager.h" -#include "utils/CalamaresUtilsGui.h" +#include "utils/Gui.h" #include "utils/Logger.h" #include "utils/NamedEnum.h" #include "utils/Retranslator.h" @@ -67,8 +67,8 @@ LicenseEntry::LicenseEntry( const QVariantMap& conf ) m_prettyVendor = conf.value( "vendor" ).toString(); m_url = QUrl( conf[ "url" ].toString() ); - m_required = CalamaresUtils::getBool( conf, "required", false ); - m_expand = CalamaresUtils::getBool( conf, "expand", false ); + m_required = Calamares::getBool( conf, "required", false ); + m_expand = Calamares::getBool( conf, "expand", false ); bool ok = false; QString typeString = conf.value( "type", "software" ).toString(); @@ -85,7 +85,6 @@ LicenseEntry::isLocal() const return m_url.isLocalFile(); } - LicensePage::LicensePage( QWidget* parent ) : QWidget( parent ) , m_isNextEnabled( false ) @@ -94,14 +93,14 @@ LicensePage::LicensePage( QWidget* parent ) { ui->setupUi( this ); - // ui->verticalLayout->insertSpacing( 1, CalamaresUtils::defaultFontHeight() ); - CalamaresUtils::unmarginLayout( ui->verticalLayout ); + // ui->verticalLayout->insertSpacing( 1, Calamares::defaultFontHeight() ); + Calamares::unmarginLayout( ui->verticalLayout ); ui->acceptFrame->setStyleSheet( mustAccept ); { // The inner frame was unmargined (above), reinstate margins so all are // the same *x* (an x-height, approximately). - const auto x = CalamaresUtils::defaultFontHeight() / 2; + const auto x = Calamares::defaultFontHeight() / 2; ui->acceptFrame->layout()->setContentsMargins( x, x, x, x ); } @@ -172,7 +171,6 @@ LicensePage::retranslate() } } - bool LicensePage::isNextEnabled() const { diff --git a/src/modules/locale/Config.cpp b/src/modules/locale/Config.cpp index 2a0ea79c5..d8489eccd 100644 --- a/src/modules/locale/Config.cpp +++ b/src/modules/locale/Config.cpp @@ -395,7 +395,6 @@ Config::currentTimezoneName() const return QString(); } - static inline QString localeLabel( const QString& s ) { @@ -429,7 +428,7 @@ Config::prettyStatus() const static inline void getLocaleGenLines( const QVariantMap& configurationMap, QStringList& localeGenLines ) { - QString localeGenPath = CalamaresUtils::getString( configurationMap, "localeGenPath" ); + QString localeGenPath = Calamares::getString( configurationMap, "localeGenPath" ); if ( localeGenPath.isEmpty() ) { localeGenPath = QStringLiteral( "/etc/locale.gen" ); @@ -440,8 +439,8 @@ getLocaleGenLines( const QVariantMap& configurationMap, QStringList& localeGenLi static inline void getAdjustLiveTimezone( const QVariantMap& configurationMap, bool& adjustLiveTimezone ) { - adjustLiveTimezone = CalamaresUtils::getBool( - configurationMap, "adjustLiveTimezone", Calamares::Settings::instance()->doChroot() ); + adjustLiveTimezone + = Calamares::getBool( configurationMap, "adjustLiveTimezone", Calamares::Settings::instance()->doChroot() ); #ifdef DEBUG_TIMEZONES if ( adjustLiveTimezone ) { @@ -461,8 +460,8 @@ getAdjustLiveTimezone( const QVariantMap& configurationMap, bool& adjustLiveTime static inline void getStartingTimezone( const QVariantMap& configurationMap, Calamares::GeoIP::RegionZonePair& startingTimezone ) { - QString region = CalamaresUtils::getString( configurationMap, "region" ); - QString zone = CalamaresUtils::getString( configurationMap, "zone" ); + QString region = Calamares::getString( configurationMap, "region" ); + QString zone = Calamares::getString( configurationMap, "zone" ); if ( !region.isEmpty() && !zone.isEmpty() ) { startingTimezone = Calamares::GeoIP::RegionZonePair( region, zone ); @@ -473,7 +472,7 @@ getStartingTimezone( const QVariantMap& configurationMap, Calamares::GeoIP::Regi = Calamares::GeoIP::RegionZonePair( QStringLiteral( "America" ), QStringLiteral( "New_York" ) ); } - if ( CalamaresUtils::getBool( configurationMap, "useSystemTimezone", false ) ) + if ( Calamares::getBool( configurationMap, "useSystemTimezone", false ) ) { auto systemtz = Calamares::GeoIP::splitTZString( QTimeZone::systemTimeZoneId() ); if ( systemtz.isValid() ) @@ -488,12 +487,12 @@ static inline void getGeoIP( const QVariantMap& configurationMap, std::unique_ptr< Calamares::GeoIP::Handler >& geoip ) { bool ok = false; - QVariantMap map = CalamaresUtils::getSubMap( configurationMap, "geoip", ok ); + QVariantMap map = Calamares::getSubMap( configurationMap, "geoip", ok ); if ( ok ) { - QString url = CalamaresUtils::getString( map, "url" ); - QString style = CalamaresUtils::getString( map, "style" ); - QString selector = CalamaresUtils::getString( map, "selector" ); + QString url = Calamares::getString( map, "url" ); + QString style = Calamares::getString( map, "style" ); + QString selector = Calamares::getString( map, "selector" ); geoip = std::make_unique< Calamares::GeoIP::Handler >( style, url, selector ); if ( !geoip->isValid() ) @@ -543,7 +542,6 @@ Config::finalizeGlobalStorage() const updateGSLocation( gs, currentLocation() ); } - void Config::startGeoIP() { diff --git a/src/modules/locale/LocalePage.cpp b/src/modules/locale/LocalePage.cpp index 48ce27782..dadaf7fd9 100644 --- a/src/modules/locale/LocalePage.cpp +++ b/src/modules/locale/LocalePage.cpp @@ -14,7 +14,7 @@ #include "LCLocaleDialog.h" #include "timezonewidget/timezonewidget.h" -#include "utils/CalamaresUtilsGui.h" +#include "utils/Gui.h" #include "utils/Logger.h" #include "utils/RAII.h" #include "utils/Retranslator.h" diff --git a/src/modules/locale/LocaleViewStep.cpp b/src/modules/locale/LocaleViewStep.cpp index 03d1d4f5e..3d069e72b 100644 --- a/src/modules/locale/LocaleViewStep.cpp +++ b/src/modules/locale/LocaleViewStep.cpp @@ -17,7 +17,7 @@ #include "geoip/Handler.h" #include "network/Manager.h" -#include "utils/CalamaresUtilsGui.h" +#include "utils/Gui.h" #include "utils/Logger.h" #include "utils/Variant.h" #include "utils/Yaml.h" @@ -25,7 +25,6 @@ #include #include - CALAMARES_PLUGIN_FACTORY_DEFINITION( LocaleViewStepFactory, registerPlugin< LocaleViewStep >(); ) LocaleViewStep::LocaleViewStep( QObject* parent ) @@ -37,12 +36,11 @@ LocaleViewStep::LocaleViewStep( QObject* parent ) { QBoxLayout* mainLayout = new QHBoxLayout; m_widget->setLayout( mainLayout ); - CalamaresUtils::unmarginLayout( mainLayout ); + Calamares::unmarginLayout( mainLayout ); emit nextStatusChanged( m_nextEnabled ); } - LocaleViewStep::~LocaleViewStep() { if ( m_widget && m_widget->parent() == nullptr ) @@ -51,7 +49,6 @@ LocaleViewStep::~LocaleViewStep() } } - void LocaleViewStep::setUpPage() { @@ -68,63 +65,54 @@ LocaleViewStep::setUpPage() emit nextStatusChanged( m_nextEnabled ); } - QString LocaleViewStep::prettyName() const { return tr( "Location" ); } - QString LocaleViewStep::prettyStatus() const { return m_config->prettyStatus(); } - QWidget* LocaleViewStep::widget() { return m_widget; } - bool LocaleViewStep::isNextEnabled() const { return m_nextEnabled; } - bool LocaleViewStep::isBackEnabled() const { return true; } - bool LocaleViewStep::isAtBeginning() const { return true; } - bool LocaleViewStep::isAtEnd() const { return true; } - Calamares::JobList LocaleViewStep::jobs() const { return m_config->createJobs(); } - void LocaleViewStep::onActivate() { @@ -136,14 +124,12 @@ LocaleViewStep::onActivate() m_actualWidget->onActivate(); } - void LocaleViewStep::onLeave() { m_config->finalizeGlobalStorage(); } - void LocaleViewStep::setConfigurationMap( const QVariantMap& configurationMap ) { diff --git a/src/modules/locale/SetTimezoneJob.cpp b/src/modules/locale/SetTimezoneJob.cpp index 675cca8af..e91307e3a 100644 --- a/src/modules/locale/SetTimezoneJob.cpp +++ b/src/modules/locale/SetTimezoneJob.cpp @@ -13,13 +13,12 @@ #include "GlobalStorage.h" #include "JobQueue.h" #include "Settings.h" -#include "utils/CalamaresUtilsSystem.h" +#include "utils/System.h" #include "utils/Logger.h" #include #include - SetTimezoneJob::SetTimezoneJob( const QString& region, const QString& zone ) : Calamares::Job() , m_region( region ) @@ -27,14 +26,12 @@ SetTimezoneJob::SetTimezoneJob( const QString& region, const QString& zone ) { } - QString SetTimezoneJob::prettyName() const { return tr( "Set timezone to %1/%2" ).arg( m_region ).arg( m_zone ); } - Calamares::JobResult SetTimezoneJob::exec() { @@ -42,7 +39,7 @@ SetTimezoneJob::exec() // to a running timedated over D-Bus), and we have code that works if ( !Calamares::Settings::instance()->doChroot() ) { - int ec = CalamaresUtils::System::instance()->targetEnvCall( + int ec = Calamares::System::instance()->targetEnvCall( { "timedatectl", "set-timezone", m_region + '/' + m_zone } ); if ( !ec ) @@ -63,9 +60,9 @@ SetTimezoneJob::exec() tr( "Bad path: %1" ).arg( zoneFile.absolutePath() ) ); // Make sure /etc/localtime doesn't exist, otherwise symlinking will fail - CalamaresUtils::System::instance()->targetEnvCall( { "rm", "-f", localtimeSlink } ); + Calamares::System::instance()->targetEnvCall( { "rm", "-f", localtimeSlink } ); - int ec = CalamaresUtils::System::instance()->targetEnvCall( { "ln", "-s", zoneinfoPath, localtimeSlink } ); + int ec = Calamares::System::instance()->targetEnvCall( { "ln", "-s", zoneinfoPath, localtimeSlink } ); if ( ec ) return Calamares::JobResult::error( tr( "Cannot set timezone." ), diff --git a/src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp b/src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp index b8999de50..6c68b4b53 100644 --- a/src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp +++ b/src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp @@ -7,7 +7,7 @@ #include "LuksBootKeyFileJob.h" -#include "utils/CalamaresUtilsSystem.h" +#include "utils/System.h" #include "utils/Entropy.h" #include "utils/Logger.h" #include "utils/NamedEnum.h" @@ -106,19 +106,19 @@ static const char keyfile[] = "/crypto_keyfile.bin"; static bool generateTargetKeyfile() { - CalamaresUtils::UMask m( CalamaresUtils::UMask::Safe ); + Calamares::UMask m( Calamares::UMask::Safe ); // Get the data QByteArray entropy; - auto entropySource = CalamaresUtils::getEntropy( 2048, entropy ); - if ( entropySource != CalamaresUtils::EntropySource::URandom ) + auto entropySource = Calamares::getEntropy( 2048, entropy ); + if ( entropySource != Calamares::EntropySource::URandom ) { cWarning() << "Could not get entropy from /dev/urandom for LUKS."; return false; } - auto fileResult = CalamaresUtils::System::instance()->createTargetFile( - keyfile, entropy, CalamaresUtils::System::WriteMode::Overwrite ); + auto fileResult + = Calamares::System::instance()->createTargetFile( keyfile, entropy, Calamares::System::WriteMode::Overwrite ); entropy.fill( 'A' ); if ( !fileResult ) { @@ -128,7 +128,7 @@ generateTargetKeyfile() // Give ample time to check that the file was created correctly; // we actually expect ls to return pretty-much-instantly. - auto r = CalamaresUtils::System::instance()->targetEnvCommand( + auto r = Calamares::System::instance()->targetEnvCommand( { "ls", "-la", "/" }, QString(), QString(), std::chrono::seconds( 5 ) ); cDebug() << "In target system after creating LUKS file" << r.getOutput(); return true; @@ -138,7 +138,7 @@ static bool setupLuks( const LuksDevice& d, const QString& luks2Hash ) { // Get luksDump for this device - auto luks_dump = CalamaresUtils::System::instance()->targetEnvCommand( + auto luks_dump = Calamares::System::instance()->targetEnvCommand( { QStringLiteral( "cryptsetup" ), QStringLiteral( "luksDump" ), d.device }, QString(), QString(), @@ -187,8 +187,8 @@ setupLuks( const LuksDevice& d, const QString& luks2Hash ) args.insert( 2, "--pbkdf" ); args.insert( 3, luks2Hash ); } - auto r = CalamaresUtils::System::instance()->targetEnvCommand( - args, QString(), d.passphrase, std::chrono::seconds( 60 ) ); + auto r + = Calamares::System::instance()->targetEnvCommand( args, QString(), d.passphrase, std::chrono::seconds( 60 ) ); if ( r.getExitCode() != 0 ) { cWarning() << "Could not configure LUKS keyfile on" << d.device << ':' << r.getOutput() << "(exit code" @@ -337,7 +337,7 @@ LuksBootKeyFileJob::setConfigurationMap( const QVariantMap& configurationMap ) return QString(); // Empty is used internally for "default from cryptsetup" } return value.toLower(); - }( CalamaresUtils::getString( configurationMap, QStringLiteral( "luks2Hash" ), QString() ) ); + }( Calamares::getString( configurationMap, QStringLiteral( "luks2Hash" ), QString() ) ); } CALAMARES_PLUGIN_FACTORY_DEFINITION( LuksBootKeyFileJobFactory, registerPlugin< LuksBootKeyFileJob >(); ) diff --git a/src/modules/luksopenswaphookcfg/LOSHJob.cpp b/src/modules/luksopenswaphookcfg/LOSHJob.cpp index 219c89b49..86103ecc6 100644 --- a/src/modules/luksopenswaphookcfg/LOSHJob.cpp +++ b/src/modules/luksopenswaphookcfg/LOSHJob.cpp @@ -10,7 +10,7 @@ #include "GlobalStorage.h" #include "JobQueue.h" -#include "utils/CalamaresUtilsSystem.h" +#include "utils/System.h" #include "utils/Logger.h" #include "utils/Permissions.h" #include "utils/PluginFactory.h" @@ -29,7 +29,6 @@ LOSHJob::LOSHJob( QObject* parent ) LOSHJob::~LOSHJob() {} - QString LOSHJob::prettyName() const { @@ -69,8 +68,8 @@ write_openswap_conf( const QString& path, QStringList& contents, const LOSHInfo& } cDebug() << "Writing" << contents.length() << "line configuration to" << path; // \n between each two lines, and a \n at the end - CalamaresUtils::System::instance()->createTargetFile( - path, contents.join( '\n' ).append( '\n' ).toUtf8(), CalamaresUtils::System::WriteMode::Overwrite ); + Calamares::System::instance()->createTargetFile( + path, contents.join( '\n' ).append( '\n' ).toUtf8(), Calamares::System::WriteMode::Overwrite ); } else { @@ -81,7 +80,7 @@ write_openswap_conf( const QString& path, QStringList& contents, const LOSHInfo& Calamares::JobResult LOSHJob::exec() { - const auto* sys = CalamaresUtils::System::instance(); + const auto* sys = Calamares::System::instance(); if ( !sys ) { return Calamares::JobResult::internalError( @@ -116,7 +115,7 @@ LOSHJob::exec() void LOSHJob::setConfigurationMap( const QVariantMap& configurationMap ) { - m_configFilePath = CalamaresUtils::getString( + m_configFilePath = Calamares::getString( configurationMap, QStringLiteral( "configFilePath" ), QStringLiteral( "/etc/openswap.conf" ) ); } @@ -164,8 +163,7 @@ globalStoragePartitionInfo( Calamares::GlobalStorage* gs, LOSHInfo& info ) if ( !btrfsRootSubvolume.isEmpty() ) { Calamares::String::removeLeading( btrfsRootSubvolume, '/' ); - info.keyfile_device_mount_options - = QStringLiteral( "--options=subvol=" ) + btrfsRootSubvolume; + info.keyfile_device_mount_options = QStringLiteral( "--options=subvol=" ) + btrfsRootSubvolume; } } diff --git a/src/modules/luksopenswaphookcfg/Tests.cpp b/src/modules/luksopenswaphookcfg/Tests.cpp index 840bd9355..fe5d58583 100644 --- a/src/modules/luksopenswaphookcfg/Tests.cpp +++ b/src/modules/luksopenswaphookcfg/Tests.cpp @@ -10,7 +10,7 @@ #include "GlobalStorage.h" #include "JobQueue.h" -#include "utils/CalamaresUtilsSystem.h" +#include "utils/System.h" #include "utils/Logger.h" #include @@ -48,7 +48,6 @@ LOSHTests::initTestCase() cDebug() << "LOSH test started."; } - void LOSHTests::testAssignmentExtraction_data() { @@ -65,7 +64,6 @@ LOSHTests::testAssignmentExtraction_data() // We look for assignments, but only for single-words QTest::newRow( "comment-space-eq" ) << QStringLiteral( "# Check that a = b" ) << QString(); - QTest::newRow( "assignment1" ) << QStringLiteral( "a=1" ) << QStringLiteral( "a" ); QTest::newRow( "assignment2" ) << QStringLiteral( "a = 1" ) << QStringLiteral( "a" ); QTest::newRow( "assignment3" ) << QStringLiteral( "# a=1" ) << QStringLiteral( "a" ); @@ -90,13 +88,13 @@ LOSHTests::testAssignmentExtraction() QCOMPARE( get_assignment_part( line ), match ); } -static CalamaresUtils::System* +static Calamares::System* file_setup( const QTemporaryDir& tempRoot ) { - CalamaresUtils::System* ss = CalamaresUtils::System::instance(); + Calamares::System* ss = Calamares::System::instance(); if ( !ss ) { - ss = new CalamaresUtils::System( true ); + ss = new Calamares::System( true ); } Calamares::GlobalStorage* gs @@ -136,7 +134,6 @@ LOSHTests::testLOSHInfo() QCOMPARE( i.replacementFor( QStringLiteral( "duck" ) ), QString() ); } - void LOSHTests::testConfigWriting() { @@ -199,7 +196,6 @@ LOSHTests::testConfigWriting() QCOMPARE( contents.at( 1 ), QStringLiteral( "swap_device=/dev/zram/0.zram" ) ); // expected line } - void LOSHTests::testJob() { @@ -245,7 +241,6 @@ LOSHTests::testJob() } } - QTEST_GUILESS_MAIN( LOSHTests ) #include "utils/moc-warnings.h" diff --git a/src/modules/machineid/MachineIdJob.cpp b/src/modules/machineid/MachineIdJob.cpp index fef63828a..a86105d9a 100644 --- a/src/modules/machineid/MachineIdJob.cpp +++ b/src/modules/machineid/MachineIdJob.cpp @@ -13,7 +13,7 @@ #include "MachineIdJob.h" #include "Workers.h" -#include "utils/CalamaresUtilsSystem.h" +#include "utils/System.h" #include "utils/Logger.h" #include "utils/Variant.h" @@ -27,10 +27,8 @@ MachineIdJob::MachineIdJob( QObject* parent ) { } - MachineIdJob::~MachineIdJob() {} - QString MachineIdJob::prettyName() const { @@ -58,7 +56,7 @@ MachineIdJob::exec() QString target_systemd_machineid_file = QStringLiteral( "/etc/machine-id" ); QString target_dbus_machineid_file = QStringLiteral( "/var/lib/dbus/machine-id" ); - const CalamaresUtils::System* system = CalamaresUtils::System::instance(); + const Calamares::System* system = Calamares::System::instance(); // Clear existing files for ( const auto& entropy_file : m_entropy_files ) @@ -77,7 +75,7 @@ MachineIdJob::exec() //Create new files for ( const auto& entropy_file : m_entropy_files ) { - if ( !CalamaresUtils::System::instance()->createTargetParentDirs( entropy_file ) ) + if ( !Calamares::System::instance()->createTargetParentDirs( entropy_file ) ) { return Calamares::JobResult::error( QObject::tr( "Directory not found" ), @@ -131,20 +129,19 @@ MachineIdJob::exec() return Calamares::JobResult::ok(); } - void MachineIdJob::setConfigurationMap( const QVariantMap& map ) { - m_systemd = CalamaresUtils::getBool( map, "systemd", false ); + m_systemd = Calamares::getBool( map, "systemd", false ); - m_dbus = CalamaresUtils::getBool( map, "dbus", false ); + m_dbus = Calamares::getBool( map, "dbus", false ); if ( map.contains( "dbus-symlink" ) ) { - m_dbus_symlink = CalamaresUtils::getBool( map, "dbus-symlink", false ); + m_dbus_symlink = Calamares::getBool( map, "dbus-symlink", false ); } else if ( map.contains( "symlink" ) ) { - m_dbus_symlink = CalamaresUtils::getBool( map, "symlink", false ); + m_dbus_symlink = Calamares::getBool( map, "symlink", false ); cWarning() << "MachineId: configuration setting *symlink* is deprecated, use *dbus-symlink*."; } // else it's still false from the constructor @@ -152,9 +149,9 @@ MachineIdJob::setConfigurationMap( const QVariantMap& map ) // ignore it, though, if dbus is false m_dbus_symlink = m_dbus && m_dbus_symlink; - m_entropy_copy = CalamaresUtils::getBool( map, "entropy-copy", false ); - m_entropy_files = CalamaresUtils::getStringList( map, "entropy-files" ); - if ( CalamaresUtils::getBool( map, "entropy", false ) ) + m_entropy_copy = Calamares::getBool( map, "entropy-copy", false ); + m_entropy_files = Calamares::getStringList( map, "entropy-files" ); + if ( Calamares::getBool( map, "entropy", false ) ) { cWarning() << "MachineId:: configuration setting *entropy* is deprecated, use *entropy-files* instead."; m_entropy_files.append( QStringLiteral( "/var/lib/urandom/random-seed" ) ); diff --git a/src/modules/machineid/Tests.cpp b/src/modules/machineid/Tests.cpp index 0ad3e9e8b..d30dd8c10 100644 --- a/src/modules/machineid/Tests.cpp +++ b/src/modules/machineid/Tests.cpp @@ -12,7 +12,7 @@ #include "GlobalStorage.h" #include "JobQueue.h" -#include "utils/CalamaresUtilsSystem.h" +#include "utils/System.h" #include "utils/Logger.h" #include @@ -104,7 +104,6 @@ MachineIdTests::testConfigEntropyFiles() } } - void MachineIdTests::testCopyFile() { @@ -165,7 +164,7 @@ MachineIdTests::testJob() cDebug() << "Temporary files as" << QDir::tempPath(); // Ensure we have a system object, expect it to be a "bogus" one - CalamaresUtils::System* system = CalamaresUtils::System::instance(); + Calamares::System* system = Calamares::System::instance(); QVERIFY( system ); QVERIFY( system->doChroot() ); diff --git a/src/modules/machineid/Workers.cpp b/src/modules/machineid/Workers.cpp index 79d075c86..44a488e0a 100644 --- a/src/modules/machineid/Workers.cpp +++ b/src/modules/machineid/Workers.cpp @@ -12,7 +12,7 @@ #include "Workers.h" -#include "utils/CalamaresUtilsSystem.h" +#include "utils/System.h" #include "utils/Entropy.h" #include "utils/Logger.h" @@ -95,7 +95,7 @@ createNewEntropy( int poolSize, const QString& rootMountPoint, const QString& fi } QByteArray data; - CalamaresUtils::EntropySource source = CalamaresUtils::getEntropy( poolSize, data ); + Calamares::EntropySource source = Calamares::getEntropy( poolSize, data ); entropyFile.write( data ); entropyFile.close(); if ( entropyFile.size() < data.length() ) @@ -106,14 +106,13 @@ createNewEntropy( int poolSize, const QString& rootMountPoint, const QString& fi { cWarning() << "Entropy data is" << data.length() << "bytes, rather than poolSize" << poolSize; } - if ( source != CalamaresUtils::EntropySource::URandom ) + if ( source != Calamares::EntropySource::URandom ) { cWarning() << "Entropy data for pool is low-quality."; } return Calamares::JobResult::ok(); } - Calamares::JobResult createEntropy( const EntropyGeneration kind, const QString& rootMountPoint, const QString& fileName ) { @@ -144,7 +143,7 @@ createEntropy( const EntropyGeneration kind, const QString& rootMountPoint, cons static Calamares::JobResult runCmd( const QStringList& cmd ) { - auto r = CalamaresUtils::System::instance()->targetEnvCommand( cmd ); + auto r = Calamares::System::instance()->targetEnvCommand( cmd ); if ( r.getExitCode() ) { return r.explainProcess( cmd, std::chrono::seconds( 0 ) ); diff --git a/src/modules/netinstall/Config.cpp b/src/modules/netinstall/Config.cpp index 40ba73f71..36b357c1e 100644 --- a/src/modules/netinstall/Config.cpp +++ b/src/modules/netinstall/Config.cpp @@ -42,7 +42,6 @@ Config::retranslate() emit titleLabelChanged( titleLabel() ); } - QString Config::status() const { @@ -64,7 +63,6 @@ Config::status() const __builtin_unreachable(); } - void Config::setStatus( Status s ) { @@ -84,7 +82,6 @@ Config::titleLabel() const return m_titleLabel ? m_titleLabel->get() : QString(); } - void Config::loadGroupList( const QVariantList& groupData ) { @@ -111,15 +108,14 @@ Config::loadingDone() emit statusReady(); } - void Config::setConfigurationMap( const QVariantMap& configurationMap ) { - setRequired( CalamaresUtils::getBool( configurationMap, "required", false ) ); + setRequired( Calamares::getBool( configurationMap, "required", false ) ); // Get the translations, if any bool bogus = false; - auto label = CalamaresUtils::getSubMap( configurationMap, "label", bogus ); + auto label = Calamares::getSubMap( configurationMap, "label", bogus ); // Use a different class name for translation lookup because the // .. table of strings lives in NetInstallViewStep.cpp and moving them // .. around is annoying for translators. diff --git a/src/modules/netinstall/LoaderQueue.cpp b/src/modules/netinstall/LoaderQueue.cpp index 97ddd11b8..d10e45f81 100644 --- a/src/modules/netinstall/LoaderQueue.cpp +++ b/src/modules/netinstall/LoaderQueue.cpp @@ -92,7 +92,6 @@ LoaderQueue::load() QMetaObject::invokeMethod( this, "fetchNext", Qt::QueuedConnection ); } - void LoaderQueue::fetchNext() { @@ -180,16 +179,16 @@ LoaderQueue::dataArrived() QByteArray yamlData = m_reply->readAll(); try { - YAML::Node groups = YAML::Load( yamlData.constData() ); + auto groups = ::YAML::Load( yamlData.constData() ); if ( groups.IsSequence() ) { - m_config->loadGroupList( CalamaresUtils::yamlSequenceToVariant( groups ) ); + m_config->loadGroupList( Calamares::YAML::sequenceToVariant( groups ) ); next.done( m_config->statusCode() == Config::Status::Ok ); } else if ( groups.IsMap() ) { - auto map = CalamaresUtils::yamlMapToVariant( groups ); + auto map = Calamares::YAML::mapToVariant( groups ); m_config->loadGroupList( map.value( "groups" ).toList() ); next.done( m_config->statusCode() == Config::Status::Ok ); } @@ -198,9 +197,9 @@ LoaderQueue::dataArrived() cWarning() << "NetInstall groups data does not form a sequence."; } } - catch ( YAML::Exception& e ) + catch ( ::YAML::Exception& e ) { - CalamaresUtils::explainYamlException( e, yamlData, "netinstall groups data" ); + Calamares::YAML::explainException( e, yamlData, "netinstall groups data" ); m_config->setStatus( Config::Status::FailedBadData ); } } diff --git a/src/modules/netinstall/PackageModel.cpp b/src/modules/netinstall/PackageModel.cpp index 68ed784d6..01a0205e7 100644 --- a/src/modules/netinstall/PackageModel.cpp +++ b/src/modules/netinstall/PackageModel.cpp @@ -274,7 +274,7 @@ PackageModel::setupModelData( const QVariantList& groupList, PackageTreeItem* pa PackageTreeItem* item = new PackageTreeItem( groupMap, PackageTreeItem::GroupTag { parent } ); if ( groupMap.contains( "selected" ) ) { - item->setSelected( CalamaresUtils::getBool( groupMap, "selected", false ) ? Qt::Checked : Qt::Unchecked ); + item->setSelected( Calamares::getBool( groupMap, "selected", false ) ? Qt::Checked : Qt::Unchecked ); } if ( groupMap.contains( "packages" ) ) { diff --git a/src/modules/netinstall/PackageTreeItem.cpp b/src/modules/netinstall/PackageTreeItem.cpp index d5b680ea0..ddb08c5c7 100644 --- a/src/modules/netinstall/PackageTreeItem.cpp +++ b/src/modules/netinstall/PackageTreeItem.cpp @@ -37,7 +37,7 @@ parentCriticality( const QVariantMap& groupData, PackageTreeItem* parent ) { if ( groupData.contains( "critical" ) ) { - return CalamaresUtils::getBool( groupData, "critical", false ); + return Calamares::getBool( groupData, "critical", false ); } return parent ? parent->isCritical() : false; } @@ -55,9 +55,9 @@ PackageTreeItem::PackageTreeItem( const QString& packageName, PackageTreeItem* p PackageTreeItem::PackageTreeItem( const QVariantMap& groupData, PackageTag&& parent ) : m_parentItem( parent.parent ) - , m_packageName( CalamaresUtils::getString( groupData, "name" ) ) + , m_packageName( Calamares::getString( groupData, "name" ) ) , m_selected( parentCheckState( parent.parent ) ) - , m_description( CalamaresUtils::getString( groupData, "description" ) ) + , m_description( Calamares::getString( groupData, "description" ) ) , m_isGroup( false ) , m_isCritical( parent.parent ? parent.parent->isCritical() : false ) , m_showReadOnly( parent.parent ? parent.parent->isImmutable() : false ) @@ -67,18 +67,18 @@ PackageTreeItem::PackageTreeItem( const QVariantMap& groupData, PackageTag&& par PackageTreeItem::PackageTreeItem( const QVariantMap& groupData, GroupTag&& parent ) : m_parentItem( parent.parent ) - , m_name( CalamaresUtils::getString( groupData, "name" ) ) + , m_name( Calamares::getString( groupData, "name" ) ) , m_selected( parentCheckState( parent.parent ) ) - , m_description( CalamaresUtils::getString( groupData, "description" ) ) - , m_preScript( CalamaresUtils::getString( groupData, "pre-install" ) ) - , m_postScript( CalamaresUtils::getString( groupData, "post-install" ) ) - , m_source( CalamaresUtils::getString( groupData, "source" ) ) + , m_description( Calamares::getString( groupData, "description" ) ) + , m_preScript( Calamares::getString( groupData, "pre-install" ) ) + , m_postScript( Calamares::getString( groupData, "post-install" ) ) + , m_source( Calamares::getString( groupData, "source" ) ) , m_isGroup( true ) , m_isCritical( parentCriticality( groupData, parent.parent ) ) - , m_isHidden( CalamaresUtils::getBool( groupData, "hidden", false ) ) - , m_showReadOnly( CalamaresUtils::getBool( groupData, "immutable", false ) ) - , m_showNoncheckable( CalamaresUtils::getBool( groupData, "noncheckable", false ) ) - , m_startExpanded( CalamaresUtils::getBool( groupData, "expanded", false ) ) + , m_isHidden( Calamares::getBool( groupData, "hidden", false ) ) + , m_showReadOnly( Calamares::getBool( groupData, "immutable", false ) ) + , m_showNoncheckable( Calamares::getBool( groupData, "noncheckable", false ) ) + , m_startExpanded( Calamares::getBool( groupData, "expanded", false ) ) { } @@ -151,7 +151,6 @@ PackageTreeItem::parentItem() const return m_parentItem; } - bool PackageTreeItem::hiddenSelected() const { @@ -179,7 +178,6 @@ PackageTreeItem::hiddenSelected() const return m_selected != Qt::Unchecked; } - void PackageTreeItem::setSelected( Qt::CheckState isSelected ) { @@ -239,7 +237,6 @@ PackageTreeItem::updateSelected() } } - void PackageTreeItem::setChildrenSelected( Qt::CheckState isSelected ) { diff --git a/src/modules/netinstall/Tests.cpp b/src/modules/netinstall/Tests.cpp index 6b1db020c..8e93322bc 100644 --- a/src/modules/netinstall/Tests.cpp +++ b/src/modules/netinstall/Tests.cpp @@ -131,8 +131,8 @@ static const char doc_with_expanded[] = void ItemTests::testExtendedPackage() { - YAML::Node yamldoc = YAML::Load( doc ); - QVariantList yamlContents = CalamaresUtils::yamlSequenceToVariant( yamldoc ); + auto yamldoc = ::YAML::Load( doc ); + QVariantList yamlContents = Calamares::YAML::sequenceToVariant( yamldoc ); QCOMPARE( yamlContents.length(), 1 ); @@ -154,12 +154,11 @@ ItemTests::testExtendedPackage() QVERIFY( p == p ); } - void ItemTests::testGroup() { - YAML::Node yamldoc = YAML::Load( doc ); - QVariantList yamlContents = CalamaresUtils::yamlSequenceToVariant( yamldoc ); + auto yamldoc = ::YAML::Load( doc ); + QVariantList yamlContents = Calamares::YAML::sequenceToVariant( yamldoc ); QCOMPARE( yamlContents.length(), 1 ); @@ -209,8 +208,8 @@ ItemTests::testCompare() PackageTreeItem r3( "", nullptr ); QVERIFY( r3 == r2 ); - YAML::Node yamldoc = YAML::Load( doc ); // See testGroup() - QVariantList yamlContents = CalamaresUtils::yamlSequenceToVariant( yamldoc ); + auto yamldoc = ::YAML::Load( doc ); // See testGroup() + QVariantList yamlContents = Calamares::YAML::sequenceToVariant( yamldoc ); QCOMPARE( yamlContents.length(), 1 ); PackageTreeItem p3( yamlContents[ 0 ].toMap(), PackageTreeItem::GroupTag { nullptr } ); @@ -219,10 +218,10 @@ ItemTests::testCompare() QVERIFY( p1 != p3 ); QCOMPARE( p3.childCount(), 0 ); // Doesn't load the packages: list - PackageTreeItem p4( CalamaresUtils::yamlSequenceToVariant( YAML::Load( doc ) )[ 0 ].toMap(), + PackageTreeItem p4( Calamares::YAML::sequenceToVariant( YAML::Load( doc ) )[ 0 ].toMap(), PackageTreeItem::GroupTag { nullptr } ); QVERIFY( p3 == p4 ); - PackageTreeItem p5( CalamaresUtils::yamlSequenceToVariant( YAML::Load( doc_no_packages ) )[ 0 ].toMap(), + PackageTreeItem p5( Calamares::YAML::sequenceToVariant( YAML::Load( doc_no_packages ) )[ 0 ].toMap(), PackageTreeItem::GroupTag { nullptr } ); QVERIFY( p3 == p5 ); } @@ -257,12 +256,11 @@ ItemTests::recursiveCompare( PackageModel& l, PackageModel& r ) return recursiveCompare( l.m_rootItem, r.m_rootItem ); } - void ItemTests::testModel() { - YAML::Node yamldoc = YAML::Load( doc ); // See testGroup() - QVariantList yamlContents = CalamaresUtils::yamlSequenceToVariant( yamldoc ); + auto yamldoc = ::YAML::Load( doc ); // See testGroup() + QVariantList yamlContents = Calamares::YAML::sequenceToVariant( yamldoc ); QCOMPARE( yamlContents.length(), 1 ); PackageModel m0( nullptr ); @@ -275,7 +273,7 @@ ItemTests::testModel() checkAllSelected( m0.m_rootItem ); PackageModel m2( nullptr ); - m2.setupModelData( CalamaresUtils::yamlSequenceToVariant( YAML::Load( doc_with_expanded ) ) ); + m2.setupModelData( Calamares::YAML::sequenceToVariant( YAML::Load( doc_with_expanded ) ) ); QCOMPARE( m2.m_hiddenItems.count(), 0 ); QCOMPARE( m2.rowCount(), 1 ); // Group, now the packages expanded but not counted QCOMPARE( m2.rowCount( m2.index( 0, 0 ) ), 3 ); // The packages @@ -324,7 +322,7 @@ ItemTests::testExampleFiles() QVERIFY( !contents.isEmpty() ); YAML::Node yamldoc = YAML::Load( contents.constData() ); - QVariantList yamlContents = CalamaresUtils::yamlSequenceToVariant( yamldoc ); + QVariantList yamlContents = Calamares::YAML::sequenceToVariant( yamldoc ); PackageModel m1( nullptr ); m1.setupModelData( yamlContents ); @@ -388,7 +386,7 @@ ItemTests::testUrlFallback() try { YAML::Node yamldoc = YAML::Load( correctedDocument.toUtf8() ); - auto map = CalamaresUtils::yamlToVariant( yamldoc ).toMap(); + auto map = Calamares::YAML::toVariant( yamldoc ).toMap(); QVERIFY( map.count() > 0 ); c.setConfigurationMap( map ); } @@ -420,7 +418,6 @@ ItemTests::testUrlFallback() QCOMPARE( c.model()->rowCount(), count ); } - QTEST_GUILESS_MAIN( ItemTests ) #include "utils/moc-warnings.h" diff --git a/src/modules/networkcfg/main.py b/src/modules/networkcfg/main.py index 807fdf613..ed130c33a 100644 --- a/src/modules/networkcfg/main.py +++ b/src/modules/networkcfg/main.py @@ -14,6 +14,7 @@ # import os +import glob import shutil import libcalamares @@ -131,6 +132,21 @@ def run(): except FileExistsError: pass + # Also install netplan files + source_netplan = "/etc/netplan" + root_mount_point = libcalamares.globalstorage.value("rootMountPoint") + target_netplan = os.path.join(root_mount_point, source_netplan.lstrip('/')) + + if os.path.exists(source_netplan) and os.path.exists(target_netplan): + for cfg in glob.glob(os.path.join(source_netplan, "90-NM-*")): + source_cfg = os.path.join(source_netplan, cfg) + target_cfg = os.path.join(target_netplan, os.path.basename(cfg)) + + if os.path.exists(target_cfg): + continue + + shutil.copy(source_cfg, target_cfg) + # We need to overwrite the default resolv.conf in the chroot. source_resolv, target_resolv = path_pair(root_mount_point, "etc/resolv.conf") if source_resolv != target_resolv and os.path.exists(source_resolv): diff --git a/src/modules/notesqml/NotesQmlViewStep.cpp b/src/modules/notesqml/NotesQmlViewStep.cpp index cacd932b0..ff346bd62 100644 --- a/src/modules/notesqml/NotesQmlViewStep.cpp +++ b/src/modules/notesqml/NotesQmlViewStep.cpp @@ -27,7 +27,7 @@ void NotesQmlViewStep::setConfigurationMap( const QVariantMap& configurationMap ) { bool qmlLabel_ok = false; - auto qmlLabel = CalamaresUtils::getSubMap( configurationMap, "qmlLabel", qmlLabel_ok ); + auto qmlLabel = Calamares::getSubMap( configurationMap, "qmlLabel", qmlLabel_ok ); if ( qmlLabel.contains( "notes" ) ) { diff --git a/src/modules/notesqml/NotesQmlViewStep.h b/src/modules/notesqml/NotesQmlViewStep.h index 337378086..71ea31326 100644 --- a/src/modules/notesqml/NotesQmlViewStep.h +++ b/src/modules/notesqml/NotesQmlViewStep.h @@ -11,7 +11,7 @@ #include "DllMacro.h" #include "locale/TranslatableConfiguration.h" -#include "utils/CalamaresUtilsSystem.h" +#include "utils/System.h" #include "utils/PluginFactory.h" #include "utils/Variant.h" #include "viewpages/QmlViewStep.h" diff --git a/src/modules/oemid/OEMViewStep.cpp b/src/modules/oemid/OEMViewStep.cpp index 0663efdbd..bf3700164 100644 --- a/src/modules/oemid/OEMViewStep.cpp +++ b/src/modules/oemid/OEMViewStep.cpp @@ -40,7 +40,6 @@ public: OEMPage::~OEMPage() {} - OEMViewStep::OEMViewStep( QObject* parent ) : Calamares::ViewStep( parent ) , m_widget( nullptr ) @@ -125,7 +124,6 @@ OEMViewStep::prettyStatus() const return tr( "Set the OEM Batch Identifier to %1." ).arg( m_user_batchIdentifier ); } - QWidget* OEMViewStep::widget() { @@ -145,7 +143,7 @@ OEMViewStep::jobs() const void OEMViewStep::setConfigurationMap( const QVariantMap& configurationMap ) { - m_conf_batchIdentifier = CalamaresUtils::getString( configurationMap, "batch-identifier" ); + m_conf_batchIdentifier = Calamares::getString( configurationMap, "batch-identifier" ); m_user_batchIdentifier = substitute( m_conf_batchIdentifier ); } diff --git a/src/modules/packagechooser/Config.cpp b/src/modules/packagechooser/Config.cpp index 6a064dcd2..1d5b74f2c 100644 --- a/src/modules/packagechooser/Config.cpp +++ b/src/modules/packagechooser/Config.cpp @@ -20,7 +20,6 @@ #include #endif - #include "GlobalStorage.h" #include "JobQueue.h" #include "compat/Variant.h" @@ -223,7 +222,6 @@ Config::updateGlobalStorage() const } } - void Config::setPackageChoice( const QString& packageChoice ) { @@ -312,9 +310,9 @@ fillModel( PackageListModel* model, const QVariantList& items ) void Config::setConfigurationMap( const QVariantMap& configurationMap ) { - m_mode = packageChooserModeNames().find( CalamaresUtils::getString( configurationMap, "mode" ), + m_mode = packageChooserModeNames().find( Calamares::getString( configurationMap, "mode" ), PackageChooserMode::Required ); - m_method = PackageChooserMethodNames().find( CalamaresUtils::getString( configurationMap, "method" ), + m_method = PackageChooserMethodNames().find( Calamares::getString( configurationMap, "method" ), PackageChooserMethod::Legacy ); if ( m_method == PackageChooserMethod::Legacy ) @@ -326,7 +324,7 @@ Config::setConfigurationMap( const QVariantMap& configurationMap ) { fillModel( m_model, configurationMap.value( "items" ).toList() ); - QString default_item_id = CalamaresUtils::getString( configurationMap, "default" ); + QString default_item_id = Calamares::getString( configurationMap, "default" ); if ( !default_item_id.isEmpty() ) { for ( int item_n = 0; item_n < m_model->packageCount(); ++item_n ) @@ -344,7 +342,7 @@ Config::setConfigurationMap( const QVariantMap& configurationMap ) } else { - setPackageChoice( CalamaresUtils::getString( configurationMap, "packageChoice" ) ); + setPackageChoice( Calamares::getString( configurationMap, "packageChoice" ) ); if ( m_method != PackageChooserMethod::Legacy ) { cWarning() << "Single-selection QML module must use 'Legacy' method."; @@ -352,7 +350,7 @@ Config::setConfigurationMap( const QVariantMap& configurationMap ) } bool labels_ok = false; - auto labels = CalamaresUtils::getSubMap( configurationMap, "labels", labels_ok ); + auto labels = Calamares::getSubMap( configurationMap, "labels", labels_ok ); if ( labels_ok ) { if ( labels.contains( "step" ) ) diff --git a/src/modules/packagechooser/ItemAppData.cpp b/src/modules/packagechooser/ItemAppData.cpp index dd1eb1fb7..0986230f5 100644 --- a/src/modules/packagechooser/ItemAppData.cpp +++ b/src/modules/packagechooser/ItemAppData.cpp @@ -179,7 +179,7 @@ getNameAndSummary( const QDomNode& n ) PackageItem fromAppData( const QVariantMap& item_map ) { - QString fileName = CalamaresUtils::getString( item_map, "appdata" ); + QString fileName = Calamares::getString( item_map, "appdata" ); if ( fileName.isEmpty() ) { cWarning() << "Can't load AppData without a suitable key."; @@ -197,7 +197,7 @@ fromAppData( const QVariantMap& item_map ) if ( !componentNode.isNull() && componentNode.tagName() == "component" ) { // An "id" entry in the Calamares config overrides ID in the AppData - QString id = CalamaresUtils::getString( item_map, "id" ); + QString id = Calamares::getString( item_map, "id" ); if ( id.isEmpty() ) { id = getChildText( componentNode, "id" ); @@ -208,7 +208,7 @@ fromAppData( const QVariantMap& item_map ) } // A "screenshot" entry in the Calamares config overrides AppData - QString screenshotPath = CalamaresUtils::getString( item_map, "screenshot" ); + QString screenshotPath = Calamares::getString( item_map, "screenshot" ); if ( screenshotPath.isEmpty() ) { screenshotPath = getScreenshotPath( componentNode ); diff --git a/src/modules/packagechooser/ItemAppStream.cpp b/src/modules/packagechooser/ItemAppStream.cpp index e286bd1ff..d83af6f91 100644 --- a/src/modules/packagechooser/ItemAppStream.cpp +++ b/src/modules/packagechooser/ItemAppStream.cpp @@ -112,7 +112,7 @@ fromComponent( AppStream::Component& component ) PackageItem fromAppStream( AppStream::Pool& pool, const QVariantMap& item_map ) { - QString appstreamId = CalamaresUtils::getString( item_map, "appstream" ); + QString appstreamId = Calamares::getString( item_map, "appstream" ); if ( appstreamId.isEmpty() ) { cWarning() << "Can't load AppStream without a suitable appstreamId."; @@ -134,8 +134,8 @@ fromAppStream( AppStream::Pool& pool, const QVariantMap& item_map ) auto r = fromComponent( itemList.first() ); if ( r.isValid() ) { - QString id = CalamaresUtils::getString( item_map, "id" ); - QString screenshotPath = CalamaresUtils::getString( item_map, "screenshot" ); + QString id = Calamares::getString( item_map, "id" ); + QString screenshotPath = Calamares::getString( item_map, "screenshot" ); if ( !id.isEmpty() ) { r.id = id; diff --git a/src/modules/packagechooser/PackageChooserPage.cpp b/src/modules/packagechooser/PackageChooserPage.cpp index 721329c1b..44a570d2f 100644 --- a/src/modules/packagechooser/PackageChooserPage.cpp +++ b/src/modules/packagechooser/PackageChooserPage.cpp @@ -11,7 +11,7 @@ #include "ui_page_package.h" -#include "utils/CalamaresUtilsGui.h" +#include "utils/Gui.h" #include "utils/Logger.h" #include "utils/Retranslator.h" @@ -43,7 +43,7 @@ PackageChooserPage::PackageChooserPage( PackageChooserMode mode, QWidget* parent ui->products->setSelectionMode( QAbstractItemView::ExtendedSelection ); } - ui->products->setMinimumWidth( 10 * CalamaresUtils::defaultFontHeight() ); + ui->products->setMinimumWidth( 10 * Calamares::defaultFontHeight() ); } void diff --git a/src/modules/packagechooser/PackageChooserViewStep.cpp b/src/modules/packagechooser/PackageChooserViewStep.cpp index e3b27df5c..89b226879 100644 --- a/src/modules/packagechooser/PackageChooserViewStep.cpp +++ b/src/modules/packagechooser/PackageChooserViewStep.cpp @@ -16,7 +16,7 @@ #include "GlobalStorage.h" #include "JobQueue.h" #include "locale/TranslatableConfiguration.h" -#include "utils/CalamaresUtilsSystem.h" +#include "utils/System.h" #include "utils/Logger.h" #include "utils/Variant.h" diff --git a/src/modules/packagechooser/PackageModel.cpp b/src/modules/packagechooser/PackageModel.cpp index 10eaf05db..d183680b0 100644 --- a/src/modules/packagechooser/PackageModel.cpp +++ b/src/modules/packagechooser/PackageModel.cpp @@ -15,14 +15,14 @@ #include -/** @brief A wrapper for CalamaresUtils::getSubMap that excludes the success param +/** @brief A wrapper for Calamares::getSubMap that excludes the success param */ static QVariantMap getSubMap( const QVariantMap& map, const QString& key ) { bool success; - return CalamaresUtils::getSubMap( map, key, success ); + return Calamares::getSubMap( map, key, success ); } static QPixmap @@ -62,11 +62,11 @@ PackageItem::PackageItem( const QString& a_id, } PackageItem::PackageItem( const QVariantMap& item_map ) - : id( CalamaresUtils::getString( item_map, "id" ) ) + : id( Calamares::getString( item_map, "id" ) ) , name( Calamares::Locale::TranslatedString( item_map, "name" ) ) , description( Calamares::Locale::TranslatedString( item_map, "description" ) ) - , screenshot( loadScreenshot( CalamaresUtils::getString( item_map, "screenshot" ) ) ) - , packageNames( CalamaresUtils::getStringList( item_map, "packages" ) ) + , screenshot( loadScreenshot( Calamares::getString( item_map, "screenshot" ) ) ) + , packageNames( Calamares::getStringList( item_map, "packages" ) ) , netinstallData( getSubMap( item_map, "netinstall" ) ) { if ( name.isEmpty() && id.isEmpty() ) diff --git a/src/modules/packagechooserq/PackageChooserQmlViewStep.cpp b/src/modules/packagechooserq/PackageChooserQmlViewStep.cpp index ae4aa3c48..15b0d87a2 100644 --- a/src/modules/packagechooserq/PackageChooserQmlViewStep.cpp +++ b/src/modules/packagechooserq/PackageChooserQmlViewStep.cpp @@ -13,7 +13,7 @@ #include "GlobalStorage.h" #include "JobQueue.h" #include "locale/TranslatableConfiguration.h" -#include "utils/CalamaresUtilsSystem.h" +#include "utils/System.h" #include "utils/Logger.h" #include "utils/Variant.h" diff --git a/src/modules/partition/Config.cpp b/src/modules/partition/Config.cpp index 083fe3685..4a84046b3 100644 --- a/src/modules/partition/Config.cpp +++ b/src/modules/partition/Config.cpp @@ -94,7 +94,6 @@ pickOne( const Config::SwapChoiceSet& s ) return *( s.begin() ); } - static Config::SwapChoiceSet getSwapChoices( const QVariantMap& configurationMap ) { @@ -112,13 +111,13 @@ getSwapChoices( const QVariantMap& configurationMap ) { cWarning() << "Partition-module setting *ensureSuspendToDisk* is deprecated."; } - bool ensureSuspendToDisk = CalamaresUtils::getBool( configurationMap, "ensureSuspendToDisk", true ); + bool ensureSuspendToDisk = Calamares::getBool( configurationMap, "ensureSuspendToDisk", true ); if ( configurationMap.contains( "neverCreateSwap" ) ) { cWarning() << "Partition-module setting *neverCreateSwap* is deprecated."; } - bool neverCreateSwap = CalamaresUtils::getBool( configurationMap, "neverCreateSwap", false ); + bool neverCreateSwap = Calamares::getBool( configurationMap, "neverCreateSwap", false ); Config::SwapChoiceSet choices; // Available swap choices if ( configurationMap.contains( "userSwapChoices" ) ) @@ -268,7 +267,6 @@ Config::acceptPartitionTableType( PartitionTable::TableType tableType ) const || m_requiredPartitionTableType.contains( PartitionTable::tableTypeToName( tableType ) ); } - static void fillGSConfigurationEFI( Calamares::GlobalStorage* gs, const QVariantMap& configurationMap ) { @@ -277,12 +275,12 @@ fillGSConfigurationEFI( Calamares::GlobalStorage* gs, const QVariantMap& configu gs->insert( "firmwareType", firmwareType ); gs->insert( "efiSystemPartition", - CalamaresUtils::getString( configurationMap, "efiSystemPartition", QStringLiteral( "/boot/efi" ) ) ); + Calamares::getString( configurationMap, "efiSystemPartition", QStringLiteral( "/boot/efi" ) ) ); // Read and parse key efiSystemPartitionSize if ( configurationMap.contains( "efiSystemPartitionSize" ) ) { - const QString sizeString = CalamaresUtils::getString( configurationMap, "efiSystemPartitionSize" ); + const QString sizeString = Calamares::getString( configurationMap, "efiSystemPartitionSize" ); Calamares::Partition::PartitionSize part_size = Calamares::Partition::PartitionSize( sizeString ); if ( part_size.isValid() ) { @@ -308,7 +306,7 @@ fillGSConfigurationEFI( Calamares::GlobalStorage* gs, const QVariantMap& configu // Read and parse key efiSystemPartitionName if ( configurationMap.contains( "efiSystemPartitionName" ) ) { - gs->insert( "efiSystemPartitionName", CalamaresUtils::getString( configurationMap, "efiSystemPartitionName" ) ); + gs->insert( "efiSystemPartitionName", Calamares::getString( configurationMap, "efiSystemPartitionName" ) ); } } @@ -317,10 +315,9 @@ Config::fillConfigurationFSTypes( const QVariantMap& configurationMap ) { Calamares::GlobalStorage* gs = Calamares::JobQueue::instance()->globalStorage(); - // The defaultFileSystemType setting needs a bit more processing, // as we want to cover various cases (such as different cases) - QString fsName = CalamaresUtils::getString( configurationMap, "defaultFileSystemType" ); + QString fsName = Calamares::getString( configurationMap, "defaultFileSystemType" ); QString fsRealName; FileSystem::Type fsType = FileSystem::Type::Unknown; if ( fsName.isEmpty() ) @@ -347,7 +344,7 @@ Config::fillConfigurationFSTypes( const QVariantMap& configurationMap ) gs->insert( "defaultFileSystemType", fsRealName ); // TODO: canonicalize the names? How is translation supposed to work? - m_eraseFsTypes = CalamaresUtils::getStringList( configurationMap, "availableFileSystemTypes" ); + m_eraseFsTypes = Calamares::getStringList( configurationMap, "availableFileSystemTypes" ); if ( !m_eraseFsTypes.contains( fsRealName ) ) { if ( !m_eraseFsTypes.isEmpty() ) @@ -366,7 +363,7 @@ Config::fillConfigurationFSTypes( const QVariantMap& configurationMap ) // Set LUKS file system based on luksGeneration provided, defaults to 'luks'. bool nameFound = false; Config::LuksGeneration luksGeneration - = luksGenerationNames().find( CalamaresUtils::getString( configurationMap, "luksGeneration" ), nameFound ); + = luksGenerationNames().find( Calamares::getString( configurationMap, "luksGeneration" ), nameFound ); if ( !nameFound ) { cWarning() << "Partition-module setting *luksGeneration* not found or invalid. Defaulting to luks1."; @@ -387,16 +384,16 @@ void Config::setConfigurationMap( const QVariantMap& configurationMap ) { // Settings that overlap with the Welcome module - m_requiredStorageGiB = CalamaresUtils::getDouble( configurationMap, "requiredStorage", -1.0 ); + m_requiredStorageGiB = Calamares::getDouble( configurationMap, "requiredStorage", -1.0 ); m_swapChoices = getSwapChoices( configurationMap ); bool nameFound = false; // In the name table (ignored, falls back to first entry in table) - m_initialInstallChoice = installChoiceNames().find( - CalamaresUtils::getString( configurationMap, "initialPartitioningChoice" ), nameFound ); + m_initialInstallChoice + = installChoiceNames().find( Calamares::getString( configurationMap, "initialPartitioningChoice" ), nameFound ); setInstallChoice( m_initialInstallChoice ); m_initialSwapChoice - = swapChoiceNames().find( CalamaresUtils::getString( configurationMap, "initialSwapChoice" ), nameFound ); + = swapChoiceNames().find( Calamares::getString( configurationMap, "initialSwapChoice" ), nameFound ); if ( !m_swapChoices.contains( m_initialSwapChoice ) ) { cWarning() << "Configuration for *initialSwapChoice* is not one of the *userSwapChoices*"; @@ -409,14 +406,14 @@ Config::setConfigurationMap( const QVariantMap& configurationMap ) } setSwapChoice( m_initialSwapChoice ); - m_allowZfsEncryption = CalamaresUtils::getBool( configurationMap, "allowZfsEncryption", true ); + m_allowZfsEncryption = Calamares::getBool( configurationMap, "allowZfsEncryption", true ); - m_allowManualPartitioning = CalamaresUtils::getBool( configurationMap, "allowManualPartitioning", true ); - m_showNotEncryptedBootMessage = CalamaresUtils::getBool( configurationMap, "showNotEncryptedBootMessage", true ); - m_requiredPartitionTableType = CalamaresUtils::getStringList( configurationMap, "requiredPartitionTableType" ); + m_allowManualPartitioning = Calamares::getBool( configurationMap, "allowManualPartitioning", true ); + m_showNotEncryptedBootMessage = Calamares::getBool( configurationMap, "showNotEncryptedBootMessage", true ); + m_requiredPartitionTableType = Calamares::getStringList( configurationMap, "requiredPartitionTableType" ); Calamares::GlobalStorage* gs = Calamares::JobQueue::instance()->globalStorage(); - gs->insert( "armInstall", CalamaresUtils::getBool( configurationMap, "armInstall", false ) ); + gs->insert( "armInstall", Calamares::getBool( configurationMap, "armInstall", false ) ); fillGSConfigurationEFI( gs, configurationMap ); fillConfigurationFSTypes( configurationMap ); } diff --git a/src/modules/partition/PartitionViewStep.cpp b/src/modules/partition/PartitionViewStep.cpp index b653af716..01dd7098b 100644 --- a/src/modules/partition/PartitionViewStep.cpp +++ b/src/modules/partition/PartitionViewStep.cpp @@ -25,7 +25,7 @@ #include "Branding.h" #include "GlobalStorage.h" #include "JobQueue.h" -#include "utils/CalamaresUtilsGui.h" +#include "utils/Gui.h" #include "utils/Logger.h" #include "utils/QtCompat.h" #include "utils/Retranslator.h" @@ -59,7 +59,6 @@ PartitionViewStep::PartitionViewStep( QObject* parent ) // We're not done loading, but we need the configuration map first. } - void PartitionViewStep::initPartitionCoreModule() { @@ -67,7 +66,6 @@ PartitionViewStep::initPartitionCoreModule() m_core->init(); } - void PartitionViewStep::continueLoading() { @@ -90,7 +88,6 @@ PartitionViewStep::continueLoading() connect( m_choicePage, &ChoicePage::nextStatusChanged, this, &PartitionViewStep::nextPossiblyChanged ); } - PartitionViewStep::~PartitionViewStep() { if ( m_choicePage && m_choicePage->parent() == nullptr ) @@ -104,7 +101,6 @@ PartitionViewStep::~PartitionViewStep() delete m_core; } - QString PartitionViewStep::prettyName() const { @@ -233,31 +229,31 @@ PartitionViewStep::createSummaryWidget() const QWidget* widget = new QWidget; QVBoxLayout* mainLayout = new QVBoxLayout; widget->setLayout( mainLayout ); - CalamaresUtils::unmarginLayout( mainLayout ); + Calamares::unmarginLayout( mainLayout ); Config::InstallChoice choice = m_config->installChoice(); QFormLayout* formLayout = new QFormLayout( widget ); - const int MARGIN = CalamaresUtils::defaultFontHeight() / 2; + const int MARGIN = Calamares::defaultFontHeight() / 2; formLayout->setContentsMargins( MARGIN, 0, MARGIN, MARGIN ); mainLayout->addLayout( formLayout ); #if defined( DEBUG_PARTITION_UNSAFE ) || defined( DEBUG_PARTITION_BAIL_OUT ) || defined( DEBUG_PARTITION_SKIP ) - auto specialRow = [ = ]( CalamaresUtils::ImageType t, const QString& s ) + auto specialRow = [ = ]( Calamares::ImageType t, const QString& s ) { QLabel* icon = new QLabel; - icon->setPixmap( CalamaresUtils::defaultPixmap( t ) ); + icon->setPixmap( Calamares::defaultPixmap( t ) ); formLayout->addRow( icon, new QLabel( s ) ); }; #endif #if defined( DEBUG_PARTITION_UNSAFE ) - specialRow( CalamaresUtils::ImageType::StatusWarning, tr( "Unsafe partition actions are enabled." ) ); + specialRow( Calamares::ImageType::StatusWarning, tr( "Unsafe partition actions are enabled." ) ); #endif #if defined( DEBUG_PARTITION_BAIL_OUT ) - specialRow( CalamaresUtils::ImageType::Information, tr( "Partitioning is configured to always fail." ) ); + specialRow( Calamares::ImageType::Information, tr( "Partitioning is configured to always fail." ) ); #endif #if defined( DEBUG_PARTITION_SKIP ) - specialRow( CalamaresUtils::ImageType::Information, tr( "No partitions will be changed." ) ); + specialRow( Calamares::ImageType::Information, tr( "No partitions will be changed." ) ); #endif const QList< PartitionCoreModule::SummaryInfo > list = m_core->createSummaryInfo(); @@ -293,7 +289,7 @@ PartitionViewStep::createSummaryWidget() const previewLabels->setSelectionMode( QAbstractItemView::NoSelection ); info.partitionModelBefore->setParent( widget ); field = new QVBoxLayout; - CalamaresUtils::unmarginLayout( field ); + Calamares::unmarginLayout( field ); field->setSpacing( 6 ); field->addWidget( preview ); field->addWidget( previewLabels ); @@ -311,7 +307,7 @@ PartitionViewStep::createSummaryWidget() const Calamares::Branding::instance()->string( Calamares::Branding::BootloaderEntryName ) ); info.partitionModelAfter->setParent( widget ); field = new QVBoxLayout; - CalamaresUtils::unmarginLayout( field ); + Calamares::unmarginLayout( field ); field->setSpacing( 6 ); field->addWidget( preview ); field->addWidget( previewLabels ); @@ -323,7 +319,7 @@ PartitionViewStep::createSummaryWidget() const QLabel* jobsLabel = new QLabel( widget ); mainLayout->addWidget( jobsLabel ); jobsLabel->setText( jobsLines.join( "
" ) ); - jobsLabel->setMargin( CalamaresUtils::defaultFontHeight() / 2 ); + jobsLabel->setMargin( Calamares::defaultFontHeight() / 2 ); QPalette pal; pal.setColor( WindowBackground, pal.window().color().lighter( 108 ) ); jobsLabel->setAutoFillBackground( true ); @@ -362,7 +358,6 @@ PartitionViewStep::next() } } - void PartitionViewStep::back() { @@ -379,7 +374,6 @@ PartitionViewStep::back() } } - bool PartitionViewStep::isNextEnabled() const { @@ -408,7 +402,6 @@ PartitionViewStep::isBackEnabled() const return true; } - bool PartitionViewStep::isAtBeginning() const { @@ -419,7 +412,6 @@ PartitionViewStep::isAtBeginning() const return true; } - bool PartitionViewStep::isAtEnd() const { @@ -436,7 +428,6 @@ PartitionViewStep::isAtEnd() const return true; } - void PartitionViewStep::onActivate() { @@ -471,7 +462,7 @@ shouldWarnForGPTOnBIOS( const PartitionCoreModule* core ) // So this is a BIOS system, and the bootloader will be installed on a GPT system for ( const auto& partition : qAsConst( table->children() ) ) { - using CalamaresUtils::Units::operator""_MiB; + using Calamares::Units::operator""_MiB; if ( ( partition->activeFlags() & KPM_PARTITION_FLAG( BiosGrub ) ) && ( partition->fileSystem().type() == FileSystem::Unformatted ) && ( partition->capacity() >= 8_MiB ) ) @@ -492,7 +483,7 @@ shouldWarnForGPTOnBIOS( const PartitionCoreModule* core ) } static bool -shouldWarnForNotEncryptedBoot( const Config* config, const PartitionCoreModule* core) +shouldWarnForNotEncryptedBoot( const Config* config, const PartitionCoreModule* core ) { if ( config->showNotEncryptedBootMessage() ) { @@ -501,8 +492,7 @@ shouldWarnForNotEncryptedBoot( const Config* config, const PartitionCoreModule* if ( root_p and boot_p ) { - if ( ( root_p->fileSystem().type() == FileSystem::Luks - && boot_p->fileSystem().type() != FileSystem::Luks ) + if ( ( root_p->fileSystem().type() == FileSystem::Luks && boot_p->fileSystem().type() != FileSystem::Luks ) || ( root_p->fileSystem().type() == FileSystem::Luks2 && boot_p->fileSystem().type() != FileSystem::Luks2 ) ) { @@ -574,7 +564,7 @@ PartitionViewStep::onLeave() { cDebug() << o << "ESP too small"; const qint64 atLeastBytes = static_cast< qint64 >( PartUtils::efiFilesystemMinimumSize() ); - const auto atLeastMiB = CalamaresUtils::BytesToMiB( atLeastBytes ); + const auto atLeastMiB = Calamares::BytesToMiB( atLeastBytes ); description.append( ' ' ); description.append( tr( "The filesystem must be at least %1 MiB in size." ).arg( atLeastMiB ) ); } @@ -631,20 +621,19 @@ PartitionViewStep::onLeave() { QString message = tr( "Boot partition not encrypted" ); QString description = tr( "A separate boot partition was set up together with " - "an encrypted root partition, but the boot partition " - "is not encrypted." - "

" - "There are security concerns with this kind of " - "setup, because important system files are kept " - "on an unencrypted partition.
" - "You may continue if you wish, but filesystem " - "unlocking will happen later during system startup." - "
To encrypt the boot partition, go back and " - "recreate it, selecting Encrypt " - "in the partition creation window." ); + "an encrypted root partition, but the boot partition " + "is not encrypted." + "

" + "There are security concerns with this kind of " + "setup, because important system files are kept " + "on an unencrypted partition.
" + "You may continue if you wish, but filesystem " + "unlocking will happen later during system startup." + "
To encrypt the boot partition, go back and " + "recreate it, selecting Encrypt " + "in the partition creation window." ); - QMessageBox mb( - QMessageBox::Warning, message, description, QMessageBox::Ok, m_manualPartitionPage ); + QMessageBox mb( QMessageBox::Warning, message, description, QMessageBox::Ok, m_manualPartitionPage ); Calamares::fixButtonLabels( &mb ); mb.exec(); } @@ -663,18 +652,18 @@ PartitionViewStep::setConfigurationMap( const QVariantMap& configurationMap ) // Read and parse key swapPartitionName if ( configurationMap.contains( "swapPartitionName" ) ) { - gs->insert( "swapPartitionName", CalamaresUtils::getString( configurationMap, "swapPartitionName" ) ); + gs->insert( "swapPartitionName", Calamares::getString( configurationMap, "swapPartitionName" ) ); } // OTHER SETTINGS // - gs->insert( "drawNestedPartitions", CalamaresUtils::getBool( configurationMap, "drawNestedPartitions", false ) ); + gs->insert( "drawNestedPartitions", Calamares::getBool( configurationMap, "drawNestedPartitions", false ) ); gs->insert( "alwaysShowPartitionLabels", - CalamaresUtils::getBool( configurationMap, "alwaysShowPartitionLabels", true ) ); + Calamares::getBool( configurationMap, "alwaysShowPartitionLabels", true ) ); gs->insert( "enableLuksAutomatedPartitioning", - CalamaresUtils::getBool( configurationMap, "enableLuksAutomatedPartitioning", true ) ); + Calamares::getBool( configurationMap, "enableLuksAutomatedPartitioning", true ) ); - QString partitionTableName = CalamaresUtils::getString( configurationMap, "defaultPartitionTableType" ); + QString partitionTableName = Calamares::getString( configurationMap, "defaultPartitionTableType" ); if ( partitionTableName.isEmpty() ) { cWarning() << "Partition-module setting *defaultPartitionTableType* is unset, " @@ -706,7 +695,6 @@ PartitionViewStep::setConfigurationMap( const QVariantMap& configurationMap ) m_core->partitionLayout().init( m_config->defaultFsType(), configurationMap.value( "partitionLayout" ).toList() ); } - Calamares::JobList PartitionViewStep::jobs() const { @@ -737,5 +725,4 @@ PartitionViewStep::checkRequirements() return l; } - CALAMARES_PLUGIN_FACTORY_DEFINITION( PartitionViewStepFactory, registerPlugin< PartitionViewStep >(); ) diff --git a/src/modules/partition/core/DeviceList.cpp b/src/modules/partition/core/DeviceList.cpp index b81c28be6..531db660f 100644 --- a/src/modules/partition/core/DeviceList.cpp +++ b/src/modules/partition/core/DeviceList.cpp @@ -11,7 +11,7 @@ #include "DeviceList.h" #include "partition/PartitionIterator.h" -#include "utils/CalamaresUtilsSystem.h" +#include "utils/System.h" #include "utils/Logger.h" #include @@ -49,7 +49,7 @@ static bool blkIdCheckIso9660( const QString& path ) { // If blkid fails, there's no output, but we don't care - auto r = CalamaresUtils::System::runCommand( { "blkid", path }, std::chrono::seconds( 30 ) ); + auto r = Calamares::System::runCommand( { "blkid", path }, std::chrono::seconds( 30 ) ); return r.getOutput().contains( "iso9660" ); } diff --git a/src/modules/partition/core/DeviceModel.cpp b/src/modules/partition/core/DeviceModel.cpp index 6959ac9c2..160cc7ba7 100644 --- a/src/modules/partition/core/DeviceModel.cpp +++ b/src/modules/partition/core/DeviceModel.cpp @@ -13,7 +13,7 @@ #include "core/PartitionModel.h" #include "core/SizeUtils.h" -#include "utils/CalamaresUtilsGui.h" +#include "utils/Gui.h" #include "utils/Logger.h" // KPMcore @@ -94,16 +94,15 @@ DeviceModel::data( const QModelIndex& index, int role ) const } } case Qt::DecorationRole: - return CalamaresUtils::defaultPixmap( - CalamaresUtils::PartitionDisk, - CalamaresUtils::Original, - QSize( CalamaresUtils::defaultIconSize().width() * 2, CalamaresUtils::defaultIconSize().height() * 2 ) ); + return Calamares::defaultPixmap( + Calamares::PartitionDisk, + Calamares::Original, + QSize( Calamares::defaultIconSize().width() * 2, Calamares::defaultIconSize().height() * 2 ) ); default: return QVariant(); } } - Device* DeviceModel::deviceForIndex( const QModelIndex& index ) const { @@ -115,7 +114,6 @@ DeviceModel::deviceForIndex( const QModelIndex& index ) const return m_devices.at( row ); } - void DeviceModel::swapDevice( Device* oldDevice, Device* newDevice ) { diff --git a/src/modules/partition/core/PartUtils.cpp b/src/modules/partition/core/PartUtils.cpp index e3bb40a00..5cbe392e8 100644 --- a/src/modules/partition/core/PartUtils.cpp +++ b/src/modules/partition/core/PartUtils.cpp @@ -20,7 +20,7 @@ #include "partition/Mount.h" #include "partition/PartitionIterator.h" #include "partition/PartitionQuery.h" -#include "utils/CalamaresUtilsSystem.h" +#include "utils/System.h" #include "utils/Logger.h" #include "utils/RAII.h" @@ -97,7 +97,7 @@ canBeReplaced( Partition* candidate, const Logger::Once& o ) } qint64 availableStorageB = candidate->capacity(); - qint64 requiredStorageB = CalamaresUtils::GiBtoBytes( requiredStorageGiB + 0.5 ); + qint64 requiredStorageB = Calamares::GiBtoBytes( requiredStorageGiB + 0.5 ); if ( availableStorageB > requiredStorageB ) { @@ -111,12 +111,11 @@ canBeReplaced( Partition* candidate, const Logger::Once& o ) deb << Logger::Continuation << "Required storage B:" << requiredStorageB << QString( "(%1GiB)" ).arg( requiredStorageGiB ); deb << Logger::Continuation << "Available storage B:" << availableStorageB - << QString( "(%1GiB)" ).arg( CalamaresUtils::BytesToGiB( availableStorageB ) ); + << QString( "(%1GiB)" ).arg( Calamares::BytesToGiB( availableStorageB ) ); return false; } } - bool canBeResized( Partition* candidate, const Logger::Once& o ) { @@ -174,7 +173,7 @@ canBeResized( Partition* candidate, const Logger::Once& o ) // We require a little more for partitioning overhead and swap file double advisedStorageGiB = requiredStorageGiB + 0.5 + 2.0; qint64 availableStorageB = candidate->available(); - qint64 advisedStorageB = CalamaresUtils::GiBtoBytes( advisedStorageGiB ); + qint64 advisedStorageB = Calamares::GiBtoBytes( advisedStorageGiB ); if ( availableStorageB > advisedStorageB ) { @@ -189,14 +188,13 @@ canBeResized( Partition* candidate, const Logger::Once& o ) deb << Logger::Continuation << "Required storage B:" << advisedStorageB << QString( "(%1GiB)" ).arg( advisedStorageGiB ); deb << Logger::Continuation << "Available storage B:" << availableStorageB - << QString( "(%1GiB)" ).arg( CalamaresUtils::BytesToGiB( availableStorageB ) ) << "for" + << QString( "(%1GiB)" ).arg( Calamares::BytesToGiB( availableStorageB ) ) << "for" << convenienceName( candidate ) << "length:" << candidate->length() << "sectorsUsed:" << candidate->sectorsUsed() << "fsType:" << candidate->fileSystem().name(); return false; } } - bool canBeResized( DeviceModel* dm, const QString& partitionPath, const Logger::Once& o ) { @@ -221,14 +219,13 @@ canBeResized( DeviceModel* dm, const QString& partitionPath, const Logger::Once& } } - static FstabEntryList lookForFstabEntries( const QString& partitionPath ) { QStringList mountOptions { "ro" }; - auto r = CalamaresUtils::System::runCommand( CalamaresUtils::System::RunLocation::RunInHost, - { "blkid", "-s", "TYPE", "-o", "value", partitionPath } ); + auto r = Calamares::System::runCommand( Calamares::System::RunLocation::RunInHost, + { "blkid", "-s", "TYPE", "-o", "value", partitionPath } ); if ( r.getExitCode() ) { cWarning() << "blkid on" << partitionPath << "failed."; @@ -279,7 +276,6 @@ lookForFstabEntries( const QString& partitionPath ) return fstabEntries; } - static QString findPartitionPathForMountPoint( const FstabEntryList& fstab, const QString& mountPoint ) { @@ -355,7 +351,6 @@ findPartitionPathForMountPoint( const FstabEntryList& fstab, const QString& moun return QString(); } - OsproberEntryList runOsprober( DeviceModel* dm ) { @@ -495,7 +490,6 @@ isEfiFilesystemSuitableSize( const Partition* candidate ) } } - bool isEfiBootable( const Partition* candidate ) { @@ -510,7 +504,7 @@ isEfiBootable( const Partition* candidate ) qint64 efiFilesystemMinimumSize() { - using CalamaresUtils::Units::operator""_MiB; + using Calamares::Units::operator""_MiB; qint64 uefisys_part_sizeB = 300_MiB; @@ -530,7 +524,6 @@ efiFilesystemMinimumSize() return uefisys_part_sizeB; } - QString canonicalFilesystemName( const QString& fsName, FileSystem::Type* fsType ) { diff --git a/src/modules/partition/core/PartitionActions.cpp b/src/modules/partition/core/PartitionActions.cpp index 801cb1e75..3e4558691 100644 --- a/src/modules/partition/core/PartitionActions.cpp +++ b/src/modules/partition/core/PartitionActions.cpp @@ -18,7 +18,7 @@ #include "GlobalStorage.h" #include "JobQueue.h" -#include "utils/CalamaresUtilsSystem.h" +#include "utils/System.h" #include "utils/Logger.h" #include "utils/NamedEnum.h" #include "utils/Units.h" @@ -28,7 +28,7 @@ #include -using namespace CalamaresUtils::Units; +using namespace Calamares::Units; static quint64 swapSuggestion( const quint64 availableSpaceB, Config::SwapChoice swap ) @@ -40,7 +40,7 @@ swapSuggestion( const quint64 availableSpaceB, Config::SwapChoice swap ) // See partition.conf for explanation quint64 suggestedSwapSizeB = 0; - auto [ availableRamB, overestimationFactor ] = CalamaresUtils::System::instance()->getTotalMemoryB(); + auto [ availableRamB, overestimationFactor ] = Calamares::System::instance()->getTotalMemoryB(); bool ensureSuspendToDisk = swap == Config::SwapChoice::FullSwap; @@ -65,7 +65,6 @@ swapSuggestion( const quint64 availableSpaceB, Config::SwapChoice swap ) suggestedSwapSizeB = qMin( quint64( 8_GiB ), suggestedSwapSizeB ); } - // Allow for a fudge factor suggestedSwapSizeB = quint64( qRound64( qreal( suggestedSwapSizeB ) * overestimationFactor ) ); @@ -76,7 +75,7 @@ swapSuggestion( const quint64 availableSpaceB, Config::SwapChoice swap ) } // TODO: make Units functions work on unsigned - cDebug() << "Suggested swap size:" << CalamaresUtils::BytesToGiB( suggestedSwapSizeB ) << "GiB"; + cDebug() << "Suggested swap size:" << Calamares::BytesToGiB( suggestedSwapSizeB ) << "GiB"; return suggestedSwapSizeB; } @@ -101,7 +100,7 @@ doAutopartition( PartitionCoreModule* core, Device* dev, Choices::AutoPartitionO // Since sectors count from 0, if the space is 2048 sectors in size, // the first free sector has number 2048 (and there are 2048 sectors // before that one, numbered 0..2047). - qint64 firstFreeSector = CalamaresUtils::bytesToSectors( empty_space_sizeB, dev->logicalSize() ); + qint64 firstFreeSector = Calamares::bytesToSectors( empty_space_sizeB, dev->logicalSize() ); PartitionTable::TableType partType = PartitionTable::nameToTableType( o.defaultPartitionTableType ); if ( partType == PartitionTable::unknownTableType ) @@ -120,7 +119,7 @@ doAutopartition( PartitionCoreModule* core, Device* dev, Choices::AutoPartitionO if ( isEfi ) { qint64 uefisys_part_sizeB = PartUtils::efiFilesystemMinimumSize(); - qint64 efiSectorCount = CalamaresUtils::bytesToSectors( uefisys_part_sizeB, dev->logicalSize() ); + qint64 efiSectorCount = Calamares::bytesToSectors( uefisys_part_sizeB, dev->logicalSize() ); Q_ASSERT( efiSectorCount > 0 ); // Since sectors count from 0, and this partition is created starting @@ -210,7 +209,6 @@ doAutopartition( PartitionCoreModule* core, Device* dev, Choices::AutoPartitionO core->dumpQueue(); } - void doReplacePartition( PartitionCoreModule* core, Device* dev, Partition* partition, Choices::ReplacePartitionOptions o ) { diff --git a/src/modules/partition/core/PartitionLayout.cpp b/src/modules/partition/core/PartitionLayout.cpp index 38d1e9fd0..4575a68af 100644 --- a/src/modules/partition/core/PartitionLayout.cpp +++ b/src/modules/partition/core/PartitionLayout.cpp @@ -78,7 +78,6 @@ PartitionLayout::PartitionEntry::PartitionEntry( const QString& label, PartUtils::canonicalFilesystemName( fs, &partFileSystem ); } - bool PartitionLayout::addEntry( const PartitionEntry& entry ) { @@ -111,16 +110,16 @@ PartitionLayout::init( FileSystem::Type defaultFsType, const QVariantList& confi break; } - if ( !addEntry( { CalamaresUtils::getString( pentry, "name" ), - CalamaresUtils::getString( pentry, "uuid" ), - CalamaresUtils::getString( pentry, "type" ), - CalamaresUtils::getUnsignedInteger( pentry, "attributes", 0 ), - CalamaresUtils::getString( pentry, "mountPoint" ), - CalamaresUtils::getString( pentry, "filesystem", "unformatted" ), - CalamaresUtils::getSubMap( pentry, "features", ok ), - CalamaresUtils::getString( pentry, "size", QStringLiteral( "0" ) ), - CalamaresUtils::getString( pentry, "minSize", QStringLiteral( "0" ) ), - CalamaresUtils::getString( pentry, "maxSize", QStringLiteral( "0" ) ) } ) ) + if ( !addEntry( { Calamares::getString( pentry, "name" ), + Calamares::getString( pentry, "uuid" ), + Calamares::getString( pentry, "type" ), + Calamares::getUnsignedInteger( pentry, "attributes", 0 ), + Calamares::getString( pentry, "mountPoint" ), + Calamares::getString( pentry, "filesystem", "unformatted" ), + Calamares::getSubMap( pentry, "features", ok ), + Calamares::getString( pentry, "size", QStringLiteral( "0" ) ), + Calamares::getString( pentry, "minSize", QStringLiteral( "0" ) ), + Calamares::getString( pentry, "maxSize", QStringLiteral( "0" ) ) } ) ) { cError() << "Partition layout entry #" << config.indexOf( r ) << "is invalid, switching to default layout."; m_partLayout.clear(); @@ -199,7 +198,6 @@ PartitionLayout::setDefaultFsType( FileSystem::Type defaultFsType ) m_defaultFsType = defaultFsType; } - QList< Partition* > PartitionLayout::createPartitions( Device* dev, qint64 firstSector, diff --git a/src/modules/partition/gui/BootInfoWidget.cpp b/src/modules/partition/gui/BootInfoWidget.cpp index 4bfa6f8f4..b4339be9a 100644 --- a/src/modules/partition/gui/BootInfoWidget.cpp +++ b/src/modules/partition/gui/BootInfoWidget.cpp @@ -7,11 +7,10 @@ * */ - #include "BootInfoWidget.h" #include "core/PartUtils.h" -#include "utils/CalamaresUtilsGui.h" +#include "utils/Gui.h" #include "utils/QtCompat.h" #include "utils/Retranslator.h" @@ -29,20 +28,19 @@ BootInfoWidget::BootInfoWidget( QWidget* parent ) QHBoxLayout* mainLayout = new QHBoxLayout; setLayout( mainLayout ); - CalamaresUtils::unmarginLayout( mainLayout ); + Calamares::unmarginLayout( mainLayout ); mainLayout->addWidget( m_bootIcon ); mainLayout->addWidget( m_bootLabel ); - QSize iconSize = CalamaresUtils::defaultIconSize(); + QSize iconSize = Calamares::defaultIconSize(); m_bootIcon->setMargin( 0 ); m_bootIcon->setFixedSize( iconSize ); - m_bootIcon->setPixmap( - CalamaresUtils::defaultPixmap( CalamaresUtils::BootEnvironment, CalamaresUtils::Original, iconSize ) ); + m_bootIcon->setPixmap( Calamares::defaultPixmap( Calamares::BootEnvironment, Calamares::Original, iconSize ) ); QFontMetrics fm = QFontMetrics( QFont() ); - m_bootLabel->setMinimumWidth( fm.boundingRect( "BIOS" ).width() + CalamaresUtils::defaultFontHeight() / 2 ); + m_bootLabel->setMinimumWidth( fm.boundingRect( "BIOS" ).width() + Calamares::defaultFontHeight() / 2 ); m_bootLabel->setAlignment( Qt::AlignCenter ); QPalette palette; diff --git a/src/modules/partition/gui/ChoicePage.cpp b/src/modules/partition/gui/ChoicePage.cpp index f397a39be..313eda2ed 100644 --- a/src/modules/partition/gui/ChoicePage.cpp +++ b/src/modules/partition/gui/ChoicePage.cpp @@ -36,7 +36,7 @@ #include "JobQueue.h" #include "partition/PartitionIterator.h" #include "partition/PartitionQuery.h" -#include "utils/CalamaresUtilsGui.h" +#include "utils/Gui.h" #include "utils/Logger.h" #include "utils/Retranslator.h" #include "utils/Units.h" @@ -54,10 +54,10 @@ #include #include -using Calamares::Widgets::PrettyRadioButton; using Calamares::Partition::findPartitionByPath; using Calamares::Partition::isPartitionFreeSpace; using Calamares::Partition::PartitionIterator; +using Calamares::Widgets::PrettyRadioButton; using InstallChoice = Config::InstallChoice; using SwapChoice = Config::SwapChoice; @@ -96,7 +96,7 @@ ChoicePage::ChoicePage( Config* config, QWidget* parent ) BootInfoWidget* bootInfoWidget = new BootInfoWidget( this ); m_drivesLayout->insertWidget( 0, bootInfoWidget ); - m_drivesLayout->insertSpacing( 1, CalamaresUtils::defaultFontHeight() / 2 ); + m_drivesLayout->insertSpacing( 1, Calamares::defaultFontHeight() / 2 ); m_drivesCombo = new QComboBox( this ); m_mainLayout->setStretchFactor( m_drivesLayout, 0 ); @@ -112,7 +112,7 @@ ChoicePage::ChoicePage( Config* config, QWidget* parent ) m_messageLabel->setWordWrap( true ); m_messageLabel->hide(); - CalamaresUtils::unmarginLayout( m_itemsLayout ); + Calamares::unmarginLayout( m_itemsLayout ); // Drive selector + preview CALAMARES_RETRANSLATE_SLOT( &ChoicePage::retranslate ); @@ -128,7 +128,6 @@ ChoicePage::ChoicePage( Config* config, QWidget* parent ) updateNextEnabled(); } - ChoicePage::~ChoicePage() {} void @@ -143,7 +142,6 @@ ChoicePage::retranslate() updateChoiceButtonsTr(); } - /** @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 @@ -175,7 +173,6 @@ ChoicePage::init( PartitionCoreModule* core ) setupChoices(); - // We need to do this because a PCM revert invalidates the deviceModel. connect( core, &PartitionCoreModule::reverted, @@ -195,7 +192,6 @@ ChoicePage::init( PartitionCoreModule* core ) ChoicePage::applyDeviceChoice(); } - /** @brief Creates a combobox with the given choices in it. * * Pre-selects the choice given by @p dflt. @@ -251,26 +247,25 @@ ChoicePage::setupChoices() // 3) Manual // TBD: upgrade option? - QSize iconSize( CalamaresUtils::defaultIconSize().width() * 2, CalamaresUtils::defaultIconSize().height() * 2 ); + QSize iconSize( Calamares::defaultIconSize().width() * 2, Calamares::defaultIconSize().height() * 2 ); m_grp = new QButtonGroup( this ); m_alongsideButton = new PrettyRadioButton; m_alongsideButton->setIconSize( iconSize ); m_alongsideButton->setIcon( - CalamaresUtils::defaultPixmap( CalamaresUtils::PartitionAlongside, CalamaresUtils::Original, iconSize ) ); + Calamares::defaultPixmap( Calamares::PartitionAlongside, Calamares::Original, iconSize ) ); m_alongsideButton->addToGroup( m_grp, InstallChoice::Alongside ); m_eraseButton = new PrettyRadioButton; m_eraseButton->setIconSize( iconSize ); - m_eraseButton->setIcon( - CalamaresUtils::defaultPixmap( CalamaresUtils::PartitionEraseAuto, CalamaresUtils::Original, iconSize ) ); + m_eraseButton->setIcon( Calamares::defaultPixmap( Calamares::PartitionEraseAuto, Calamares::Original, iconSize ) ); m_eraseButton->addToGroup( m_grp, InstallChoice::Erase ); m_replaceButton = new PrettyRadioButton; m_replaceButton->setIconSize( iconSize ); m_replaceButton->setIcon( - CalamaresUtils::defaultPixmap( CalamaresUtils::PartitionReplaceOs, CalamaresUtils::Original, iconSize ) ); + Calamares::defaultPixmap( Calamares::PartitionReplaceOs, Calamares::Original, iconSize ) ); m_replaceButton->addToGroup( m_grp, InstallChoice::Replace ); // Fill up swap options @@ -307,7 +302,7 @@ ChoicePage::setupChoices() m_somethingElseButton = new PrettyRadioButton; m_somethingElseButton->setIconSize( iconSize ); m_somethingElseButton->setIcon( - CalamaresUtils::defaultPixmap( CalamaresUtils::PartitionManual, CalamaresUtils::Original, iconSize ) ); + Calamares::defaultPixmap( Calamares::PartitionManual, Calamares::Original, iconSize ) ); m_itemsLayout->addWidget( m_somethingElseButton ); m_somethingElseButton->addToGroup( m_grp, InstallChoice::Manual ); @@ -355,7 +350,6 @@ ChoicePage::setupChoices() updateChoiceButtonsTr(); } - /** * @brief ChoicePage::selectedDevice queries the device picker (which may be a combo or * a list view) to get a pointer to the currently selected Device. @@ -372,7 +366,6 @@ ChoicePage::selectedDevice() return currentDevice; } - void ChoicePage::hideButtons() { @@ -395,7 +388,6 @@ ChoicePage::checkInstallChoiceRadioButton( InstallChoice c ) m_grp->setExclusive( true ); } - /** * @brief ChoicePage::applyDeviceChoice handler for the selected event of the device * picker. Calls ChoicePage::selectedDevice() to get the current Device*, then @@ -430,7 +422,6 @@ ChoicePage::applyDeviceChoice() } } - void ChoicePage::continueApplyDeviceChoice() { @@ -515,7 +506,7 @@ ChoicePage::applyActionChoice( InstallChoice choice ) m_config->luksFileSystemType(), m_encryptWidget->passphrase(), gs->value( "efiSystemPartition" ).toString(), - CalamaresUtils::GiBtoBytes( + Calamares::GiBtoBytes( gs->value( "requiredStorageGiB" ).toDouble() ), m_config->swapChoice() }; @@ -602,7 +593,6 @@ ChoicePage::applyActionChoice( InstallChoice choice ) updateActionChoicePreview( choice ); } - void ChoicePage::doAlongsideSetupSplitter( const QModelIndex& current, const QModelIndex& previous ) { @@ -633,7 +623,7 @@ ChoicePage::doAlongsideSetupSplitter( const QModelIndex& current, const QModelIn double requiredStorageGB = Calamares::JobQueue::instance()->globalStorage()->value( "requiredStorageGiB" ).toDouble(); - qint64 requiredStorageB = CalamaresUtils::GiBtoBytes( requiredStorageGB + 0.1 + 2.0 ); + qint64 requiredStorageB = Calamares::GiBtoBytes( requiredStorageGB + 0.1 + 2.0 ); m_afterPartitionSplitterWidget->setSplitPartition( part->partitionPath(), qRound64( part->used() * 1.1 ), @@ -650,7 +640,6 @@ ChoicePage::doAlongsideSetupSplitter( const QModelIndex& current, const QModelIn updateNextEnabled(); } - void ChoicePage::onEncryptWidgetStateChanged() { @@ -673,7 +662,6 @@ ChoicePage::onEncryptWidgetStateChanged() updateNextEnabled(); } - void ChoicePage::onHomeCheckBoxStateChanged() { @@ -684,7 +672,6 @@ ChoicePage::onHomeCheckBoxStateChanged() } } - void ChoicePage::onLeave() { @@ -745,7 +732,6 @@ ChoicePage::onLeave() } } - void ChoicePage::doAlongsideApply() { @@ -786,7 +772,6 @@ ChoicePage::doAlongsideApply() } } - void ChoicePage::onPartitionToReplaceSelected( const QModelIndex& current, const QModelIndex& previous ) { @@ -802,7 +787,6 @@ ChoicePage::onPartitionToReplaceSelected( const QModelIndex& current, const QMod doReplaceSelectedPartition( current ); } - void ChoicePage::doReplaceSelectedPartition( const QModelIndex& current ) { @@ -919,7 +903,6 @@ ChoicePage::doReplaceSelectedPartition( const QModelIndex& current ) this ); } - /** * @brief clear and then rebuild the contents of the preview widget * @@ -947,7 +930,7 @@ ChoicePage::updateDeviceStatePreview() layout = new QVBoxLayout; m_previewBeforeFrame->setLayout( layout ); - CalamaresUtils::unmarginLayout( layout ); + Calamares::unmarginLayout( layout ); layout->setSpacing( 6 ); PartitionBarsView::NestedPartitionsMode mode @@ -993,7 +976,6 @@ ChoicePage::updateDeviceStatePreview() layout->addWidget( m_beforePartitionLabelsView ); } - /** * @brief rebuild the contents of the preview for the PCM-proposed state. * @@ -1020,7 +1002,7 @@ ChoicePage::updateActionChoicePreview( InstallChoice choice ) QVBoxLayout* layout = new QVBoxLayout; m_previewAfterFrame->setLayout( layout ); - CalamaresUtils::unmarginLayout( layout ); + Calamares::unmarginLayout( layout ); layout->setSpacing( 6 ); PartitionBarsView::NestedPartitionsMode mode @@ -1067,8 +1049,8 @@ ChoicePage::updateActionChoicePreview( InstallChoice choice ) tr( "%1 will be shrunk to %2MiB and a new " "%3MiB partition will be created for %4." ) .arg( m_beforePartitionBarsView->selectionModel()->currentIndex().data().toString() ) - .arg( CalamaresUtils::BytesToMiB( size ) ) - .arg( CalamaresUtils::BytesToMiB( sizeNext ) ) + .arg( Calamares::BytesToMiB( size ) ) + .arg( Calamares::BytesToMiB( sizeNext ) ) .arg( Calamares::Branding::instance()->shortProductName() ) ); } ); @@ -1184,7 +1166,6 @@ ChoicePage::updateActionChoicePreview( InstallChoice choice ) updateNextEnabled(); } - void ChoicePage::setupEfiSystemPartitionSelector() { @@ -1386,7 +1367,6 @@ ChoicePage::setupActions() "This will delete all data " "currently present on the selected storage device." ) ); - m_replaceButton->setText( tr( "Replace a partition
" "Replaces a partition with %1." ) .arg( Calamares::Branding::instance()->shortVersionedName() ) ); ); @@ -1530,7 +1510,6 @@ ChoicePage::setupActions() } } - OsproberEntryList ChoicePage::getOsproberEntriesForDevice( Device* device ) const { @@ -1545,14 +1524,12 @@ ChoicePage::getOsproberEntriesForDevice( Device* device ) const return eList; } - bool ChoicePage::isNextEnabled() const { return m_nextEnabled; } - bool ChoicePage::calculateNextEnabled() const { @@ -1605,7 +1582,6 @@ ChoicePage::calculateNextEnabled() const return true; } - void ChoicePage::updateNextEnabled() { diff --git a/src/modules/partition/gui/DeviceInfoWidget.cpp b/src/modules/partition/gui/DeviceInfoWidget.cpp index 05a8c4b63..f57ed91d3 100644 --- a/src/modules/partition/gui/DeviceInfoWidget.cpp +++ b/src/modules/partition/gui/DeviceInfoWidget.cpp @@ -11,7 +11,7 @@ #include "GlobalStorage.h" #include "JobQueue.h" -#include "utils/CalamaresUtilsGui.h" +#include "utils/Gui.h" #include "utils/Logger.h" #include "utils/QtCompat.h" #include "utils/Retranslator.h" @@ -29,21 +29,20 @@ DeviceInfoWidget::DeviceInfoWidget( QWidget* parent ) QHBoxLayout* mainLayout = new QHBoxLayout; setLayout( mainLayout ); - CalamaresUtils::unmarginLayout( mainLayout ); + Calamares::unmarginLayout( mainLayout ); m_ptLabel->setObjectName( "deviceInfoLabel" ); m_ptIcon->setObjectName( "deviceInfoIcon" ); mainLayout->addWidget( m_ptIcon ); mainLayout->addWidget( m_ptLabel ); - QSize iconSize = CalamaresUtils::defaultIconSize(); + QSize iconSize = Calamares::defaultIconSize(); m_ptIcon->setMargin( 0 ); m_ptIcon->setFixedSize( iconSize ); - m_ptIcon->setPixmap( - CalamaresUtils::defaultPixmap( CalamaresUtils::PartitionTable, CalamaresUtils::Original, iconSize ) ); + m_ptIcon->setPixmap( Calamares::defaultPixmap( Calamares::PartitionTable, Calamares::Original, iconSize ) ); QFontMetrics fm = QFontMetrics( QFont() ); - m_ptLabel->setMinimumWidth( fm.boundingRect( "Amiga" ).width() + CalamaresUtils::defaultFontHeight() / 2 ); + m_ptLabel->setMinimumWidth( fm.boundingRect( "Amiga" ).width() + Calamares::defaultFontHeight() / 2 ); m_ptLabel->setAlignment( Qt::AlignCenter ); QPalette palette; @@ -57,7 +56,6 @@ DeviceInfoWidget::DeviceInfoWidget( QWidget* parent ) CALAMARES_RETRANSLATE_SLOT( &DeviceInfoWidget::retranslateUi ); } - void DeviceInfoWidget::setPartitionTableType( PartitionTable::TableType type ) { diff --git a/src/modules/partition/gui/EncryptWidget.cpp b/src/modules/partition/gui/EncryptWidget.cpp index f2ed1d17e..cd0062e4d 100644 --- a/src/modules/partition/gui/EncryptWidget.cpp +++ b/src/modules/partition/gui/EncryptWidget.cpp @@ -9,13 +9,12 @@ * */ - #include "EncryptWidget.h" #include "ui_EncryptWidget.h" #include "Branding.h" -#include "utils/CalamaresUtilsGui.h" +#include "utils/Gui.h" #include "utils/Retranslator.h" constexpr int ZFS_MIN_LENGTH = 8; @@ -71,7 +70,6 @@ EncryptWidget::EncryptWidget( QWidget* parent ) CALAMARES_RETRANSLATE_SLOT( &EncryptWidget::retranslate ); } - void EncryptWidget::reset( bool checkVisible ) { @@ -110,14 +108,12 @@ EncryptWidget::state() const return newState; } - void EncryptWidget::setText( const QString& text ) { m_ui->m_encryptCheckBox->setText( text ); } - QString EncryptWidget::passphrase() const { @@ -128,7 +124,6 @@ EncryptWidget::passphrase() const return QString(); } - void EncryptWidget::retranslate() { @@ -136,13 +131,12 @@ EncryptWidget::retranslate() onPassphraseEdited(); // For the tooltip } - ///@brief Give @p label the @p pixmap from the standard-pixmaps static void -applyPixmap( QLabel* label, CalamaresUtils::ImageType pixmap ) +applyPixmap( QLabel* label, Calamares::ImageType pixmap ) { label->setFixedWidth( label->height() ); - label->setPixmap( CalamaresUtils::defaultPixmap( pixmap, CalamaresUtils::Original, label->size() ) ); + label->setPixmap( Calamares::defaultPixmap( pixmap, Calamares::Original, label->size() ) ); } void @@ -155,22 +149,22 @@ EncryptWidget::updateState( const bool notify ) if ( p1.isEmpty() && p2.isEmpty() ) { - applyPixmap( m_ui->m_iconLabel, CalamaresUtils::StatusWarning ); + applyPixmap( m_ui->m_iconLabel, Calamares::StatusWarning ); m_ui->m_iconLabel->setToolTip( tr( "Please enter the same passphrase in both boxes." ) ); } else if ( m_filesystem == FileSystem::Zfs && p1.length() < ZFS_MIN_LENGTH ) { - applyPixmap( m_ui->m_iconLabel, CalamaresUtils::StatusError ); + applyPixmap( m_ui->m_iconLabel, Calamares::StatusError ); m_ui->m_iconLabel->setToolTip( tr( "Password must be a minimum of %1 characters" ).arg( ZFS_MIN_LENGTH ) ); } else if ( p1 == p2 ) { - applyPixmap( m_ui->m_iconLabel, CalamaresUtils::StatusOk ); + applyPixmap( m_ui->m_iconLabel, Calamares::StatusOk ); m_ui->m_iconLabel->setToolTip( QString() ); } else { - applyPixmap( m_ui->m_iconLabel, CalamaresUtils::StatusError ); + applyPixmap( m_ui->m_iconLabel, Calamares::StatusError ); m_ui->m_iconLabel->setToolTip( tr( "Please enter the same passphrase in both boxes." ) ); } } @@ -198,7 +192,6 @@ EncryptWidget::onPassphraseEdited() updateState(); } - void EncryptWidget::onCheckBoxStateChanged( int checked ) { diff --git a/src/modules/partition/gui/PartitionBarsView.cpp b/src/modules/partition/gui/PartitionBarsView.cpp index 305184b13..ef748d262 100644 --- a/src/modules/partition/gui/PartitionBarsView.cpp +++ b/src/modules/partition/gui/PartitionBarsView.cpp @@ -12,7 +12,7 @@ #include "core/ColorUtils.h" #include "core/PartitionModel.h" -#include "utils/CalamaresUtilsGui.h" +#include "utils/Gui.h" #include "utils/Logger.h" #include @@ -22,10 +22,8 @@ #include #include - -static const int VIEW_HEIGHT - = qMax( CalamaresUtils::defaultFontHeight() + 8, // wins out with big fonts - int( CalamaresUtils::defaultFontHeight() * 0.6 ) + 22 ); // wins out with small fonts +static const int VIEW_HEIGHT = qMax( Calamares::defaultFontHeight() + 8, // wins out with big fonts + int( Calamares::defaultFontHeight() * 0.6 ) + 22 ); // wins out with small fonts static constexpr int CORNER_RADIUS = 3; static const int EXTENDED_PARTITION_MARGIN = qMax( 4, VIEW_HEIGHT / 6 ); @@ -40,7 +38,6 @@ static const int EXTENDED_PARTITION_MARGIN = qMax( 4, VIEW_HEIGHT / 6 ); static const int SELECTION_MARGIN = qMin( ( EXTENDED_PARTITION_MARGIN - 2 ) / 2, ( EXTENDED_PARTITION_MARGIN - 2 ) - 2 ); - PartitionBarsView::PartitionBarsView( QWidget* parent ) : QAbstractItemView( parent ) , m_nestedPartitionsMode( NoNestedPartitions ) @@ -61,10 +58,8 @@ PartitionBarsView::PartitionBarsView( QWidget* parent ) setMouseTracking( true ); } - PartitionBarsView::~PartitionBarsView() {} - void PartitionBarsView::setNestedPartitionsMode( PartitionBarsView::NestedPartitionsMode mode ) { @@ -72,21 +67,18 @@ PartitionBarsView::setNestedPartitionsMode( PartitionBarsView::NestedPartitionsM viewport()->repaint(); } - QSize PartitionBarsView::minimumSizeHint() const { return sizeHint(); } - QSize PartitionBarsView::sizeHint() const { return QSize( -1, VIEW_HEIGHT ); } - void PartitionBarsView::paintEvent( QPaintEvent* event ) { @@ -102,7 +94,6 @@ PartitionBarsView::paintEvent( QPaintEvent* event ) painter.restore(); } - void PartitionBarsView::drawSection( QPainter* painter, const QRect& rect_, int x, int width, const QModelIndex& index ) { @@ -119,7 +110,6 @@ PartitionBarsView::drawSection( QPainter* painter, const QRect& rect_, int x, in rect.adjust( 0, 0, -1, -1 ); - if ( selectionMode() != QAbstractItemView::NoSelection && // no hover without selection m_hoveredIndex.isValid() && index == m_hoveredIndex ) { @@ -191,7 +181,6 @@ PartitionBarsView::drawSection( QPainter* painter, const QRect& rect_, int x, in painter->translate( -0.5, -0.5 ); } - void PartitionBarsView::drawPartitions( QPainter* painter, const QRect& rect, const QModelIndex& parent ) { @@ -240,14 +229,12 @@ PartitionBarsView::drawPartitions( QPainter* painter, const QRect& rect, const Q } } - QModelIndex PartitionBarsView::indexAt( const QPoint& point ) const { return indexAt( point, rect(), QModelIndex() ); } - QModelIndex PartitionBarsView::indexAt( const QPoint& point, const QRect& rect, const QModelIndex& parent ) const { @@ -303,14 +290,12 @@ PartitionBarsView::indexAt( const QPoint& point, const QRect& rect, const QModel return QModelIndex(); } - QRect PartitionBarsView::visualRect( const QModelIndex& index ) const { return visualRect( index, rect(), QModelIndex() ); } - QRect PartitionBarsView::visualRect( const QModelIndex& index, const QRect& rect, const QModelIndex& parent ) const { @@ -366,28 +351,24 @@ PartitionBarsView::visualRect( const QModelIndex& index, const QRect& rect, cons return QRect(); } - QRegion PartitionBarsView::visualRegionForSelection( const QItemSelection& selection ) const { return QRegion(); } - int PartitionBarsView::horizontalOffset() const { return 0; } - int PartitionBarsView::verticalOffset() const { return 0; } - void PartitionBarsView::scrollTo( const QModelIndex& index, ScrollHint hint ) { @@ -395,7 +376,6 @@ PartitionBarsView::scrollTo( const QModelIndex& index, ScrollHint hint ) Q_UNUSED( hint ) } - void PartitionBarsView::setSelectionModel( QItemSelectionModel* selectionModel ) { @@ -403,28 +383,24 @@ PartitionBarsView::setSelectionModel( QItemSelectionModel* selectionModel ) connect( selectionModel, &QItemSelectionModel::selectionChanged, this, [ = ] { viewport()->repaint(); } ); } - void PartitionBarsView::setSelectionFilter( std::function< bool( const QModelIndex& ) > canBeSelected ) { this->canBeSelected = canBeSelected; } - QModelIndex PartitionBarsView::moveCursor( CursorAction, Qt::KeyboardModifiers ) { return QModelIndex(); } - bool PartitionBarsView::isIndexHidden( const QModelIndex& ) const { return false; } - void PartitionBarsView::setSelection( const QRect& rect, QItemSelectionModel::SelectionFlags flags ) { @@ -454,7 +430,6 @@ PartitionBarsView::setSelection( const QRect& rect, QItemSelectionModel::Selecti viewport()->repaint(); } - void PartitionBarsView::mouseMoveEvent( QMouseEvent* event ) { @@ -485,7 +460,6 @@ PartitionBarsView::mouseMoveEvent( QMouseEvent* event ) } } - void PartitionBarsView::leaveEvent( QEvent* ) { @@ -497,7 +471,6 @@ PartitionBarsView::leaveEvent( QEvent* ) } } - void PartitionBarsView::mousePressEvent( QMouseEvent* event ) { @@ -512,14 +485,12 @@ PartitionBarsView::mousePressEvent( QMouseEvent* event ) } } - void PartitionBarsView::updateGeometries() { updateGeometry(); //get a new rect() for redrawing all the labels } - QPair< QVector< PartitionBarsView::Item >, qreal > PartitionBarsView::computeItemsVector( const QModelIndex& parent ) const { diff --git a/src/modules/partition/gui/PartitionLabelsView.cpp b/src/modules/partition/gui/PartitionLabelsView.cpp index 66b1ba62a..4dfaae140 100644 --- a/src/modules/partition/gui/PartitionLabelsView.cpp +++ b/src/modules/partition/gui/PartitionLabelsView.cpp @@ -14,7 +14,7 @@ #include "core/PartitionModel.h" #include "core/SizeUtils.h" -#include "utils/CalamaresUtilsGui.h" +#include "utils/Gui.h" #include "utils/Logger.h" #include "utils/Units.h" @@ -26,14 +26,13 @@ #include #include -using namespace CalamaresUtils::Units; +using namespace Calamares::Units; static const int LAYOUT_MARGIN = 4; -static const int LABEL_PARTITION_SQUARE_MARGIN = qMax( CalamaresUtils::defaultFontHeight() - 2, 18 ); +static const int LABEL_PARTITION_SQUARE_MARGIN = qMax( Calamares::defaultFontHeight() - 2, 18 ); static const int LABELS_MARGIN = LABEL_PARTITION_SQUARE_MARGIN; static const int CORNER_RADIUS = 2; - static QStringList buildUnknownDisklabelTexts( Device* dev ) { @@ -42,7 +41,6 @@ buildUnknownDisklabelTexts( Device* dev ) return texts; } - PartitionLabelsView::PartitionLabelsView( QWidget* parent ) : QAbstractItemView( parent ) , m_canBeSelected( []( const QModelIndex& ) { return true; } ) @@ -56,17 +54,14 @@ PartitionLabelsView::PartitionLabelsView( QWidget* parent ) setMouseTracking( true ); } - PartitionLabelsView::~PartitionLabelsView() {} - QSize PartitionLabelsView::minimumSizeHint() const { return sizeHint(); } - QSize PartitionLabelsView::sizeHint() const { @@ -78,7 +73,6 @@ PartitionLabelsView::sizeHint() const return QSize(); } - void PartitionLabelsView::paintEvent( QPaintEvent* event ) { @@ -93,14 +87,12 @@ PartitionLabelsView::paintEvent( QPaintEvent* event ) drawLabels( &painter, lRect, QModelIndex() ); } - QRect PartitionLabelsView::labelsRect() const { return rect().adjusted( 0, LAYOUT_MARGIN, 0, 0 ); } - static void drawPartitionSquare( QPainter* painter, const QRect& rect, const QBrush& brush ) { @@ -112,7 +104,6 @@ drawPartitionSquare( QPainter* painter, const QRect& rect, const QBrush& brush ) painter->translate( -.5, -.5 ); } - static void drawSelectionSquare( QPainter* painter, const QRect& rect, const QBrush& brush ) { @@ -128,7 +119,6 @@ drawSelectionSquare( QPainter* painter, const QRect& rect, const QBrush& brush ) painter->restore(); } - QModelIndexList PartitionLabelsView::getIndexesToDraw( const QModelIndex& parent ) const { @@ -167,7 +157,6 @@ PartitionLabelsView::getIndexesToDraw( const QModelIndex& parent ) const return list; } - QStringList PartitionLabelsView::buildTexts( const QModelIndex& index ) const { @@ -242,7 +231,6 @@ PartitionLabelsView::buildTexts( const QModelIndex& index ) const return { firstLine, secondLine }; } - void PartitionLabelsView::drawLabels( QPainter* painter, const QRect& rect, const QModelIndex& parent ) { @@ -304,7 +292,6 @@ PartitionLabelsView::drawLabels( QPainter* painter, const QRect& rect, const QMo } } - QSize PartitionLabelsView::sizeForAllLabels( int maxLineWidth ) const { @@ -348,7 +335,6 @@ PartitionLabelsView::sizeForAllLabels( int maxLineWidth ) const return QSize( maxLineWidth, totalHeight ); } - QSize PartitionLabelsView::sizeForLabel( const QStringList& text ) const { @@ -365,7 +351,6 @@ PartitionLabelsView::sizeForLabel( const QStringList& text ) const return QSize( width, vertOffset ); } - void PartitionLabelsView::drawLabel( QPainter* painter, const QStringList& text, @@ -398,7 +383,6 @@ PartitionLabelsView::drawLabel( QPainter* painter, painter->setPen( Qt::black ); } - QModelIndex PartitionLabelsView::indexAt( const QPoint& point ) const { @@ -437,7 +421,6 @@ PartitionLabelsView::indexAt( const QPoint& point ) const return QModelIndex(); } - QRect PartitionLabelsView::visualRect( const QModelIndex& idx ) const { @@ -475,7 +458,6 @@ PartitionLabelsView::visualRect( const QModelIndex& idx ) const return QRect(); } - QRegion PartitionLabelsView::visualRegionForSelection( const QItemSelection& selection ) const { @@ -484,21 +466,18 @@ PartitionLabelsView::visualRegionForSelection( const QItemSelection& selection ) return QRegion(); } - int PartitionLabelsView::horizontalOffset() const { return 0; } - int PartitionLabelsView::verticalOffset() const { return 0; } - void PartitionLabelsView::scrollTo( const QModelIndex& index, ScrollHint hint ) { @@ -506,7 +485,6 @@ PartitionLabelsView::scrollTo( const QModelIndex& index, ScrollHint hint ) Q_UNUSED( hint ) } - void PartitionLabelsView::setCustomNewRootLabel( const QString& text ) { @@ -514,7 +492,6 @@ PartitionLabelsView::setCustomNewRootLabel( const QString& text ) viewport()->repaint(); } - void PartitionLabelsView::setSelectionModel( QItemSelectionModel* selectionModel ) { @@ -522,21 +499,18 @@ PartitionLabelsView::setSelectionModel( QItemSelectionModel* selectionModel ) connect( selectionModel, &QItemSelectionModel::selectionChanged, this, [ = ] { viewport()->repaint(); } ); } - void PartitionLabelsView::setSelectionFilter( SelectionFilter canBeSelected ) { m_canBeSelected = canBeSelected; } - void PartitionLabelsView::setExtendedPartitionHidden( bool hidden ) { m_extendedPartitionHidden = hidden; } - QModelIndex PartitionLabelsView::moveCursor( CursorAction cursorAction, Qt::KeyboardModifiers modifiers ) { @@ -546,7 +520,6 @@ PartitionLabelsView::moveCursor( CursorAction cursorAction, Qt::KeyboardModifier return QModelIndex(); } - bool PartitionLabelsView::isIndexHidden( const QModelIndex& index ) const { @@ -555,7 +528,6 @@ PartitionLabelsView::isIndexHidden( const QModelIndex& index ) const return false; } - void PartitionLabelsView::setSelection( const QRect& rect, QItemSelectionModel::SelectionFlags flags ) { @@ -566,7 +538,6 @@ PartitionLabelsView::setSelection( const QRect& rect, QItemSelectionModel::Selec } } - void PartitionLabelsView::mouseMoveEvent( QMouseEvent* event ) { @@ -597,7 +568,6 @@ PartitionLabelsView::mouseMoveEvent( QMouseEvent* event ) } } - void PartitionLabelsView::leaveEvent( QEvent* event ) { @@ -611,7 +581,6 @@ PartitionLabelsView::leaveEvent( QEvent* event ) } } - void PartitionLabelsView::mousePressEvent( QMouseEvent* event ) { @@ -626,7 +595,6 @@ PartitionLabelsView::mousePressEvent( QMouseEvent* event ) } } - void PartitionLabelsView::updateGeometries() { diff --git a/src/modules/partition/gui/PartitionSizeController.cpp b/src/modules/partition/gui/PartitionSizeController.cpp index b7757c32d..c21ebd1c4 100644 --- a/src/modules/partition/gui/PartitionSizeController.cpp +++ b/src/modules/partition/gui/PartitionSizeController.cpp @@ -192,7 +192,7 @@ PartitionSizeController::doUpdateSpinBox() { return; } - int mbSize = CalamaresUtils::BytesToMiB( m_partition->length() * m_device->logicalSize() ); + int mbSize = Calamares::BytesToMiB( m_partition->length() * m_device->logicalSize() ); m_spinBox->setValue( mbSize ); if ( m_currentSpinBoxValue != -1 && //if it's not the first time we're setting it m_currentSpinBoxValue != mbSize ) //and the operation changes the SB value diff --git a/src/modules/partition/gui/PartitionSplitterWidget.cpp b/src/modules/partition/gui/PartitionSplitterWidget.cpp index ea97761fb..9fef8e348 100644 --- a/src/modules/partition/gui/PartitionSplitterWidget.cpp +++ b/src/modules/partition/gui/PartitionSplitterWidget.cpp @@ -16,7 +16,7 @@ #include "partition/PartitionQuery.h" #include "utils/Logger.h" -#include "utils/CalamaresUtilsGui.h" +#include "utils/Gui.h" #include #include @@ -29,9 +29,8 @@ using Calamares::Partition::PartitionIterator; -static const int VIEW_HEIGHT - = qMax( CalamaresUtils::defaultFontHeight() + 8, // wins out with big fonts - int( CalamaresUtils::defaultFontHeight() * 0.6 ) + 22 ); // wins out with small fonts +static const int VIEW_HEIGHT = qMax( Calamares::defaultFontHeight() + 8, // wins out with big fonts + int( Calamares::defaultFontHeight() * 0.6 ) + 22 ); // wins out with small fonts static const int CORNER_RADIUS = 3; static const int EXTENDED_PARTITION_MARGIN = qMax( 4, VIEW_HEIGHT / 6 ); @@ -92,7 +91,6 @@ PartitionSplitterWidget::PartitionSplitterWidget( QWidget* parent ) setMouseTracking( true ); } - void PartitionSplitterWidget::init( Device* dev, bool drawNestedPartitions ) { @@ -153,7 +151,6 @@ PartitionSplitterWidget::setupItems( const QVector< PartitionSplitterItem >& ite } } - void PartitionSplitterWidget::setSplitPartition( const QString& path, qint64 minSize, qint64 maxSize, qint64 preferredSize ) { @@ -285,7 +282,6 @@ PartitionSplitterWidget::setSplitPartition( const QString& path, qint64 minSize, repaint(); } - qint64 PartitionSplitterWidget::splitPartitionSize() const { @@ -296,7 +292,6 @@ PartitionSplitterWidget::splitPartitionSize() const return m_itemToResize.size; } - qint64 PartitionSplitterWidget::newPartitionSize() const { @@ -307,21 +302,18 @@ PartitionSplitterWidget::newPartitionSize() const return m_itemToResizeNext.size; } - QSize PartitionSplitterWidget::sizeHint() const { return QSize( -1, VIEW_HEIGHT ); } - QSize PartitionSplitterWidget::minimumSizeHint() const { return sizeHint(); } - void PartitionSplitterWidget::paintEvent( QPaintEvent* event ) { @@ -334,7 +326,6 @@ PartitionSplitterWidget::paintEvent( QPaintEvent* event ) drawPartitions( &painter, rect(), m_items ); } - void PartitionSplitterWidget::mousePressEvent( QMouseEvent* event ) { @@ -351,7 +342,6 @@ PartitionSplitterWidget::mousePressEvent( QMouseEvent* event ) } } - void PartitionSplitterWidget::mouseMoveEvent( QMouseEvent* event ) { @@ -452,7 +442,6 @@ PartitionSplitterWidget::mouseMoveEvent( QMouseEvent* event ) } } - void PartitionSplitterWidget::mouseReleaseEvent( QMouseEvent* event ) { @@ -461,7 +450,6 @@ PartitionSplitterWidget::mouseReleaseEvent( QMouseEvent* event ) m_resizing = false; } - void PartitionSplitterWidget::drawSection( QPainter* painter, const QRect& rect_, @@ -555,7 +543,6 @@ PartitionSplitterWidget::drawResizeHandle( QPainter* painter, const QRect& rect_ painter->drawLine( x, 0, x, int( h ) - 1 ); } - void PartitionSplitterWidget::drawPartitions( QPainter* painter, const QRect& rect, diff --git a/src/modules/partition/jobs/CreatePartitionJob.cpp b/src/modules/partition/jobs/CreatePartitionJob.cpp index a43724eec..c985c9a25 100644 --- a/src/modules/partition/jobs/CreatePartitionJob.cpp +++ b/src/modules/partition/jobs/CreatePartitionJob.cpp @@ -16,7 +16,7 @@ #include "partition/FileSystem.h" #include "partition/PartitionQuery.h" -#include "utils/CalamaresUtilsSystem.h" +#include "utils/System.h" #include "utils/Logger.h" #include "utils/Units.h" @@ -43,7 +43,7 @@ using Calamares::Partition::userVisibleFS; static Calamares::JobResult createZfs( Partition* partition, Device* device ) { - auto r = CalamaresUtils::System::instance()->runCommand( + auto r = Calamares::System::instance()->runCommand( { "sh", "-c", "echo start=" + QString::number( partition->firstSector() ) + " size=" @@ -83,7 +83,7 @@ createZfs( Partition* partition, Device* device ) // If it is a gpt device, set the partition UUID if ( device->partitionTable()->type() == PartitionTable::gpt && partition->uuid().isEmpty() ) { - r = CalamaresUtils::System::instance()->runCommand( + r = Calamares::System::instance()->runCommand( { "sfdisk", "--list", "--output", "Device,UUID", partition->devicePath() }, std::chrono::seconds( 5 ) ); if ( r.getExitCode() == 0 ) { @@ -100,14 +100,12 @@ createZfs( Partition* partition, Device* device ) return Calamares::JobResult::ok(); } - CreatePartitionJob::CreatePartitionJob( Device* device, Partition* partition ) : PartitionJob( partition ) , m_device( device ) { } - static QString prettyGptType( const Partition* partition ) { @@ -181,7 +179,7 @@ CreatePartitionJob::prettyName() const if ( !entries.isEmpty() ) { return tr( "Create new %1MiB partition on %3 (%2) with entries %4." ) - .arg( CalamaresUtils::BytesToMiB( m_partition->capacity() ) ) + .arg( Calamares::BytesToMiB( m_partition->capacity() ) ) .arg( m_device->name() ) .arg( m_device->deviceNode() ) .arg( entries ); @@ -189,7 +187,7 @@ CreatePartitionJob::prettyName() const else { return tr( "Create new %1MiB partition on %3 (%2)." ) - .arg( CalamaresUtils::BytesToMiB( m_partition->capacity() ) ) + .arg( Calamares::BytesToMiB( m_partition->capacity() ) ) .arg( m_device->name() ) .arg( m_device->deviceNode() ); } @@ -197,12 +195,11 @@ CreatePartitionJob::prettyName() const return tr( "Create new %2MiB partition on %4 (%3) with file system %1." ) .arg( userVisibleFS( m_partition->fileSystem() ) ) - .arg( CalamaresUtils::BytesToMiB( m_partition->capacity() ) ) + .arg( Calamares::BytesToMiB( m_partition->capacity() ) ) .arg( m_device->name() ) .arg( m_device->deviceNode() ); } - QString CreatePartitionJob::prettyDescription() const { @@ -214,7 +211,7 @@ CreatePartitionJob::prettyDescription() const { return tr( "Create new %1MiB partition on %3 (%2) with entries " "%4." ) - .arg( CalamaresUtils::BytesToMiB( m_partition->capacity() ) ) + .arg( Calamares::BytesToMiB( m_partition->capacity() ) ) .arg( m_device->name() ) .arg( m_device->deviceNode() ) .arg( entries ); @@ -222,7 +219,7 @@ CreatePartitionJob::prettyDescription() const else { return tr( "Create new %1MiB partition on %3 (%2)." ) - .arg( CalamaresUtils::BytesToMiB( m_partition->capacity() ) ) + .arg( Calamares::BytesToMiB( m_partition->capacity() ) ) .arg( m_device->name() ) .arg( m_device->deviceNode() ); } @@ -231,12 +228,11 @@ CreatePartitionJob::prettyDescription() const return tr( "Create new %2MiB partition on %4 " "(%3) with file system %1." ) .arg( userVisibleFS( m_partition->fileSystem() ) ) - .arg( CalamaresUtils::BytesToMiB( m_partition->capacity() ) ) + .arg( Calamares::BytesToMiB( m_partition->capacity() ) ) .arg( m_device->name() ) .arg( m_device->deviceNode() ); } - QString CreatePartitionJob::prettyStatusMessage() const { diff --git a/src/modules/partition/jobs/CreatePartitionTableJob.cpp b/src/modules/partition/jobs/CreatePartitionTableJob.cpp index 9ee293705..77b164d88 100644 --- a/src/modules/partition/jobs/CreatePartitionTableJob.cpp +++ b/src/modules/partition/jobs/CreatePartitionTableJob.cpp @@ -12,7 +12,7 @@ #include "CreatePartitionTableJob.h" #include "partition/PartitionIterator.h" -#include "utils/CalamaresUtilsSystem.h" +#include "utils/System.h" #include "utils/Logger.h" #include "core/KPMHelpers.h" @@ -52,7 +52,6 @@ CreatePartitionTableJob::prettyDescription() const .arg( m_device->name() ); } - QString CreatePartitionTableJob::prettyStatusMessage() const { @@ -61,7 +60,6 @@ CreatePartitionTableJob::prettyStatusMessage() const .arg( m_device->deviceNode() ); } - Calamares::JobResult CreatePartitionTableJob::exec() { @@ -76,10 +74,10 @@ CreatePartitionTableJob::exec() cDebug() << Logger::SubEntry << ( ( *it ) ? ( *it )->deviceNode() : QString( "" ) ); } - auto lsblkResult = CalamaresUtils::System::runCommand( { "lsblk" }, std::chrono::seconds( 30 ) ); + auto lsblkResult = Calamares::System::runCommand( { "lsblk" }, std::chrono::seconds( 30 ) ); cDebug() << Logger::SubEntry << "lsblk output:\n" << Logger::NoQuote << lsblkResult.getOutput(); - auto mountResult = CalamaresUtils::System::runCommand( { "mount" }, std::chrono::seconds( 30 ) ); + auto mountResult = Calamares::System::runCommand( { "mount" }, std::chrono::seconds( 30 ) ); cDebug() << Logger::SubEntry << "mount output:\n" << Logger::NoQuote << mountResult.getOutput(); } diff --git a/src/modules/partition/jobs/DeletePartitionJob.cpp b/src/modules/partition/jobs/DeletePartitionJob.cpp index d61bb955e..2903ecf85 100644 --- a/src/modules/partition/jobs/DeletePartitionJob.cpp +++ b/src/modules/partition/jobs/DeletePartitionJob.cpp @@ -13,7 +13,7 @@ #include "core/KPMHelpers.h" -#include "utils/CalamaresUtilsSystem.h" +#include "utils/System.h" #include #include @@ -44,7 +44,7 @@ isZfs( Partition* partition ) static Calamares::JobResult removePartition( Partition* partition ) { - auto r = CalamaresUtils::System::instance()->runCommand( + auto r = Calamares::System::instance()->runCommand( { "sfdisk", "--delete", "--force", partition->devicePath(), QString::number( partition->number() ) }, std::chrono::seconds( 5 ) ); if ( r.getExitCode() != 0 || r.getOutput().contains( "failed" ) ) @@ -73,21 +73,18 @@ DeletePartitionJob::prettyName() const return tr( "Delete partition %1." ).arg( m_partition->partitionPath() ); } - QString DeletePartitionJob::prettyDescription() const { return tr( "Delete partition %1." ).arg( m_partition->partitionPath() ); } - QString DeletePartitionJob::prettyStatusMessage() const { return tr( "Deleting partition %1." ).arg( m_partition->partitionPath() ); } - Calamares::JobResult DeletePartitionJob::exec() { diff --git a/src/modules/partition/jobs/FormatPartitionJob.cpp b/src/modules/partition/jobs/FormatPartitionJob.cpp index 5b72d749c..8b4cfaf92 100644 --- a/src/modules/partition/jobs/FormatPartitionJob.cpp +++ b/src/modules/partition/jobs/FormatPartitionJob.cpp @@ -14,7 +14,7 @@ #include "core/KPMHelpers.h" #include "partition/FileSystem.h" -#include "utils/CalamaresUtilsSystem.h" +#include "utils/System.h" #include "utils/Logger.h" #include @@ -43,7 +43,6 @@ FormatPartitionJob::prettyName() const .arg( m_device->name() ); } - QString FormatPartitionJob::prettyDescription() const { @@ -54,7 +53,6 @@ FormatPartitionJob::prettyDescription() const .arg( m_partition->capacity() / 1024 / 1024 ); } - QString FormatPartitionJob::prettyStatusMessage() const { @@ -67,7 +65,6 @@ FormatPartitionJob::prettyStatusMessage() const .arg( partitionLabel, userVisibleFS( m_partition->fileSystem() ) ); } - Calamares::JobResult FormatPartitionJob::exec() { @@ -81,8 +78,8 @@ FormatPartitionJob::exec() // (ignoring whether this succeeds). Requires a sufficiently-new // xfs_admin and xfs_repair and might be made obsolete by newer // kpmcore releases. - CalamaresUtils::System::runCommand( { "xfs_admin", "-O", "bigtime=1", m_partition->partitionPath() }, - std::chrono::seconds( 60 ) ); + Calamares::System::runCommand( { "xfs_admin", "-O", "bigtime=1", m_partition->partitionPath() }, + std::chrono::seconds( 60 ) ); } return r; } diff --git a/src/modules/partition/jobs/ResizePartitionJob.cpp b/src/modules/partition/jobs/ResizePartitionJob.cpp index fe1ceca4c..0ef715496 100644 --- a/src/modules/partition/jobs/ResizePartitionJob.cpp +++ b/src/modules/partition/jobs/ResizePartitionJob.cpp @@ -19,7 +19,7 @@ #include #include -using CalamaresUtils::BytesToMiB; +using Calamares::BytesToMiB; //- ResizePartitionJob --------------------------------------------------------- ResizePartitionJob::ResizePartitionJob( Device* device, Partition* partition, qint64 firstSector, qint64 lastSector ) @@ -41,7 +41,6 @@ ResizePartitionJob::prettyName() const return tr( "Resize partition %1." ).arg( partition()->partitionPath() ); } - QString ResizePartitionJob::prettyDescription() const { @@ -52,7 +51,6 @@ ResizePartitionJob::prettyDescription() const .arg( ( BytesToMiB( m_newLastSector - m_newFirstSector + 1 ) * partition()->sectorSize() ) ); } - QString ResizePartitionJob::prettyStatusMessage() const { @@ -63,7 +61,6 @@ ResizePartitionJob::prettyStatusMessage() const .arg( ( BytesToMiB( m_newLastSector - m_newFirstSector + 1 ) * partition()->sectorSize() ) ); } - Calamares::JobResult ResizePartitionJob::exec() { @@ -90,7 +87,6 @@ ResizePartitionJob::updatePreview() m_device->partitionTable()->updateUnallocated( *m_device ); } - Device* ResizePartitionJob::device() const { diff --git a/src/modules/partition/jobs/SetPartitionFlagsJob.cpp b/src/modules/partition/jobs/SetPartitionFlagsJob.cpp index 1da3097ff..c00ba1d2a 100644 --- a/src/modules/partition/jobs/SetPartitionFlagsJob.cpp +++ b/src/modules/partition/jobs/SetPartitionFlagsJob.cpp @@ -25,7 +25,7 @@ #include #include -using CalamaresUtils::BytesToMiB; +using Calamares::BytesToMiB; using Calamares::Partition::untranslatedFS; using Calamares::Partition::userVisibleFS; @@ -36,7 +36,6 @@ SetPartFlagsJob::SetPartFlagsJob( Device* device, Partition* partition, Partitio { } - QString SetPartFlagsJob::prettyName() const { @@ -55,7 +54,6 @@ SetPartFlagsJob::prettyName() const return tr( "Set flags on new partition." ); } - QString SetPartFlagsJob::prettyDescription() const { @@ -98,7 +96,6 @@ SetPartFlagsJob::prettyDescription() const return tr( "Flag new partition as %1." ).arg( flagsList.join( ", " ) ); } - QString SetPartFlagsJob::prettyStatusMessage() const { @@ -142,7 +139,6 @@ SetPartFlagsJob::prettyStatusMessage() const return tr( "Setting flags %1 on new partition." ).arg( flagsList.join( ", " ) ); } - Calamares::JobResult SetPartFlagsJob::exec() { diff --git a/src/modules/partition/tests/CreateLayoutsTests.cpp b/src/modules/partition/tests/CreateLayoutsTests.cpp index 4fb3c886a..87a1ea484 100644 --- a/src/modules/partition/tests/CreateLayoutsTests.cpp +++ b/src/modules/partition/tests/CreateLayoutsTests.cpp @@ -19,7 +19,7 @@ #include -using namespace CalamaresUtils::Units; +using namespace Calamares::Units; class PartitionTable; class SmartStatus; diff --git a/src/modules/partition/tests/PartitionJobTests.cpp b/src/modules/partition/tests/PartitionJobTests.cpp index e30cca7ce..916006d76 100644 --- a/src/modules/partition/tests/PartitionJobTests.cpp +++ b/src/modules/partition/tests/PartitionJobTests.cpp @@ -30,7 +30,7 @@ QTEST_GUILESS_MAIN( PartitionJobTests ) using Calamares::job_ptr; using Calamares::JobList; -using namespace CalamaresUtils::Units; +using namespace Calamares::Units; class PartitionMounter { @@ -366,7 +366,7 @@ PartitionJobTests::testResizePartition() // Make the test data file smaller than the full size of the partition to // accomodate for the file system overhead const unsigned long long minSizeMiB = qMin( oldSizeMiB, newSizeMiB ); - const QByteArray testData = generateTestData( CalamaresUtils::MiBtoBytes( minSizeMiB ) * 3 / 4 ); + const QByteArray testData = generateTestData( Calamares::MiBtoBytes( minSizeMiB ) * 3 / 4 ); const QString testName = "test.data"; // Setup: create the test partition @@ -428,7 +428,6 @@ PartitionJobTests::testResizePartition() QCOMPARE( partition->fileSystem().firstSector(), newFirst ); QCOMPARE( partition->fileSystem().lastSector(), newLast ); - PartitionMounter mounter( partition->partitionPath() ); QString mountPoint = mounter.mountPoint(); QVERIFY( !mountPoint.isEmpty() ); diff --git a/src/modules/plasmalnf/Config.cpp b/src/modules/plasmalnf/Config.cpp index e022109b4..f2f13356c 100644 --- a/src/modules/plasmalnf/Config.cpp +++ b/src/modules/plasmalnf/Config.cpp @@ -12,7 +12,7 @@ #include "PlasmaLnfJob.h" #include "ThemeInfo.h" -#include "utils/CalamaresUtilsSystem.h" +#include "utils/System.h" #include "utils/Logger.h" #include "utils/Variant.h" @@ -52,16 +52,16 @@ Config::Config( QObject* parent ) void Config::setConfigurationMap( const QVariantMap& configurationMap ) { - m_lnfPath = CalamaresUtils::getString( configurationMap, "lnftool" ); + m_lnfPath = Calamares::getString( configurationMap, "lnftool" ); if ( m_lnfPath.isEmpty() ) { cWarning() << "no lnftool given for plasmalnf module."; } - m_liveUser = CalamaresUtils::getString( configurationMap, "liveuser" ); + m_liveUser = Calamares::getString( configurationMap, "liveuser" ); - QString preselect = CalamaresUtils::getString( configurationMap, "preselect" ); + QString preselect = Calamares::getString( configurationMap, "preselect" ); if ( preselect == QStringLiteral( "*" ) ) { preselect = currentPlasmaTheme(); @@ -92,7 +92,7 @@ Config::setConfigurationMap( const QVariantMap& configurationMap ) } m_themeModel->setThemeImage( listedThemes ); - bool showAll = CalamaresUtils::getBool( configurationMap, "showAll", false ); + bool showAll = Calamares::getBool( configurationMap, "showAll", false ); if ( !listedThemes.isEmpty() && !showAll ) { m_themeModel->showOnlyThemes( listedThemes ); @@ -122,7 +122,6 @@ Config::createJobs() const return l; } - void Config::setTheme( const QString& id ) { @@ -148,7 +147,7 @@ Config::setTheme( const QString& id ) } command << lnfToolPath() << "--resetLayout" << "--apply" << id; - auto r = CalamaresUtils::System::instance()->runCommand( command, std::chrono::seconds( 10 ) ); + auto r = Calamares::System::instance()->runCommand( command, std::chrono::seconds( 10 ) ); if ( r.getExitCode() ) { diff --git a/src/modules/plasmalnf/PlasmaLnfJob.cpp b/src/modules/plasmalnf/PlasmaLnfJob.cpp index 3b550d50a..b11acdf52 100644 --- a/src/modules/plasmalnf/PlasmaLnfJob.cpp +++ b/src/modules/plasmalnf/PlasmaLnfJob.cpp @@ -11,7 +11,7 @@ #include "GlobalStorage.h" #include "JobQueue.h" -#include "utils/CalamaresUtilsSystem.h" +#include "utils/System.h" #include "utils/Logger.h" #ifdef WITH_KCONFIG @@ -36,7 +36,7 @@ PlasmaLnfJob::prettyName() const Calamares::JobResult PlasmaLnfJob::exec() { - auto* system = CalamaresUtils::System::instance(); + auto* system = Calamares::System::instance(); auto* gs = Calamares::JobQueue::instance()->globalStorage(); QStringList command( { "sudo", diff --git a/src/modules/plasmalnf/ThemeInfo.cpp b/src/modules/plasmalnf/ThemeInfo.cpp index 8e7aa13b9..96a960040 100644 --- a/src/modules/plasmalnf/ThemeInfo.cpp +++ b/src/modules/plasmalnf/ThemeInfo.cpp @@ -9,7 +9,7 @@ #include "ThemeInfo.h" #include "Branding.h" -#include "utils/CalamaresUtilsGui.h" +#include "utils/Gui.h" #include "utils/Logger.h" #include @@ -80,7 +80,6 @@ public: return { i, const_cast< ThemeInfo* >( p ) }; } - /** @brief Looks for a given @p id in the list of themes, returns nullptr if not found. */ ThemeInfo* findById( const QString& id ) { @@ -222,8 +221,7 @@ ThemesModel::showOnlyThemes( const QMap< QString, QString >& onlyThese ) QSize ThemesModel::imageSize() { - return { qMax( 12 * CalamaresUtils::defaultFontHeight(), 120 ), - qMax( 8 * CalamaresUtils::defaultFontHeight(), 80 ) }; + return { qMax( 12 * Calamares::defaultFontHeight(), 120 ), qMax( 8 * Calamares::defaultFontHeight(), 80 ) }; } void @@ -246,7 +244,6 @@ ThemesModel::select( const QString& themeId ) } } - /** * Massage the given @p path to the most-likely * path that actually contains a screenshot. For diff --git a/src/modules/preservefiles/Item.cpp b/src/modules/preservefiles/Item.cpp index 98488f951..960669ade 100644 --- a/src/modules/preservefiles/Item.cpp +++ b/src/modules/preservefiles/Item.cpp @@ -10,14 +10,14 @@ #include "GlobalStorage.h" #include "JobQueue.h" #include "compat/Variant.h" -#include "utils/CalamaresUtilsSystem.h" +#include "utils/System.h" #include "utils/Logger.h" #include "utils/Units.h" #include "utils/Variant.h" #include -using namespace CalamaresUtils::Units; +using namespace Calamares::Units; static bool copy_file( const QString& source, const QString& dest ) @@ -51,7 +51,7 @@ copy_file( const QString& source, const QString& dest ) } Item -Item::fromVariant( const QVariant& v, const CalamaresUtils::Permissions& defaultPermissions ) +Item::fromVariant( const QVariant& v, const Calamares::Permissions& defaultPermissions ) { if ( Calamares::typeOf( v ) == Calamares::StringVariantType ) { @@ -70,15 +70,15 @@ Item::fromVariant( const QVariant& v, const CalamaresUtils::Permissions& default { const auto map = v.toMap(); - CalamaresUtils::Permissions perm( defaultPermissions ); + Calamares::Permissions perm( defaultPermissions ); ItemType t = ItemType::None; - bool optional = CalamaresUtils::getBool( map, "optional", false ); + bool optional = Calamares::getBool( map, "optional", false ); { QString perm_string = map[ "perm" ].toString(); if ( !perm_string.isEmpty() ) { - perm = CalamaresUtils::Permissions( perm_string ); + perm = Calamares::Permissions( perm_string ); } } @@ -116,12 +116,11 @@ Item::fromVariant( const QVariant& v, const CalamaresUtils::Permissions& default return {}; } - bool Item::exec( const std::function< QString( QString ) >& replacements ) const { QString expanded_dest = replacements( dest ); - QString full_dest = CalamaresUtils::System::instance()->targetPath( expanded_dest ); + QString full_dest = Calamares::System::instance()->targetPath( expanded_dest ); bool success = false; switch ( m_type ) @@ -150,7 +149,7 @@ Item::exec( const std::function< QString( QString ) >& replacements ) const } if ( !success ) { - CalamaresUtils::System::instance()->removeTargetFile( expanded_dest ); + Calamares::System::instance()->removeTargetFile( expanded_dest ); return false; } else diff --git a/src/modules/preservefiles/Item.h b/src/modules/preservefiles/Item.h index 896b9471f..8707d8db2 100644 --- a/src/modules/preservefiles/Item.h +++ b/src/modules/preservefiles/Item.h @@ -34,12 +34,12 @@ class Item { QString source; QString dest; - CalamaresUtils::Permissions perm; + Calamares::Permissions perm; ItemType m_type = ItemType::None; bool m_optional = false; public: - Item( const QString& src, const QString& d, CalamaresUtils::Permissions p, ItemType t, bool optional ) + Item( const QString& src, const QString& d, Calamares::Permissions p, ItemType t, bool optional ) : source( src ) , dest( d ) , perm( std::move( p ) ) @@ -59,7 +59,6 @@ public: bool exec( const std::function< QString( QString ) >& replacements ) const; - /** @brief Create an Item -- or one of its subclasses -- from @p v * * Depending on the structure and contents of @p v, a pointer @@ -69,8 +68,7 @@ public: * When the entry contains a *perm* key, use that permission, otherwise * apply @p defaultPermissions to the item. */ - static Item fromVariant( const QVariant& v, const CalamaresUtils::Permissions& defaultPermissions ); + static Item fromVariant( const QVariant& v, const Calamares::Permissions& defaultPermissions ); }; - #endif diff --git a/src/modules/preservefiles/PreserveFiles.cpp b/src/modules/preservefiles/PreserveFiles.cpp index 15d588182..b65a273b7 100644 --- a/src/modules/preservefiles/PreserveFiles.cpp +++ b/src/modules/preservefiles/PreserveFiles.cpp @@ -13,7 +13,7 @@ #include "GlobalStorage.h" #include "JobQueue.h" #include "compat/Variant.h" -#include "utils/CalamaresUtilsSystem.h" +#include "utils/System.h" #include "utils/CommandList.h" #include "utils/Logger.h" #include "utils/StringExpander.h" @@ -21,7 +21,7 @@ #include -using namespace CalamaresUtils::Units; +using namespace Calamares::Units; QString atReplacements( QString s ) @@ -109,7 +109,7 @@ PreserveFiles::setConfigurationMap( const QVariantMap& configurationMap ) { defaultPermissions = QStringLiteral( "root:root:0400" ); } - CalamaresUtils::Permissions perm( defaultPermissions ); + Calamares::Permissions perm( defaultPermissions ); for ( const auto& li : files.toList() ) { diff --git a/src/modules/preservefiles/Tests.cpp b/src/modules/preservefiles/Tests.cpp index 4bd6f138f..81cd81d9c 100644 --- a/src/modules/preservefiles/Tests.cpp +++ b/src/modules/preservefiles/Tests.cpp @@ -10,7 +10,7 @@ #include "Item.h" #include "Settings.h" -#include "utils/CalamaresUtilsSystem.h" +#include "utils/System.h" #include "utils/Logger.h" #include "utils/NamedEnum.h" #include "utils/Yaml.h" @@ -40,7 +40,7 @@ PreserveFilesTests::initTestCase() cDebug() << "PreserveFiles test started."; // Ensure we have a system object, expect it to be a "bogus" one - CalamaresUtils::System* system = CalamaresUtils::System::instance(); + Calamares::System* system = Calamares::System::instance(); QVERIFY( system ); cDebug() << Logger::SubEntry << "System @" << Logger::Pointer( system ); @@ -77,10 +77,10 @@ PreserveFilesTests::testItems() QVERIFY( fi.exists() ); bool config_file_ok = false; - const auto map = CalamaresUtils::loadYaml( fi, &config_file_ok ); + const auto map = Calamares::YAML::load( fi, &config_file_ok ); QVERIFY( config_file_ok ); - CalamaresUtils::Permissions perm( QStringLiteral( "adridg:adridg:0750" ) ); + Calamares::Permissions perm( QStringLiteral( "adridg:adridg:0750" ) ); auto i = Item::fromVariant( map[ "item" ], perm ); QCOMPARE( bool( i ), ok ); QCOMPARE( smash( i.type() ), type_i ); diff --git a/src/modules/removeuser/RemoveUserJob.cpp b/src/modules/removeuser/RemoveUserJob.cpp index 9475b9bea..8f5dfcda4 100644 --- a/src/modules/removeuser/RemoveUserJob.cpp +++ b/src/modules/removeuser/RemoveUserJob.cpp @@ -13,7 +13,7 @@ #include "GlobalStorage.h" #include "JobQueue.h" -#include "utils/CalamaresUtilsSystem.h" +#include "utils/System.h" #include "utils/Logger.h" #include "utils/Variant.h" @@ -24,10 +24,8 @@ RemoveUserJob::RemoveUserJob( QObject* parent ) { } - RemoveUserJob::~RemoveUserJob() {} - QString RemoveUserJob::prettyName() const { @@ -43,7 +41,7 @@ RemoveUserJob::exec() return Calamares::JobResult::ok(); } - auto* s = CalamaresUtils::System::instance(); + auto* s = Calamares::System::instance(); auto r = s->targetEnvCommand( { QStringLiteral( "userdel" ), QStringLiteral( "-f" ), // force QStringLiteral( "-r" ), // remove home-dir and mail @@ -55,11 +53,10 @@ RemoveUserJob::exec() return Calamares::JobResult::ok(); } - void RemoveUserJob::setConfigurationMap( const QVariantMap& map ) { - m_username = CalamaresUtils::getString( map, "username" ); + m_username = Calamares::getString( map, "username" ); } CALAMARES_PLUGIN_FACTORY_DEFINITION( RemoveUserJobFactory, registerPlugin< RemoveUserJob >(); ) diff --git a/src/modules/shellprocess/ShellProcessJob.cpp b/src/modules/shellprocess/ShellProcessJob.cpp index b30af9a29..779871895 100644 --- a/src/modules/shellprocess/ShellProcessJob.cpp +++ b/src/modules/shellprocess/ShellProcessJob.cpp @@ -26,10 +26,8 @@ ShellProcessJob::ShellProcessJob( QObject* parent ) { } - ShellProcessJob::~ShellProcessJob() {} - QString ShellProcessJob::prettyName() const { @@ -40,7 +38,6 @@ ShellProcessJob::prettyName() const return tr( "Shell Processes Job" ); } - Calamares::JobResult ShellProcessJob::exec() { @@ -54,12 +51,11 @@ ShellProcessJob::exec() return m_commands->run(); } - void ShellProcessJob::setConfigurationMap( const QVariantMap& configurationMap ) { - bool dontChroot = CalamaresUtils::getBool( configurationMap, "dontChroot", false ); - qint64 timeout = CalamaresUtils::getInteger( configurationMap, "timeout", 30 ); + bool dontChroot = Calamares::getBool( configurationMap, "dontChroot", false ); + qint64 timeout = Calamares::getInteger( configurationMap, "timeout", 30 ); if ( timeout < 1 ) { timeout = 30; @@ -67,7 +63,7 @@ ShellProcessJob::setConfigurationMap( const QVariantMap& configurationMap ) if ( configurationMap.contains( "script" ) ) { - m_commands = std::make_unique< CalamaresUtils::CommandList >( + m_commands = std::make_unique< Calamares::CommandList >( configurationMap.value( "script" ), !dontChroot, std::chrono::seconds( timeout ) ); if ( m_commands->isEmpty() ) { @@ -80,7 +76,7 @@ ShellProcessJob::setConfigurationMap( const QVariantMap& configurationMap ) } bool labels_ok = false; - auto labels = CalamaresUtils::getSubMap( configurationMap, "i18n", labels_ok ); + auto labels = Calamares::getSubMap( configurationMap, "i18n", labels_ok ); if ( labels_ok ) { if ( labels.contains( "name" ) ) diff --git a/src/modules/shellprocess/ShellProcessJob.h b/src/modules/shellprocess/ShellProcessJob.h index eb61fe801..79886e3b3 100644 --- a/src/modules/shellprocess/ShellProcessJob.h +++ b/src/modules/shellprocess/ShellProcessJob.h @@ -37,7 +37,7 @@ public: void setConfigurationMap( const QVariantMap& configurationMap ) override; private: - std::unique_ptr< CalamaresUtils::CommandList > m_commands; + std::unique_ptr< Calamares::CommandList > m_commands; std::unique_ptr< Calamares::Locale::TranslatedString > m_name; }; diff --git a/src/modules/shellprocess/Tests.cpp b/src/modules/shellprocess/Tests.cpp index f8727ab36..d37fb42ab 100644 --- a/src/modules/shellprocess/Tests.cpp +++ b/src/modules/shellprocess/Tests.cpp @@ -24,10 +24,9 @@ QTEST_GUILESS_MAIN( ShellProcessTests ) -using CommandList = CalamaresUtils::CommandList; +using CommandList = Calamares::CommandList; using std::operator""s; - ShellProcessTests::ShellProcessTests() {} ShellProcessTests::~ShellProcessTests() {} @@ -40,43 +39,43 @@ ShellProcessTests::initTestCase() void ShellProcessTests::testProcessListSampleConfig() { - YAML::Node doc; + ::YAML::Node doc; QString filename = QStringLiteral( "shellprocess.conf" ); QFile fi( QString( "%1/%2" ).arg( BUILD_AS_TEST, filename ) ); QVERIFY( fi.exists() ); - doc = YAML::LoadFile( fi.fileName().toStdString() ); + doc = ::YAML::LoadFile( fi.fileName().toStdString() ); - CommandList cl( CalamaresUtils::yamlMapToVariant( doc ).value( "script" ) ); + CommandList cl( Calamares::YAML::mapToVariant( doc ).value( "script" ) ); QVERIFY( !cl.isEmpty() ); QCOMPARE( cl.count(), 3 ); - QCOMPARE( cl.at( 0 ).timeout(), CalamaresUtils::CommandLine::TimeoutNotSet() ); + QCOMPARE( cl.at( 0 ).timeout(), Calamares::CommandLine::TimeoutNotSet() ); QCOMPARE( cl.at( 2 ).timeout(), 3600s ); // slowloris } void ShellProcessTests::testProcessListFromList() { - YAML::Node doc = YAML::Load( R"(--- -script: - - "ls /tmp" - - "ls /nonexistent" - - "/bin/false" -)" ); - CommandList cl( CalamaresUtils::yamlMapToVariant( doc ).value( "script" ) ); + ::YAML::Node doc = ::YAML::Load( R"(--- + script: + - "ls /tmp" + - "ls /nonexistent" + - "/bin/false" + )" ); + CommandList cl( Calamares::YAML::mapToVariant( doc ).value( "script" ) ); QVERIFY( !cl.isEmpty() ); QCOMPARE( cl.count(), 3 ); // Contains 1 bad element - doc = YAML::Load( R"(--- -script: - - "ls /tmp" - - false - - "ls /nonexistent" -)" ); - CommandList cl1( CalamaresUtils::yamlMapToVariant( doc ).value( "script" ) ); + doc = ::YAML::Load( R"(--- + script: + - "ls /tmp" + - false + - "ls /nonexistent" + )" ); + CommandList cl1( Calamares::YAML::mapToVariant( doc ).value( "script" ) ); QVERIFY( !cl1.isEmpty() ); QCOMPARE( cl1.count(), 2 ); // One element ignored } @@ -85,9 +84,9 @@ void ShellProcessTests::testProcessListFromString() { YAML::Node doc = YAML::Load( R"(--- -script: "ls /tmp" -)" ); - CommandList cl( CalamaresUtils::yamlMapToVariant( doc ).value( "script" ) ); + script: "ls /tmp" + )" ); + CommandList cl( Calamares::YAML::mapToVariant( doc ).value( "script" ) ); QVERIFY( !cl.isEmpty() ); QCOMPARE( cl.count(), 1 ); @@ -96,9 +95,9 @@ script: "ls /tmp" // Not a string doc = YAML::Load( R"(--- -script: false -)" ); - CommandList cl1( CalamaresUtils::yamlMapToVariant( doc ).value( "script" ) ); + script: false + )" ); + CommandList cl1( Calamares::YAML::mapToVariant( doc ).value( "script" ) ); QVERIFY( cl1.isEmpty() ); QCOMPARE( cl1.count(), 0 ); } @@ -107,11 +106,11 @@ void ShellProcessTests::testProcessFromObject() { YAML::Node doc = YAML::Load( R"(--- -script: - command: "ls /tmp" - timeout: 20 -)" ); - CommandList cl( CalamaresUtils::yamlMapToVariant( doc ).value( "script" ) ); + script: + command: "ls /tmp" + timeout: 20 + )" ); + CommandList cl( Calamares::YAML::mapToVariant( doc ).value( "script" ) ); QVERIFY( !cl.isEmpty() ); QCOMPARE( cl.count(), 1 ); @@ -123,44 +122,48 @@ void ShellProcessTests::testProcessListFromObject() { YAML::Node doc = YAML::Load( R"(--- -script: - - command: "ls /tmp" - timeout: 12 - - "-/bin/false" -)" ); - CommandList cl( CalamaresUtils::yamlMapToVariant( doc ).value( "script" ) ); + script: + - command: "ls /tmp" + timeout: 12 + - "-/bin/false" + )" ); + CommandList cl( Calamares::YAML::mapToVariant( doc ).value( "script" ) ); QVERIFY( !cl.isEmpty() ); QCOMPARE( cl.count(), 2 ); QCOMPARE( cl.at( 0 ).timeout(), 12s ); QCOMPARE( cl.at( 0 ).command(), QStringLiteral( "ls /tmp" ) ); - QCOMPARE( cl.at( 1 ).timeout(), CalamaresUtils::CommandLine::TimeoutNotSet() ); // not set + QCOMPARE( cl.at( 1 ).timeout(), Calamares::CommandLine::TimeoutNotSet() ); // not set } void ShellProcessTests::testRootSubstitution() { YAML::Node doc = YAML::Load( R"(--- -script: - - "ls /tmp" -)" ); - QVariant plainScript = CalamaresUtils::yamlMapToVariant( doc ).value( "script" ); - QVariant rootScript = CalamaresUtils::yamlMapToVariant( YAML::Load( R"(--- -script: - - "ls ${ROOT}" -)" ) ) + script: + - "ls /tmp" + )" ); + QVariant plainScript = Calamares::YAML::mapToVariant( doc ).value( "script" ); + QVariant rootScript = Calamares::YAML::mapToVariant( YAML::Load( R"(--- + script: + - "ls ${ROOT}" + )" ) ) .value( "script" ); - QVariant userScript = CalamaresUtils::yamlMapToVariant( YAML::Load( R"(--- -script: - - mktemp -d ${ROOT}/calatestXXXXXXXX - - "chown ${USER} ${ROOT}/calatest*" - - rm -rf ${ROOT}/calatest* -)" ) ) + QVariant userScript = Calamares::YAML::mapToVariant( YAML::Load( R"(--- + script: + - mktemp -d ${ROOT}/calatestXXXXXXXX + - "chown ${USER} ${ROOT}/calatest*" + - rm -rf ${ROOT}/calatest* + )" ) ) .value( "script" ); if ( !Calamares::JobQueue::instance() ) + { (void)new Calamares::JobQueue( nullptr ); + } if ( !Calamares::Settings::instance() ) + { (void)Calamares::Settings::init( QString() ); + } Calamares::GlobalStorage* gs = Calamares::JobQueue::instance()->globalStorage(); QVERIFY( gs != nullptr ); @@ -193,7 +196,7 @@ script: // Show that shell expansion is now quoted. gs->insert( "username", "`id -u`" ); { - CalamaresUtils::CommandLine c { QStringLiteral( "chown ${USER}" ), std::chrono::seconds( 0 ) }; + Calamares::CommandLine c { QStringLiteral( "chown ${USER}" ), std::chrono::seconds( 0 ) }; QCOMPARE( c.expand().command(), QStringLiteral( "chown '`id -u`'" ) ); } // Now play dangerous games with shell expansion -- except the internal command is now diff --git a/src/modules/summary/Config.cpp b/src/modules/summary/Config.cpp index 6eddfa3f7..75fed6817 100644 --- a/src/modules/summary/Config.cpp +++ b/src/modules/summary/Config.cpp @@ -13,7 +13,7 @@ #include "Branding.h" #include "Settings.h" #include "ViewManager.h" -#include "utils/CalamaresUtilsGui.h" +#include "utils/Gui.h" #include "utils/Logger.h" #include "utils/Retranslator.h" #include "viewpages/ExecutionViewStep.h" diff --git a/src/modules/summary/SummaryPage.cpp b/src/modules/summary/SummaryPage.cpp index e156d473e..41881e479 100644 --- a/src/modules/summary/SummaryPage.cpp +++ b/src/modules/summary/SummaryPage.cpp @@ -17,7 +17,7 @@ #include "Settings.h" #include "ViewManager.h" -#include "utils/CalamaresUtilsGui.h" +#include "utils/Gui.h" #include "utils/Logger.h" #include "utils/QtCompat.h" #include "utils/Retranslator.h" @@ -55,7 +55,6 @@ SummaryPage::SummaryPage( Config* config, QWidget* parent ) m_scrollArea->setContentsMargins( 0, 0, 0, 0 ); } - static QLabel* createTitleLabel( const QString& text, const QFont& titleFont ) { @@ -72,7 +71,7 @@ createBodyLabel( const QString& text, const QPalette& bodyPalette ) { QLabel* label = new QLabel; label->setObjectName( "summaryItemBody" ); - label->setMargin( CalamaresUtils::defaultFontHeight() / 2 ); + label->setMargin( Calamares::defaultFontHeight() / 2 ); label->setAutoFillBackground( true ); label->setPalette( bodyPalette ); label->setText( text ); @@ -87,12 +86,12 @@ createStepWidget( const QString& description, QWidget* innerWidget, const QPalet w->setLayout( itemBodyLayout ); // Indent the inner box by a bit - itemBodyLayout->addSpacing( CalamaresUtils::defaultFontHeight() * 2 ); + itemBodyLayout->addSpacing( Calamares::defaultFontHeight() * 2 ); QVBoxLayout* itemBodyCoreLayout = new QVBoxLayout; itemBodyLayout->addLayout( itemBodyCoreLayout ); - CalamaresUtils::unmarginLayout( itemBodyLayout ); + Calamares::unmarginLayout( itemBodyLayout ); - itemBodyCoreLayout->addSpacing( CalamaresUtils::defaultFontHeight() / 2 ); + itemBodyCoreLayout->addSpacing( Calamares::defaultFontHeight() / 2 ); if ( innerWidget ) { itemBodyCoreLayout->addWidget( innerWidget ); @@ -131,11 +130,11 @@ SummaryPage::buildWidgets( Config* config, SummaryViewStep* viewstep ) delete m_contentWidget; // It might have been created previously m_contentWidget = new QWidget; m_layout = new QVBoxLayout( m_contentWidget ); - CalamaresUtils::unmarginLayout( m_layout ); + Calamares::unmarginLayout( m_layout ); QFont titleFont = font(); titleFont.setWeight( QFont::Light ); - titleFont.setPointSize( CalamaresUtils::defaultFontSize() * 2 ); + titleFont.setPointSize( Calamares::defaultFontSize() * 2 ); QPalette bodyPalette( palette() ); bodyPalette.setColor( WindowBackground, palette().window().color().lighter( 108 ) ); diff --git a/src/modules/tracking/Config.cpp b/src/modules/tracking/Config.cpp index 0d9778c6a..58c4f63ae 100644 --- a/src/modules/tracking/Config.cpp +++ b/src/modules/tracking/Config.cpp @@ -86,12 +86,11 @@ TrackingStyleConfig::validateUrl( QString& urlString ) } } - void TrackingStyleConfig::setConfigurationMap( const QVariantMap& config ) { - m_state = CalamaresUtils::getBool( config, "enabled", false ) ? DisabledByUser : DisabledByConfig; - m_policy = CalamaresUtils::getString( config, "policy" ); + m_state = Calamares::getBool( config, "enabled", false ) ? DisabledByUser : DisabledByConfig; + m_policy = Calamares::getString( config, "policy" ); validateUrl( m_policy ); emit policyChanged( m_policy ); emit trackingChanged(); @@ -110,7 +109,7 @@ InstallTrackingConfig::setConfigurationMap( const QVariantMap& configurationMap { TrackingStyleConfig::setConfigurationMap( configurationMap ); - m_installTrackingUrl = CalamaresUtils::getString( configurationMap, "url" ); + m_installTrackingUrl = Calamares::getString( configurationMap, "url" ); validateUrl( m_installTrackingUrl ); } @@ -135,11 +134,10 @@ MachineTrackingConfig::setConfigurationMap( const QVariantMap& configurationMap { TrackingStyleConfig::setConfigurationMap( configurationMap ); - m_machineTrackingStyle = CalamaresUtils::getString( configurationMap, "style" ); + m_machineTrackingStyle = Calamares::getString( configurationMap, "style" ); validate( m_machineTrackingStyle, isValidMachineTrackingStyle ); } - UserTrackingConfig::UserTrackingConfig( QObject* parent ) : TrackingStyleConfig( parent ) { @@ -160,13 +158,12 @@ UserTrackingConfig::setConfigurationMap( const QVariantMap& configurationMap ) { TrackingStyleConfig::setConfigurationMap( configurationMap ); - m_userTrackingStyle = CalamaresUtils::getString( configurationMap, "style" ); + m_userTrackingStyle = Calamares::getString( configurationMap, "style" ); validate( m_userTrackingStyle, isValidUserTrackingStyle ); - m_userTrackingAreas = CalamaresUtils::getStringList( configurationMap, "areas" ); + m_userTrackingAreas = Calamares::getStringList( configurationMap, "areas" ); } - Config::Config( QObject* parent ) : QObject( parent ) , m_installTracking( new InstallTrackingConfig( this ) ) @@ -198,7 +195,7 @@ enableLevelsBelow( Config* config, TrackingType level ) void Config::setConfigurationMap( const QVariantMap& configurationMap ) { - m_generalPolicy = CalamaresUtils::getString( configurationMap, "policy" ); + m_generalPolicy = Calamares::getString( configurationMap, "policy" ); if ( !QUrl( m_generalPolicy ).isValid() ) { @@ -207,28 +204,28 @@ Config::setConfigurationMap( const QVariantMap& configurationMap ) emit generalPolicyChanged( m_generalPolicy ); bool success = false; - auto subconfig = CalamaresUtils::getSubMap( configurationMap, "install", success ); + auto subconfig = Calamares::getSubMap( configurationMap, "install", success ); if ( success ) { m_installTracking->setConfigurationMap( subconfig ); } - subconfig = CalamaresUtils::getSubMap( configurationMap, "machine", success ); + subconfig = Calamares::getSubMap( configurationMap, "machine", success ); if ( success ) { m_machineTracking->setConfigurationMap( subconfig ); } - subconfig = CalamaresUtils::getSubMap( configurationMap, "user", success ); + subconfig = Calamares::getSubMap( configurationMap, "user", success ); if ( success ) { m_userTracking->setConfigurationMap( subconfig ); } - auto level = trackingNames().find( CalamaresUtils::getString( configurationMap, "default" ), success ); + auto level = trackingNames().find( Calamares::getString( configurationMap, "default" ), success ); if ( !success ) { - cWarning() << "Default tracking level unknown:" << CalamaresUtils::getString( configurationMap, "default" ); + cWarning() << "Default tracking level unknown:" << Calamares::getString( configurationMap, "default" ); level = TrackingType::NoTracking; } enableLevelsBelow( this, level ); diff --git a/src/modules/tracking/TrackingJobs.cpp b/src/modules/tracking/TrackingJobs.cpp index 70b68de45..82e54d381 100644 --- a/src/modules/tracking/TrackingJobs.cpp +++ b/src/modules/tracking/TrackingJobs.cpp @@ -14,7 +14,7 @@ #include "GlobalStorage.h" #include "JobQueue.h" #include "network/Manager.h" -#include "utils/CalamaresUtilsSystem.h" +#include "utils/System.h" #include "utils/Logger.h" #include @@ -23,7 +23,6 @@ #include - // Namespace keeps all the actual jobs anonymous, the // public API is the addJob() functions below the namespace. namespace @@ -148,11 +147,11 @@ TrackingMachineUpdateManagerJob::exec() static const auto script = QStringLiteral( "sed -i '/^URI/s,${MACHINE_ID},'`cat /etc/machine-id`',' /etc/update-manager/meta-release || true" ); - auto res = CalamaresUtils::System::instance()->runCommand( CalamaresUtils::System::RunLocation::RunInTarget, - QStringList { QStringLiteral( "/bin/sh" ) }, - QString(), // Working dir - script, // standard input - std::chrono::seconds( 1 ) ); + auto res = Calamares::System::instance()->runCommand( Calamares::System::RunLocation::RunInTarget, + QStringList { QStringLiteral( "/bin/sh" ) }, + QString(), // Working dir + script, // standard input + std::chrono::seconds( 1 ) ); int r = res.first; if ( r == 0 ) @@ -214,7 +213,7 @@ FeedbackLevel=16 QString path = QStringLiteral( "/home/%1/.config/%2" ).arg( m_username, area ); cDebug() << "Configuring KUserFeedback" << path; - int r = CalamaresUtils::System::instance()->createTargetFile( path, config ); + int r = Calamares::System::instance()->createTargetFile( path, config ); if ( r > 0 ) { return Calamares::JobResult::error( @@ -243,7 +242,7 @@ addJob( Calamares::JobList& list, InstallTrackingConfig* config ) { if ( config->isEnabled() ) { - const auto* s = CalamaresUtils::System::instance(); + const auto* s = Calamares::System::instance(); QHash< QString, QString > map { std::initializer_list< std::pair< QString, QString > > { { QStringLiteral( "CPU" ), s->getCpuDescription() }, { QStringLiteral( "MEMORY" ), QString::number( s->getTotalMemoryB().first ) }, diff --git a/src/modules/tracking/TrackingPage.cpp b/src/modules/tracking/TrackingPage.cpp index a5fb3ccc6..df4b52385 100644 --- a/src/modules/tracking/TrackingPage.cpp +++ b/src/modules/tracking/TrackingPage.cpp @@ -16,7 +16,7 @@ #include "GlobalStorage.h" #include "JobQueue.h" #include "ViewManager.h" -#include "utils/CalamaresUtilsGui.h" +#include "utils/Gui.h" #include "utils/Logger.h" #include "utils/Retranslator.h" diff --git a/src/modules/tracking/TrackingViewStep.cpp b/src/modules/tracking/TrackingViewStep.cpp index 7955846c3..8498d6de8 100644 --- a/src/modules/tracking/TrackingViewStep.cpp +++ b/src/modules/tracking/TrackingViewStep.cpp @@ -16,7 +16,7 @@ #include "GlobalStorage.h" #include "JobQueue.h" -#include "utils/CalamaresUtilsSystem.h" +#include "utils/System.h" #include "utils/Logger.h" #include "utils/Variant.h" diff --git a/src/modules/umount/Tests.cpp b/src/modules/umount/Tests.cpp index dc0198619..fc1d3d666 100644 --- a/src/modules/umount/Tests.cpp +++ b/src/modules/umount/Tests.cpp @@ -11,7 +11,7 @@ #include "GlobalStorage.h" #include "JobQueue.h" -#include "utils/CalamaresUtilsSystem.h" +#include "utils/System.h" #include "utils/Logger.h" #include diff --git a/src/modules/umount/UmountJob.cpp b/src/modules/umount/UmountJob.cpp index 2fd549348..c40353809 100644 --- a/src/modules/umount/UmountJob.cpp +++ b/src/modules/umount/UmountJob.cpp @@ -15,7 +15,7 @@ #include "UmountJob.h" #include "partition/Mount.h" -#include "utils/CalamaresUtilsSystem.h" +#include "utils/System.h" #include "utils/Logger.h" #include "utils/Variant.h" @@ -103,7 +103,7 @@ exportZFSPools() for ( const auto& poolName : poolNames ) { - auto result = CalamaresUtils::System::runCommand( { "zpool", "export", poolName }, std::chrono::seconds( 30 ) ); + auto result = Calamares::System::runCommand( { "zpool", "export", poolName }, std::chrono::seconds( 30 ) ); if ( result.getExitCode() ) { cWarning() << "Failed to export pool" << result.getOutput(); @@ -113,11 +113,10 @@ exportZFSPools() return Calamares::JobResult::ok(); } - Calamares::JobResult UmountJob::exec() { - const auto* sys = CalamaresUtils::System::instance(); + const auto* sys = Calamares::System::instance(); if ( !sys ) { return Calamares::JobResult::internalError( diff --git a/src/modules/users/CMakeLists.txt b/src/modules/users/CMakeLists.txt index 8f9ee88bd..2e9e9c5e9 100644 --- a/src/modules/users/CMakeLists.txt +++ b/src/modules/users/CMakeLists.txt @@ -45,17 +45,21 @@ set(_users_src ) # This part of the code is shared with the usersq module -calamares_add_library( - users_internal - EXPORT_MACRO PLUGINDLLEXPORT_PRO - TARGET_TYPE OBJECT - NO_INSTALL - NO_VERSION - SOURCES +add_library(users_internal + OBJECT ${_users_src} - LINK_LIBRARIES - ${USER_EXTRA_LIB} ) +target_link_libraries(users_internal + PRIVATE + ${USER_EXTRA_LIB} + ${Calamares_LIBRARIES} + ${qtname}::Core + ${qtname}::Gui + ${qtname}::Widgets +) +target_compile_definitions(users_internal PUBLIC PLUGINDLLEXPORT_PRO) +target_compile_options(users_internal PUBLIC -fPIC) +calamares_automoc(users_internal) calamares_add_plugin(users TYPE viewmodule diff --git a/src/modules/users/Config.cpp b/src/modules/users/Config.cpp index 7251f6ff2..8927fb4ed 100644 --- a/src/modules/users/Config.cpp +++ b/src/modules/users/Config.cpp @@ -201,7 +201,6 @@ Config::setSudoersGroup( const QString& group ) } } - void Config::setLoginName( const QString& login ) { @@ -492,7 +491,6 @@ Config::setFullName( const QString& name ) .toLower() .simplified(); - QStringList cleanParts = cleanName.split( ' ' ); if ( !m_customLoginName ) @@ -614,7 +612,6 @@ Config::passwordStatus( const QString& pw1, const QString& pw2 ) const return qMakePair( PasswordValidity::Valid, tr( "OK!" ) ); } - Config::PasswordStatus Config::userPasswordStatus() const { @@ -635,7 +632,6 @@ Config::userPasswordMessage() const return p.second; } - void Config::setRootPassword( const QString& s ) { @@ -742,7 +738,6 @@ Config::checkReady() } } - STATICTEST void setConfigurationDefaultGroups( const QVariantMap& map, QList< GroupDescription >& defaultGroups ) { @@ -780,12 +775,12 @@ setConfigurationDefaultGroups( const QVariantMap& map, QList< GroupDescription > else if ( Calamares::typeOf( v ) == Calamares::MapVariantType ) { const auto innermap = v.toMap(); - QString name = CalamaresUtils::getString( innermap, "name" ); + QString name = Calamares::getString( innermap, "name" ); if ( !name.isEmpty() ) { defaultGroups.append( GroupDescription( name, - CalamaresUtils::getBool( innermap, "must_exist", false ), - CalamaresUtils::getBool( innermap, "system", false ) ) ); + Calamares::getBool( innermap, "must_exist", false ), + Calamares::getBool( innermap, "system", false ) ) ); } else { @@ -804,7 +799,7 @@ STATICTEST HostNameAction getHostNameAction( const QVariantMap& configurationMap ) { HostNameAction setHostName = HostNameAction::EtcHostname; - QString hostnameActionString = CalamaresUtils::getString( configurationMap, "location" ); + QString hostnameActionString = Calamares::getString( configurationMap, "location" ); if ( !hostnameActionString.isEmpty() ) { bool ok = false; @@ -907,39 +902,38 @@ Config::setConfigurationMap( const QVariantMap& configurationMap ) // Handle *user* key and subkeys and legacy settings { bool ok = false; // Ignored - QVariantMap userSettings = CalamaresUtils::getSubMap( configurationMap, "user", ok ); + QVariantMap userSettings = Calamares::getSubMap( configurationMap, "user", ok ); QString shell( QLatin1String( "/bin/bash" ) ); // as if it's not set at all if ( userSettings.contains( "shell" ) ) { - shell = CalamaresUtils::getString( userSettings, "shell" ); + shell = Calamares::getString( userSettings, "shell" ); } // Now it might be explicitly set to empty, which is ok setUserShell( shell ); - m_forbiddenLoginNames = CalamaresUtils::getStringList( userSettings, "forbidden_names" ); + m_forbiddenLoginNames = Calamares::getStringList( userSettings, "forbidden_names" ); m_forbiddenLoginNames << alwaysForbiddenLoginNames(); tidy( m_forbiddenLoginNames ); } setAutoLoginGroup( either< QString, const QString& >( - CalamaresUtils::getString, configurationMap, "autologinGroup", "autoLoginGroup", QString() ) ); - setSudoersGroup( CalamaresUtils::getString( configurationMap, "sudoersGroup" ) ); - m_sudoStyle = CalamaresUtils::getBool( configurationMap, "sudoersConfigureWithGroup", false ) - ? SudoStyle::UserAndGroup - : SudoStyle::UserOnly; + Calamares::getString, configurationMap, "autologinGroup", "autoLoginGroup", QString() ) ); + setSudoersGroup( Calamares::getString( configurationMap, "sudoersGroup" ) ); + m_sudoStyle = Calamares::getBool( configurationMap, "sudoersConfigureWithGroup", false ) ? SudoStyle::UserAndGroup + : SudoStyle::UserOnly; // Handle *hostname* key and subkeys and legacy settings { bool ok = false; // Ignored - QVariantMap hostnameSettings = CalamaresUtils::getSubMap( configurationMap, "hostname", ok ); + QVariantMap hostnameSettings = Calamares::getSubMap( configurationMap, "hostname", ok ); m_hostnameAction = getHostNameAction( hostnameSettings ); - m_writeEtcHosts = CalamaresUtils::getBool( hostnameSettings, "writeHostsFile", true ); + m_writeEtcHosts = Calamares::getBool( hostnameSettings, "writeHostsFile", true ); m_hostnameTemplate - = CalamaresUtils::getString( hostnameSettings, "template", QStringLiteral( "${first}-${product}" ) ); + = Calamares::getString( hostnameSettings, "template", QStringLiteral( "${first}-${product}" ) ); - m_forbiddenHostNames = CalamaresUtils::getStringList( hostnameSettings, "forbidden_names" ); + m_forbiddenHostNames = Calamares::getStringList( hostnameSettings, "forbidden_names" ); m_forbiddenHostNames << alwaysForbiddenHostNames(); tidy( m_forbiddenHostNames ); } @@ -948,20 +942,17 @@ Config::setConfigurationMap( const QVariantMap& configurationMap ) // Renaming of Autologin -> AutoLogin in 4ffa79d4cf also affected // configuration keys, which was not intended. Accept both. - m_doAutoLogin = either( CalamaresUtils::getBool, - configurationMap, - QStringLiteral( "doAutologin" ), - QStringLiteral( "doAutoLogin" ), - false ); + m_doAutoLogin = either( + Calamares::getBool, configurationMap, QStringLiteral( "doAutologin" ), QStringLiteral( "doAutoLogin" ), false ); - m_writeRootPassword = CalamaresUtils::getBool( configurationMap, "setRootPassword", true ); + m_writeRootPassword = Calamares::getBool( configurationMap, "setRootPassword", true ); Calamares::JobQueue::instance()->globalStorage()->insert( "setRootPassword", m_writeRootPassword ); - m_reuseUserPasswordForRoot = CalamaresUtils::getBool( configurationMap, "doReusePassword", false ); + m_reuseUserPasswordForRoot = Calamares::getBool( configurationMap, "doReusePassword", false ); - m_permitWeakPasswords = CalamaresUtils::getBool( configurationMap, "allowWeakPasswords", false ); + m_permitWeakPasswords = Calamares::getBool( configurationMap, "allowWeakPasswords", false ); m_requireStrongPasswords - = !m_permitWeakPasswords || !CalamaresUtils::getBool( configurationMap, "allowWeakPasswordsDefault", false ); + = !m_permitWeakPasswords || !Calamares::getBool( configurationMap, "allowWeakPasswordsDefault", false ); // If the value doesn't exist, or isn't a map, this gives an empty map -- no problem auto pr_checks( configurationMap.value( "passwordRequirements" ).toMap() ); diff --git a/src/modules/users/CreateUserJob.cpp b/src/modules/users/CreateUserJob.cpp index b7b0f2f4b..50e4e92e0 100644 --- a/src/modules/users/CreateUserJob.cpp +++ b/src/modules/users/CreateUserJob.cpp @@ -11,7 +11,7 @@ #include "GlobalStorage.h" #include "JobQueue.h" -#include "utils/CalamaresUtilsSystem.h" +#include "utils/System.h" #include "utils/Logger.h" #include "utils/Permissions.h" @@ -21,28 +21,24 @@ #include #include - CreateUserJob::CreateUserJob( const Config* config ) : Calamares::Job() , m_config( config ) { } - QString CreateUserJob::prettyName() const { return tr( "Create user %1" ).arg( m_config->loginName() ); } - QString CreateUserJob::prettyDescription() const { return tr( "Create user %1." ).arg( m_config->loginName() ); } - QString CreateUserJob::prettyStatusMessage() const { @@ -74,7 +70,7 @@ createUser( const QString& loginName, const QString& fullName, const QString& sh useraddCommand << loginName; #endif - auto commandResult = CalamaresUtils::System::instance()->targetEnvCommand( useraddCommand ); + auto commandResult = Calamares::System::instance()->targetEnvCommand( useraddCommand ); if ( commandResult.getExitCode() ) { cError() << "useradd failed" << commandResult.getExitCode(); @@ -96,7 +92,7 @@ setUserGroups( const QString& loginName, const QStringList& groups ) << "-aG" << groups.join( ',' ) << loginName; #endif - auto commandResult = CalamaresUtils::System::instance()->targetEnvCommand( setgroupsCommand ); + auto commandResult = Calamares::System::instance()->targetEnvCommand( setgroupsCommand ); if ( commandResult.getExitCode() ) { cError() << "usermod failed" << commandResult.getExitCode(); @@ -105,7 +101,6 @@ setUserGroups( const QString& loginName, const QStringList& groups ) return Calamares::JobResult::ok(); } - Calamares::JobResult CreateUserJob::exec() { @@ -132,7 +127,7 @@ CreateUserJob::exec() existingHome.mkdir( backupDirName ); // We need the extra `sh -c` here to ensure that we can expand the shell globs - CalamaresUtils::System::instance()->targetEnvCall( + Calamares::System::instance()->targetEnvCall( { "sh", "-c", "mv -f " + shellFriendlyHome + "/.* " + shellFriendlyHome + "/" + backupDirName } ); } } @@ -159,7 +154,7 @@ CreateUserJob::exec() emit progress( 0.9 ); QString userGroup = QString( "%1:%2" ).arg( m_config->loginName() ).arg( m_config->loginName() ); QString homeDir = QString( "/home/%1" ).arg( m_config->loginName() ); - auto commandResult = CalamaresUtils::System::instance()->targetEnvCommand( { "chown", "-R", userGroup, homeDir } ); + auto commandResult = Calamares::System::instance()->targetEnvCommand( { "chown", "-R", userGroup, homeDir } ); if ( commandResult.getExitCode() ) { cError() << "chown failed" << commandResult.getExitCode(); diff --git a/src/modules/users/MiscJobs.cpp b/src/modules/users/MiscJobs.cpp index fec546d96..9a3fedeec 100644 --- a/src/modules/users/MiscJobs.cpp +++ b/src/modules/users/MiscJobs.cpp @@ -14,7 +14,7 @@ #include "GlobalStorage.h" #include "JobQueue.h" -#include "utils/CalamaresUtilsSystem.h" +#include "utils/System.h" #include "utils/Logger.h" #include "utils/Permissions.h" @@ -59,14 +59,13 @@ SetupSudoJob::exec() // One % for the sudo format, keep it outside of the string to avoid accidental replacement QString sudoersLine = QChar( '%' ) + QString( "%1 ALL=%2 ALL\n" ).arg( m_sudoGroup, designatorForStyle( m_sudoStyle ) ); - auto fileResult - = CalamaresUtils::System::instance()->createTargetFile( QStringLiteral( "/etc/sudoers.d/10-installer" ), - sudoersLine.toUtf8().constData(), - CalamaresUtils::System::WriteMode::Overwrite ); + auto fileResult = Calamares::System::instance()->createTargetFile( QStringLiteral( "/etc/sudoers.d/10-installer" ), + sudoersLine.toUtf8().constData(), + Calamares::System::WriteMode::Overwrite ); if ( fileResult ) { - if ( !CalamaresUtils::Permissions::apply( fileResult.path(), 0440 ) ) + if ( !Calamares::Permissions::apply( fileResult.path(), 0440 ) ) { return Calamares::JobResult::error( tr( "Cannot chmod sudoers file." ) ); } @@ -157,7 +156,7 @@ ensureGroupsExistInTarget( const QList< GroupDescription >& wantedGroups, } cmd << group.name(); #endif - if ( CalamaresUtils::System::instance()->targetEnvCall( cmd ) ) + if ( Calamares::System::instance()->targetEnvCall( cmd ) ) { failureCount++; missingGroups.append( group.name() + QChar( '*' ) ); diff --git a/src/modules/users/SetHostNameJob.cpp b/src/modules/users/SetHostNameJob.cpp index 452f6a962..38cc91f63 100644 --- a/src/modules/users/SetHostNameJob.cpp +++ b/src/modules/users/SetHostNameJob.cpp @@ -13,7 +13,7 @@ #include "GlobalStorage.h" #include "JobQueue.h" -#include "utils/CalamaresUtilsSystem.h" +#include "utils/System.h" #include "utils/Logger.h" #include @@ -22,7 +22,7 @@ #include #include -using WriteMode = CalamaresUtils::System::WriteMode; +using WriteMode = Calamares::System::WriteMode; SetHostNameJob::SetHostNameJob( const Config* c ) : Calamares::Job() @@ -36,14 +36,12 @@ SetHostNameJob::prettyName() const return tr( "Set hostname %1" ).arg( m_config->hostname() ); } - QString SetHostNameJob::prettyDescription() const { return tr( "Set hostname %1." ).arg( m_config->hostname() ); } - QString SetHostNameJob::prettyStatusMessage() const { @@ -53,7 +51,7 @@ SetHostNameJob::prettyStatusMessage() const STATICTEST bool setFileHostname( const QString& hostname ) { - return CalamaresUtils::System::instance()->createTargetFile( + return Calamares::System::instance()->createTargetFile( QStringLiteral( "/etc/hostname" ), ( hostname + '\n' ).toUtf8(), WriteMode::Overwrite ); } @@ -62,17 +60,17 @@ writeFileEtcHosts( const QString& hostname ) { // The actual hostname gets substituted in at %1 const QString standard_hosts = QStringLiteral( R"(# Standard host addresses -127.0.0.1 localhost -::1 localhost ip6-localhost ip6-loopback -ff02::1 ip6-allnodes -ff02::2 ip6-allrouters -)" ); + 127.0.0.1 localhost + ::1 localhost ip6-localhost ip6-loopback + ff02::1 ip6-allnodes + ff02::2 ip6-allrouters + )" ); const QString this_host = QStringLiteral( R"(# This host address -127.0.1.1 %1 -)" ); + 127.0.1.1 %1 + )" ); const QString etc_hosts = standard_hosts + ( hostname.isEmpty() ? QString() : this_host.arg( hostname ) ); - return CalamaresUtils::System::instance()->createTargetFile( + return Calamares::System::instance()->createTargetFile( QStringLiteral( "/etc/hosts" ), etc_hosts.toUtf8(), WriteMode::Overwrite ); } @@ -112,7 +110,6 @@ setSystemdHostname( const QString& hostname ) return success; } - Calamares::JobResult SetHostNameJob::exec() { @@ -147,7 +144,7 @@ SetHostNameJob::exec() setSystemdHostname( m_config->hostname() ); break; case HostNameAction::Transient: - CalamaresUtils::System::instance()->removeTargetFile( QStringLiteral( "/etc/hostname" ) ); + Calamares::System::instance()->removeTargetFile( QStringLiteral( "/etc/hostname" ) ); break; } @@ -160,6 +157,5 @@ SetHostNameJob::exec() } } - return Calamares::JobResult::ok(); } diff --git a/src/modules/users/SetPasswordJob.cpp b/src/modules/users/SetPasswordJob.cpp index b854ede26..630cf1168 100644 --- a/src/modules/users/SetPasswordJob.cpp +++ b/src/modules/users/SetPasswordJob.cpp @@ -12,7 +12,7 @@ #include "GlobalStorage.h" #include "JobQueue.h" -#include "utils/CalamaresUtilsSystem.h" +#include "utils/System.h" #include "utils/Entropy.h" #include "utils/Logger.h" @@ -25,7 +25,6 @@ #endif #include - SetPasswordJob::SetPasswordJob( const QString& userName, const QString& newPassword ) : Calamares::Job() , m_userName( userName ) @@ -33,21 +32,18 @@ SetPasswordJob::SetPasswordJob( const QString& userName, const QString& newPassw { } - QString SetPasswordJob::prettyName() const { return tr( "Set password for user %1" ).arg( m_userName ); } - QString SetPasswordJob::prettyStatusMessage() const { return tr( "Setting password for user %1." ).arg( m_userName ); } - /// Returns a modular hashing salt for method 6 (SHA512) with a 16 character random salt. QString SetPasswordJob::make_salt( int length ) @@ -56,13 +52,13 @@ SetPasswordJob::make_salt( int length ) Q_ASSERT( length <= 128 ); QString salt_string; - CalamaresUtils::EntropySource source = CalamaresUtils::getPrintableEntropy( length, salt_string ); + Calamares::EntropySource source = Calamares::getPrintableEntropy( length, salt_string ); if ( salt_string.length() != length ) { cWarning() << "getPrintableEntropy returned string of length" << salt_string.length() << "expected" << length; salt_string.truncate( length ); } - if ( source != CalamaresUtils::EntropySource::URandom ) + if ( source != Calamares::EntropySource::URandom ) { cWarning() << "Entropy data for salt is low-quality."; } @@ -83,7 +79,7 @@ SetPasswordJob::exec() if ( m_userName == "root" && m_newPassword.isEmpty() ) //special case for disabling root account { - int ec = CalamaresUtils::System::instance()->targetEnvCall( { "usermod", "-p", "!", m_userName } ); + int ec = Calamares::System::instance()->targetEnvCall( { "usermod", "-p", "!", m_userName } ); if ( ec ) return Calamares::JobResult::error( tr( "Cannot disable root account." ), tr( "usermod terminated with error code %1." ).arg( ec ) ); @@ -92,7 +88,7 @@ SetPasswordJob::exec() QString encrypted = QString::fromLatin1( crypt( m_newPassword.toUtf8(), make_salt( 16 ).toUtf8() ) ); - int ec = CalamaresUtils::System::instance()->targetEnvCall( { "usermod", "-p", encrypted, m_userName } ); + int ec = Calamares::System::instance()->targetEnvCall( { "usermod", "-p", encrypted, m_userName } ); if ( ec ) return Calamares::JobResult::error( tr( "Cannot set password for user %1." ).arg( m_userName ), tr( "usermod terminated with error code %1." ).arg( ec ) ); diff --git a/src/modules/users/TestGroupInformation.cpp b/src/modules/users/TestGroupInformation.cpp index 41b7c6238..d5bd88f2c 100644 --- a/src/modules/users/TestGroupInformation.cpp +++ b/src/modules/users/TestGroupInformation.cpp @@ -83,7 +83,7 @@ GroupTests::testCreateGroup() QVERIFY( fi.exists() ); bool ok = false; - const auto map = CalamaresUtils::loadYaml( fi, &ok ); + const auto map = Calamares::YAML::load( fi, &ok ); QVERIFY( ok ); QVERIFY( map.count() > 0 ); // Just that it loaded, one key *defaultGroups* @@ -120,7 +120,6 @@ GroupTests::testSudoGroup() QCOMPARE( spy.count(), 2 ); } - // Test config loading { Config c; @@ -171,7 +170,6 @@ GroupTests::testJobCreation() QCOMPARE( c.createJobs().count(), expectedJobs + 1 ); } - QTEST_GUILESS_MAIN( GroupTests ) #include "utils/moc-warnings.h" diff --git a/src/modules/users/TestSetHostNameJob.cpp b/src/modules/users/TestSetHostNameJob.cpp index 8ddc0ade9..f3974973b 100644 --- a/src/modules/users/TestSetHostNameJob.cpp +++ b/src/modules/users/TestSetHostNameJob.cpp @@ -16,7 +16,7 @@ extern bool setSystemdHostname( const QString& ); #include "GlobalStorage.h" #include "JobQueue.h" -#include "utils/CalamaresUtilsSystem.h" +#include "utils/System.h" #include "utils/Logger.h" #include "utils/Yaml.h" @@ -59,7 +59,7 @@ UsersTests::initTestCase() cDebug() << "Test dir" << m_dir.path(); // Ensure we have a system object, expect it to be a "bogus" one - CalamaresUtils::System* system = CalamaresUtils::System::instance(); + Calamares::System* system = Calamares::System::instance(); QVERIFY( system ); QVERIFY( system->doChroot() ); @@ -96,7 +96,7 @@ UsersTests::testEtcHostname() // Doesn't create intermediate directories QVERIFY( !setFileHostname( testHostname ) ); - QVERIFY( CalamaresUtils::System::instance()->createTargetDirs( "/etc" ) ); + QVERIFY( Calamares::System::instance()->createTargetDirs( "/etc" ) ); QVERIFY( QFile::exists( m_dir.filePath( "etc" ) ) ); // Does write the file @@ -147,7 +147,6 @@ UsersTests::testHostnamed() } } - void UsersTests::cleanup() { @@ -157,7 +156,6 @@ UsersTests::cleanup() } } - QTEST_GUILESS_MAIN( UsersTests ) #include "utils/moc-warnings.h" diff --git a/src/modules/users/Tests.cpp b/src/modules/users/Tests.cpp index 0039037ae..791a5b8b1 100644 --- a/src/modules/users/Tests.cpp +++ b/src/modules/users/Tests.cpp @@ -130,7 +130,6 @@ UserTests::testGetSet() } } - void UserTests::testDefaultGroups() { @@ -218,7 +217,7 @@ UserTests::testDefaultGroupsYAML() QVERIFY( fi.exists() ); bool ok = false; - const auto map = CalamaresUtils::loadYaml( fi, &ok ); + const auto map = Calamares::YAML::load( fi, &ok ); QVERIFY( ok ); QVERIFY( map.count() > 0 ); @@ -229,7 +228,6 @@ UserTests::testDefaultGroupsYAML() QVERIFY( c.defaultGroups().contains( group ) ); } - void UserTests::testHostActions_data() { @@ -293,7 +291,6 @@ UserTests::testHostActions2() QCOMPARE( c.writeEtcHosts(), false ); } - void UserTests::testHostSuggestions_data() { @@ -335,7 +332,6 @@ UserTests::testHostSuggestions() QCOMPARE( makeHostnameSuggestion( templateString, fullName, login ), result ); } - void UserTests::testPasswordChecks() { @@ -454,7 +450,7 @@ UserTests::testAutoLogin() QVERIFY( fi.exists() ); bool ok = false; - const auto map = CalamaresUtils::loadYaml( fi, &ok ); + const auto map = Calamares::YAML::load( fi, &ok ); QVERIFY( ok ); QVERIFY( map.count() > 0 ); @@ -506,7 +502,7 @@ UserTests::testUserYAML() QVERIFY( fi.exists() ); bool ok = false; - const auto map = CalamaresUtils::loadYaml( fi, &ok ); + const auto map = Calamares::YAML::load( fi, &ok ); QVERIFY( ok ); QVERIFY( map.count() > 0 ); @@ -515,7 +511,6 @@ UserTests::testUserYAML() QCOMPARE( c.userShell(), shell ); } - QTEST_GUILESS_MAIN( UserTests ) #include "utils/moc-warnings.h" diff --git a/src/modules/users/UsersPage.cpp b/src/modules/users/UsersPage.cpp index 7936e9fc0..bac30f350 100644 --- a/src/modules/users/UsersPage.cpp +++ b/src/modules/users/UsersPage.cpp @@ -22,7 +22,7 @@ #include "GlobalStorage.h" #include "JobQueue.h" #include "Settings.h" -#include "utils/CalamaresUtilsGui.h" +#include "utils/Gui.h" #include "utils/Logger.h" #include "utils/Retranslator.h" #include "utils/String.h" @@ -34,10 +34,10 @@ /** @brief Add an error message and pixmap to a label. */ static inline void -labelError( QLabel* pix, QLabel* label, CalamaresUtils::ImageType icon, const QString& message ) +labelError( QLabel* pix, QLabel* label, Calamares::ImageType icon, const QString& message ) { label->setText( message ); - pix->setPixmap( CalamaresUtils::defaultPixmap( icon, CalamaresUtils::Original, label->size() ) ); + pix->setPixmap( Calamares::defaultPixmap( icon, Calamares::Original, label->size() ) ); } /** @brief Clear error, set happy pixmap on a label to indicate "ok". */ @@ -45,8 +45,7 @@ static inline void labelOk( QLabel* pix, QLabel* label ) { label->clear(); - pix->setPixmap( - CalamaresUtils::defaultPixmap( CalamaresUtils::StatusOk, CalamaresUtils::Original, label->size() ) ); + pix->setPixmap( Calamares::defaultPixmap( Calamares::StatusOk, Calamares::Original, label->size() ) ); } /** @brief Sets error or ok on a label depending on @p status and @p value @@ -73,7 +72,7 @@ labelStatus( QLabel* pix, QLabel* label, const QString& value, const QString& st } else { - labelError( pix, label, CalamaresUtils::ImageType::StatusError, status ); + labelError( pix, label, Calamares::ImageType::StatusError, status ); } } @@ -204,7 +203,6 @@ UsersPage::retranslate() reportRootPasswordStatus( rp.first, rp.second ); } - void UsersPage::onActivate() { @@ -215,7 +213,6 @@ UsersPage::onActivate() reportRootPasswordStatus( rp.first, rp.second ); } - void UsersPage::onFullNameTextEdited( const QString& fullName ) { @@ -243,11 +240,11 @@ passwordStatus( QLabel* iconLabel, QLabel* messageLabel, int validity, const QSt labelOk( iconLabel, messageLabel ); break; case Config::PasswordValidity::Weak: - labelError( iconLabel, messageLabel, CalamaresUtils::StatusWarning, message ); + labelError( iconLabel, messageLabel, Calamares::StatusWarning, message ); break; case Config::PasswordValidity::Invalid: default: - labelError( iconLabel, messageLabel, CalamaresUtils::StatusError, message ); + labelError( iconLabel, messageLabel, Calamares::StatusError, message ); break; } } @@ -264,7 +261,6 @@ UsersPage::reportUserPasswordStatus( int validity, const QString& message ) passwordStatus( ui->labelUserPassword, ui->labelUserPasswordError, validity, message ); } - void UsersPage::onReuseUserPasswordChanged( const int checked ) { diff --git a/src/modules/welcome/Config.cpp b/src/modules/welcome/Config.cpp index 17f37a091..2bce564f6 100644 --- a/src/modules/welcome/Config.cpp +++ b/src/modules/welcome/Config.cpp @@ -110,7 +110,6 @@ Config::unsatisfiedRequirements() const return m_filtermodel.get(); } - QString Config::languageIcon() const { @@ -200,13 +199,12 @@ Config::setLocaleIndex( int index ) QLocale::setDefault( selectedTranslation.locale() ); const auto* branding = Calamares::Branding::instance(); - CalamaresUtils::installTranslator( selectedTranslation.id(), - branding ? branding->translationsDirectory() : QString() ); + Calamares::installTranslator( selectedTranslation.id(), branding ? branding->translationsDirectory() : QString() ); if ( Calamares::JobQueue::instance() && Calamares::JobQueue::instance()->globalStorage() ) { Calamares::Locale::insertGS( *Calamares::JobQueue::instance()->globalStorage(), - QStringLiteral( "LANG" ), - CalamaresUtils::translatorLocaleName().name ); + QStringLiteral( "LANG" ), + Calamares::translatorLocaleName().name ); } emit localeIndexChanged( m_localeIndex ); } @@ -252,7 +250,6 @@ Config::aboutMessage() const return Calamares::aboutString(); } - QString Config::genericWelcomeMessage() const { @@ -317,7 +314,7 @@ jobOrBrandingSetting( Calamares::Branding::StringEntry e, const QVariantMap& map static inline void setLanguageIcon( Config* c, const QVariantMap& configurationMap ) { - QString language = CalamaresUtils::getString( configurationMap, "languageIcon" ); + QString language = Calamares::getString( configurationMap, "languageIcon" ); if ( !language.isEmpty() ) { auto icon = Calamares::Branding::instance()->image( language, QSize( 48, 48 ) ); @@ -373,14 +370,14 @@ static inline void setGeoIP( Config* config, const QVariantMap& configurationMap ) { bool ok = false; - QVariantMap geoip = CalamaresUtils::getSubMap( configurationMap, "geoip", ok ); + QVariantMap geoip = Calamares::getSubMap( configurationMap, "geoip", ok ); if ( ok ) { using FWString = QFutureWatcher< QString >; - auto* handler = new Calamares::GeoIP::Handler( CalamaresUtils::getString( geoip, "style" ), - CalamaresUtils::getString( geoip, "url" ), - CalamaresUtils::getString( geoip, "selector" ) ); + auto* handler = new Calamares::GeoIP::Handler( Calamares::getString( geoip, "style" ), + Calamares::getString( geoip, "url" ), + Calamares::getString( geoip, "selector" ) ); if ( handler->type() != Calamares::GeoIP::Handler::Type::None ) { auto* future = new FWString(); diff --git a/src/modules/welcome/Tests.cpp b/src/modules/welcome/Tests.cpp index 51495830d..0b7d005a6 100644 --- a/src/modules/welcome/Tests.cpp +++ b/src/modules/welcome/Tests.cpp @@ -12,7 +12,7 @@ #include "Branding.h" #include "Settings.h" #include "network/Manager.h" -#include "utils/CalamaresUtilsSystem.h" +#include "utils/System.h" #include "utils/Logger.h" #include "utils/Yaml.h" @@ -44,7 +44,7 @@ WelcomeTests::initTestCase() cDebug() << "Welcome test started."; // Ensure we have a system object, expect it to be a "bogus" one - CalamaresUtils::System* system = CalamaresUtils::System::instance(); + Calamares::System* system = Calamares::System::instance(); QVERIFY( system ); cDebug() << Logger::SubEntry << "System @" << Logger::Pointer( system ); @@ -66,7 +66,7 @@ WelcomeTests::testOneUrl() QVERIFY( fi.exists() ); bool ok = false; - const auto map = CalamaresUtils::loadYaml( QFileInfo( fi ), &ok ); + const auto map = Calamares::YAML::load( QFileInfo( fi ), &ok ); QVERIFY( ok ); QVERIFY( map.count() > 0 ); QVERIFY( map.contains( "requirements" ) ); @@ -104,7 +104,7 @@ WelcomeTests::testUrls() QVERIFY( fi.exists() ); bool ok = false; - const auto map = CalamaresUtils::loadYaml( fi, &ok ); + const auto map = Calamares::YAML::load( fi, &ok ); QVERIFY( ok ); Calamares::Network::Manager::instance().setCheckHasInternetUrl( QVector< QUrl > {} ); @@ -134,7 +134,7 @@ WelcomeTests::testBadConfigDoesNotResetUrls() QVERIFY( fi.exists() ); bool ok = false; - const auto map = CalamaresUtils::loadYaml( fi, &ok ); + const auto map = Calamares::YAML::load( fi, &ok ); QVERIFY( ok ); c.setConfigurationMap( map ); @@ -151,7 +151,7 @@ WelcomeTests::testBadConfigDoesNotResetUrls() QVERIFY( fi.exists() ); bool ok = false; - const auto map = CalamaresUtils::loadYaml( fi, &ok ); + const auto map = Calamares::YAML::load( fi, &ok ); QVERIFY( ok ); c.setConfigurationMap( map ); @@ -159,7 +159,6 @@ WelcomeTests::testBadConfigDoesNotResetUrls() QCOMPARE( nam.getCheckInternetUrls().count(), 1 ); } - QTEST_GUILESS_MAIN( WelcomeTests ) #include "utils/moc-warnings.h" diff --git a/src/modules/welcome/WelcomePage.cpp b/src/modules/welcome/WelcomePage.cpp index 96675261b..d0ca70444 100644 --- a/src/modules/welcome/WelcomePage.cpp +++ b/src/modules/welcome/WelcomePage.cpp @@ -23,7 +23,7 @@ #include "modulesystem/ModuleManager.h" #include "modulesystem/RequirementsModel.h" -#include "utils/CalamaresUtilsGui.h" +#include "utils/Gui.h" #include "utils/Logger.h" #include "utils/NamedEnum.h" #include "utils/Retranslator.h" @@ -45,7 +45,7 @@ WelcomePage::WelcomePage( Config* config, QWidget* parent ) { using Branding = Calamares::Branding; - const int defaultFontHeight = CalamaresUtils::defaultFontHeight(); + const int defaultFontHeight = Calamares::defaultFontHeight(); ui->setupUi( this ); // insert system-check widget below welcome text @@ -124,25 +124,25 @@ void WelcomePage::setupButton( Button role, const QString& url ) { QPushButton* button = nullptr; - CalamaresUtils::ImageType icon = CalamaresUtils::Information; + Calamares::ImageType icon = Calamares::Information; switch ( role ) { case Button::Donate: button = ui->donateButton; - icon = CalamaresUtils::Donate; + icon = Calamares::Donate; break; case Button::KnownIssues: button = ui->knownIssuesButton; - icon = CalamaresUtils::Bugs; + icon = Calamares::Bugs; break; case Button::ReleaseNotes: button = ui->releaseNotesButton; - icon = CalamaresUtils::Release; + icon = Calamares::Release; break; case Button::Support: button = ui->supportButton; - icon = CalamaresUtils::Help; + icon = Calamares::Help; break; } if ( !button ) @@ -160,8 +160,8 @@ WelcomePage::setupButton( Button role, const QString& url ) QUrl u( url ); if ( u.isValid() ) { - auto size = 2 * QSize( CalamaresUtils::defaultFontHeight(), CalamaresUtils::defaultFontHeight() ); - button->setIcon( CalamaresUtils::defaultPixmap( icon, CalamaresUtils::Original, size ) ); + auto size = 2 * QSize( Calamares::defaultFontHeight(), Calamares::defaultFontHeight() ); + button->setIcon( Calamares::defaultPixmap( icon, Calamares::Original, size ) ); connect( button, &QPushButton::clicked, [ u ]() { QDesktopServices::openUrl( u ); } ); } else diff --git a/src/modules/welcome/checker/CheckerContainer.cpp b/src/modules/welcome/checker/CheckerContainer.cpp index 99b0f6375..4e1ad6db5 100644 --- a/src/modules/welcome/checker/CheckerContainer.cpp +++ b/src/modules/welcome/checker/CheckerContainer.cpp @@ -15,7 +15,7 @@ #include "ResultsListWidget.h" -#include "utils/CalamaresUtilsGui.h" +#include "utils/Gui.h" #include "utils/Logger.h" #include "utils/Retranslator.h" #include "widgets/WaitingWidget.h" @@ -31,7 +31,7 @@ CheckerContainer::CheckerContainer( Config* config, QWidget* parent ) { QBoxLayout* mainLayout = new QHBoxLayout; setLayout( mainLayout ); - CalamaresUtils::unmarginLayout( mainLayout ); + Calamares::unmarginLayout( mainLayout ); mainLayout->addWidget( m_waitingWidget ); CALAMARES_RETRANSLATE( if ( m_waitingWidget ) diff --git a/src/modules/welcome/checker/GeneralRequirements.cpp b/src/modules/welcome/checker/GeneralRequirements.cpp index ca9e0f6d7..8805f7c86 100644 --- a/src/modules/welcome/checker/GeneralRequirements.cpp +++ b/src/modules/welcome/checker/GeneralRequirements.cpp @@ -22,8 +22,8 @@ #include "compat/Variant.h" #include "modulesystem/Requirement.h" #include "network/Manager.h" -#include "utils/CalamaresUtilsGui.h" -#include "utils/CalamaresUtilsSystem.h" +#include "utils/Gui.h" +#include "utils/System.h" #include "utils/Logger.h" #include "utils/Retranslator.h" #include "utils/Units.h" @@ -104,16 +104,16 @@ GeneralRequirements::checkRequirements() MaybeChecked hasPower; MaybeChecked hasInternet; MaybeChecked isRoot; - bool enoughScreen = availableSize.isValid() && ( availableSize.width() >= CalamaresUtils::windowMinimumWidth ) - && ( availableSize.height() >= CalamaresUtils::windowMinimumHeight ); + bool enoughScreen = availableSize.isValid() && ( availableSize.width() >= Calamares::windowMinimumWidth ) + && ( availableSize.height() >= Calamares::windowMinimumHeight ); - qint64 requiredStorageB = CalamaresUtils::GiBtoBytes( m_requiredStorageGiB ); + qint64 requiredStorageB = Calamares::GiBtoBytes( m_requiredStorageGiB ); if ( m_entriesToCheck.contains( "storage" ) ) { enoughStorage = checkEnoughStorage( requiredStorageB ); } - qint64 requiredRamB = CalamaresUtils::GiBtoBytes( m_requiredRamGiB ); + qint64 requiredRamB = Calamares::GiBtoBytes( m_requiredRamGiB ); if ( m_entriesToCheck.contains( "ram" ) ) { enoughRam = checkEnoughRam( requiredRamB ); @@ -284,7 +284,7 @@ getCheckInternetUrls( const QVariantMap& configurationMap ) const QString exampleUrl = QStringLiteral( "http://example.com" ); bool incomplete = false; - QStringList checkInternetSetting = CalamaresUtils::getStringList( configurationMap, "internetCheckUrl" ); + QStringList checkInternetSetting = Calamares::getStringList( configurationMap, "internetCheckUrl" ); if ( !checkInternetSetting.isEmpty() ) { QVector< QUrl > urls; @@ -325,7 +325,6 @@ getCheckInternetUrls( const QVariantMap& configurationMap ) return incomplete; } - void GeneralRequirements::setConfigurationMap( const QVariantMap& configurationMap ) { @@ -422,7 +421,6 @@ GeneralRequirements::setConfigurationMap( const QVariantMap& configurationMap ) } } - bool GeneralRequirements::checkEnoughStorage( qint64 requiredSpace ) { @@ -435,17 +433,15 @@ GeneralRequirements::checkEnoughStorage( qint64 requiredSpace ) #endif } - bool GeneralRequirements::checkEnoughRam( qint64 requiredRam ) { // Ignore the guesstimate-factor; we get an under-estimate // which is probably the usable RAM for programs. - quint64 availableRam = CalamaresUtils::System::instance()->getTotalMemoryB().first; + quint64 availableRam = Calamares::System::instance()->getTotalMemoryB().first; return double( availableRam ) >= double( requiredRam ) * 0.95; // cast to silence 64-bit-int conversion to double } - bool GeneralRequirements::checkBatteryExists() { @@ -474,7 +470,6 @@ GeneralRequirements::checkBatteryExists() return false; } - bool GeneralRequirements::checkHasPower() { @@ -504,7 +499,6 @@ GeneralRequirements::checkHasPower() return !onBattery; } - bool GeneralRequirements::checkHasInternet() { @@ -514,7 +508,6 @@ GeneralRequirements::checkHasInternet() return hasInternet; } - bool GeneralRequirements::checkIsRoot() { diff --git a/src/modules/welcome/checker/ResultDelegate.cpp b/src/modules/welcome/checker/ResultDelegate.cpp index 420ece812..060febbb5 100644 --- a/src/modules/welcome/checker/ResultDelegate.cpp +++ b/src/modules/welcome/checker/ResultDelegate.cpp @@ -10,7 +10,7 @@ #include "ResultDelegate.h" #include "modulesystem/RequirementsModel.h" -#include "utils/CalamaresUtilsGui.h" +#include "utils/Gui.h" #include #include @@ -19,7 +19,7 @@ static constexpr int const item_margin = 8; static inline int item_fontsize() { - return CalamaresUtils::defaultFontSize() + 4; + return Calamares::defaultFontSize() + 4; } static void @@ -33,7 +33,7 @@ paintRequirement( QPainter* painter, const QStyleOptionViewItem& option, const Q font.setBold( false ); painter->setFont( font ); - CalamaresUtils::ImageType statusImage = CalamaresUtils::StatusOk; + Calamares::ImageType statusImage = Calamares::StatusOk; painter->setPen( QColorConstants::Black ); if ( index.data( Calamares::RequirementsModel::Satisfied ).toBool() ) @@ -47,20 +47,19 @@ paintRequirement( QPainter* painter, const QStyleOptionViewItem& option, const Q QColor bgColor = option.palette.window().color(); bgColor.setHsv( 0, 64, bgColor.value() ); painter->fillRect( option.rect, bgColor ); - statusImage = CalamaresUtils::StatusError; + statusImage = Calamares::StatusError; } else { QColor bgColor = option.palette.window().color(); bgColor.setHsv( 60, 64, bgColor.value() ); painter->fillRect( option.rect, bgColor ); - statusImage = CalamaresUtils::StatusWarning; + statusImage = Calamares::StatusWarning; } } auto image - = CalamaresUtils::defaultPixmap( statusImage, CalamaresUtils::Original, QSize( 2 * fontsize, 2 * fontsize ) ) - .toImage(); + = Calamares::defaultPixmap( statusImage, Calamares::Original, QSize( 2 * fontsize, 2 * fontsize ) ).toImage(); painter->drawImage( textRect.topLeft(), image ); // Leave space for that image (already drawn) @@ -87,7 +86,6 @@ ResultDelegate::sizeHint( const QStyleOptionViewItem& option, const QModelIndex& return QSize( qMax( option.rect.width(), textwidth ), height ); } - void ResultDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const { diff --git a/src/modules/welcome/checker/ResultsListWidget.cpp b/src/modules/welcome/checker/ResultsListWidget.cpp index b3371cee1..3f70c61ee 100644 --- a/src/modules/welcome/checker/ResultsListWidget.cpp +++ b/src/modules/welcome/checker/ResultsListWidget.cpp @@ -14,7 +14,7 @@ #include "Branding.h" #include "Settings.h" -#include "utils/CalamaresUtilsGui.h" +#include "utils/Gui.h" #include "utils/Logger.h" #include "utils/Retranslator.h" #include "widgets/FixedAspectRatioLabel.h" @@ -49,7 +49,7 @@ ResultsListWidget::ResultsListWidget( Config* config, QWidget* parent ) explanationLayout->addWidget( m_countdown ); mainLayout->addLayout( explanationLayout ); - mainLayout->addSpacing( CalamaresUtils::defaultFontHeight() / 2 ); + mainLayout->addSpacing( Calamares::defaultFontHeight() / 2 ); auto* listview = new QListView( this ); listview->setSelectionMode( QAbstractItemView::NoSelection ); @@ -108,7 +108,7 @@ ResultsListWidget::requirementsComplete() imageLabel->setPixmap( theImage ); } - imageLabel->setContentsMargins( 4, CalamaresUtils::defaultFontHeight() * 3 / 4, 4, 4 ); + imageLabel->setContentsMargins( 4, Calamares::defaultFontHeight() * 3 / 4, 4, 4 ); imageLabel->setAlignment( Qt::AlignCenter ); imageLabel->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ); imageLabel->setObjectName( "welcomeLogo" ); diff --git a/src/modules/welcomeq/CMakeLists.txt b/src/modules/welcomeq/CMakeLists.txt index 2538dc14b..98b5a1673 100644 --- a/src/modules/welcomeq/CMakeLists.txt +++ b/src/modules/welcomeq/CMakeLists.txt @@ -39,7 +39,7 @@ calamares_add_plugin(welcomeq WelcomeQmlViewStep.cpp ${_welcome}/Config.cpp RESOURCES - welcomeq.qrc + welcomeq${QT_VERSION_SUFFIX}.qrc LINK_PRIVATE_LIBRARIES ${CHECKER_LINK_LIBRARIES} ${qtname}::DBus diff --git a/src/modules/welcomeq/welcomeq-qt6.qml b/src/modules/welcomeq/welcomeq-qt6.qml new file mode 100644 index 000000000..65e43fecf --- /dev/null +++ b/src/modules/welcomeq/welcomeq-qt6.qml @@ -0,0 +1,169 @@ +/* === This file is part of Calamares - === + * + * SPDX-FileCopyrightText: 2020 Adriaan de Groot + * SPDX-FileCopyrightText: 2020 Anke Boersma + * SPDX-License-Identifier: GPL-3.0-or-later + * + * Calamares is Free Software: see the License-Identifier above. + * + */ +import io.calamares.core 1.0 +import io.calamares.ui 1.0 + +import QtQuick 2.10 +import QtQuick.Controls 2.10 +import QtQuick.Layouts 1.3 +import QtQuick.Window 2.3 + +// Qt6 requires unversioned imports and other names +import org.kde.kirigami as Kirigami +import Qt5Compat.GraphicalEffects + + +Page +{ + id: welcome + + header: Item { + width: parent.width + height: parent.height + + Text { + id: welcomeTopText + anchors.horizontalCenter: parent.horizontalCenter + anchors.top: parent.top + horizontalAlignment: Text.AlignHCenter + padding: 20 + // In QML, QString::arg() only takes one argument + text: qsTr("

Welcome to the %1 %2 installer

+

This program will ask you some questions and set up %1 on your computer.

").arg(Branding.string(Branding.ProductName)).arg(Branding.string(Branding.Version)) + } + Image { + id: welcomeImage + anchors.centerIn: parent + // imagePath() returns a full pathname, so make it refer to the filesystem + // .. otherwise the path is interpreted relative to the "call site", which + // .. might be the QRC file. + source: "file:/" + Branding.imagePath(Branding.ProductWelcome) + sourceSize.width: width + sourceSize.height: height + fillMode: Image.PreserveAspectFit + } + + Requirements { + visible: !config.requirementsModel.satisfiedRequirements + } + + RowLayout { + id: buttonBar + width: parent.width / 1.5 + height: 64 + + anchors.bottom: parent.bottom + anchors.horizontalCenter: parent.horizontalCenter + + spacing: Kirigami.Units.largeSpacing* 2 + + Button { + Layout.fillWidth: true + text: qsTr("Support") + icon.name: "system-help" + Kirigami.Theme.backgroundColor: Qt.rgba(Kirigami.Theme.backgroundColor.r, Kirigami.Theme.backgroundColor.g, Kirigami.Theme.backgroundColor.b, 0.4) + Kirigami.Theme.textColor: Kirigami.Theme.textColor + + visible: config.supportUrl !== "" + onClicked: Qt.openUrlExternally(config.supportUrl) + } + + Button { + Layout.fillWidth: true + text: qsTr("Known issues") + icon.name: "tools-report-bug" + Kirigami.Theme.backgroundColor: Qt.rgba(Kirigami.Theme.backgroundColor.r, Kirigami.Theme.backgroundColor.g, Kirigami.Theme.backgroundColor.b, 0.4) + Kirigami.Theme.textColor: Kirigami.Theme.textColor + + visible: config.knownIssuesUrl !== "" + onClicked: Qt.openUrlExternally(config.knownIssuesUrl) + } + + Button { + Layout.fillWidth: true + text: qsTr("Release notes") + icon.name: "folder-text" + Kirigami.Theme.backgroundColor: Qt.rgba(Kirigami.Theme.backgroundColor.r, Kirigami.Theme.backgroundColor.g, Kirigami.Theme.backgroundColor.b, 0.4) + Kirigami.Theme.textColor: Kirigami.Theme.textColor + + visible: config.releaseNotesUrl !== "" + onClicked: load.source = "release_notes.qml" + //onClicked: load.source = "file:/usr/share/calamares/release_notes.qml" + } + + Button { + Layout.fillWidth: true + text: qsTr("Donate") + icon.name: "taxes-finances" + Kirigami.Theme.backgroundColor: Qt.rgba(Kirigami.Theme.backgroundColor.r, Kirigami.Theme.backgroundColor.g, Kirigami.Theme.backgroundColor.b, 0.4) + Kirigami.Theme.textColor: Kirigami.Theme.textColor + + visible: config.donateUrl !== "" + onClicked: Qt.openUrlExternally(config.donateUrl) + } + } + + RowLayout { + id: languageBar + width: parent.width /1.2 + height: 48 + + anchors.bottom: parent.bottom + anchors.bottomMargin: parent.height /7 + anchors.horizontalCenter: parent.horizontalCenter + spacing: Kirigami.Units.largeSpacing* 4 + + Rectangle { + width: parent.width + Layout.fillWidth: true + focus: true + + Loader { + id: imLoader + + Component { + id: icon + Kirigami.Icon { + source: config.languageIcon + height: 48 + width: 48 + } + } + + Component { + id: image + Image { + height: 48 + fillMode: Image.PreserveAspectFit + source: "img/language-icon-48px.png" + } + } + + sourceComponent: (config.languageIcon != "") ? icon : image + } + + ComboBox { + id: languages + anchors.left: imLoader.right + width: languageBar.width /1.1 + textRole: "label" + currentIndex: config.localeIndex + model: config.languagesModel + onCurrentIndexChanged: config.localeIndex = currentIndex + } + } + } + + Loader { + id:load + anchors.fill: parent + } + } +} diff --git a/src/modules/welcomeq/welcomeq-qt6.qrc b/src/modules/welcomeq/welcomeq-qt6.qrc new file mode 100644 index 000000000..a6a211f03 --- /dev/null +++ b/src/modules/welcomeq/welcomeq-qt6.qrc @@ -0,0 +1,11 @@ + + + welcomeq-qt6.qml + release_notes.qml + Recommended.qml + Requirements.qml + img/squid.png + img/chevron-left-solid.svg + img/language-icon-48px.png + + diff --git a/src/modules/welcomeq/welcomeq.qml b/src/modules/welcomeq/welcomeq.qml index 7c1187c7d..736130bcf 100644 --- a/src/modules/welcomeq/welcomeq.qml +++ b/src/modules/welcomeq/welcomeq.qml @@ -13,9 +13,12 @@ import io.calamares.ui 1.0 import QtQuick 2.10 import QtQuick.Controls 2.10 import QtQuick.Layouts 1.3 +import QtQuick.Window 2.3 + +// Qt5 requires versioned imports +// import org.kde.kirigami 2.7 as Kirigami import QtGraphicalEffects 1.0 -import QtQuick.Window 2.3 Page { diff --git a/src/modules/zfs/ZfsJob.cpp b/src/modules/zfs/ZfsJob.cpp index cc2af7482..ccfa94f56 100644 --- a/src/modules/zfs/ZfsJob.cpp +++ b/src/modules/zfs/ZfsJob.cpp @@ -9,7 +9,7 @@ #include "ZfsJob.h" -#include "utils/CalamaresUtilsSystem.h" +#include "utils/System.h" #include "utils/Logger.h" #include "utils/Variant.h" @@ -132,7 +132,6 @@ ZfsJob::isMountpointOverlapping( const QString& targetMountpoint ) const return false; } - ZfsResult ZfsJob::createZpool( QString deviceName, QString poolName, QString poolOptions, bool encrypt, QString passphrase ) const { @@ -154,8 +153,8 @@ ZfsJob::createZpool( QString deviceName, QString poolName, QString poolOptions, << "create" << poolOptions.split( ' ' ) << poolName << deviceName; } - auto r = CalamaresUtils::System::instance()->runCommand( - CalamaresUtils::System::RunLocation::RunInHost, command, QString(), passphrase, std::chrono::seconds( 10 ) ); + auto r = Calamares::System::instance()->runCommand( + Calamares::System::RunLocation::RunInHost, command, QString(), passphrase, std::chrono::seconds( 10 ) ); if ( r.getExitCode() != 0 ) { @@ -183,7 +182,7 @@ ZfsJob::exec() Calamares::JobResult::InvalidConfiguration ); } - const CalamaresUtils::System* system = CalamaresUtils::System::instance(); + const Calamares::System* system = Calamares::System::instance(); QVariantList poolNames; @@ -359,15 +358,14 @@ ZfsJob::exec() return Calamares::JobResult::ok(); } - void ZfsJob::setConfigurationMap( const QVariantMap& map ) { - m_poolName = CalamaresUtils::getString( map, "poolName" ); - m_poolOptions = CalamaresUtils::getString( map, "poolOptions" ); - m_datasetOptions = CalamaresUtils::getString( map, "datasetOptions" ); + m_poolName = Calamares::getString( map, "poolName" ); + m_poolOptions = Calamares::getString( map, "poolOptions" ); + m_datasetOptions = Calamares::getString( map, "datasetOptions" ); - m_datasets = CalamaresUtils::getList( map, "datasets" ); + m_datasets = Calamares::getList( map, "datasets" ); } CALAMARES_PLUGIN_FACTORY_DEFINITION( ZfsJobFactory, registerPlugin< ZfsJob >(); )